diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2024-12-27 12:52:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-27 12:52:30 -0500 |
| commit | f8a7ac34b90acb71122d71c89aa8e95b4346cf20 (patch) | |
| tree | edffd155c9eb0adcea7517c2303f1c2d50021774 /data/pokemon | |
| parent | Remove `-Wnumeric-string=2` (diff) | |
| download | pokeyellow-f8a7ac34b90acb71122d71c89aa8e95b4346cf20.tar.gz pokeyellow-f8a7ac34b90acb71122d71c89aa8e95b4346cf20.tar.xz pokeyellow-f8a7ac34b90acb71122d71c89aa8e95b4346cf20.zip | |
Don't pass redundant label names to `table_width` and `list_start` (#125)
Diffstat (limited to 'data/pokemon')
| -rw-r--r-- | data/pokemon/base_stats.asm | 2 | ||||
| -rw-r--r-- | data/pokemon/cries.asm | 2 | ||||
| -rw-r--r-- | data/pokemon/dex_entries.asm | 2 | ||||
| -rw-r--r-- | data/pokemon/dex_order.asm | 2 | ||||
| -rw-r--r-- | data/pokemon/evos_moves.asm | 2 | ||||
| -rw-r--r-- | data/pokemon/names.asm | 2 | ||||
| -rw-r--r-- | data/pokemon/palettes.asm | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 7b478ef8..0c7909ca 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -1,5 +1,5 @@ BaseStats:: - table_width BASE_DATA_SIZE, BaseStats + table_width BASE_DATA_SIZE INCLUDE "data/pokemon/base_stats/bulbasaur.asm" INCLUDE "data/pokemon/base_stats/ivysaur.asm" INCLUDE "data/pokemon/base_stats/venusaur.asm" diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index 290f5625..eab1818e 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -4,7 +4,7 @@ MACRO mon_cry ENDM CryData:: - table_width 3, CryData + table_width 3 ; base cry, pitch, length mon_cry SFX_CRY_11, $00, $80 ; Rhydon mon_cry SFX_CRY_03, $00, $80 ; Kangaskhan diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 0f8b6d96..f4a4b1db 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -1,5 +1,5 @@ PokedexEntryPointers: - table_width 2, PokedexEntryPointers + table_width 2 dw RhydonDexEntry dw KangaskhanDexEntry dw NidoranMDexEntry diff --git a/data/pokemon/dex_order.asm b/data/pokemon/dex_order.asm index 32e7a79b..7c47ddcc 100644 --- a/data/pokemon/dex_order.asm +++ b/data/pokemon/dex_order.asm @@ -1,5 +1,5 @@ PokedexOrder: - table_width 1, PokedexOrder + table_width 1 db DEX_RHYDON db DEX_KANGASKHAN db DEX_NIDORAN_M diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index d6ba0da1..8bee626a 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -9,7 +9,7 @@ ; - db 0 ; no more level-up moves EvosMovesPointerTable: - table_width 2, EvosMovesPointerTable + table_width 2 dw RhydonEvosMoves dw KangaskhanEvosMoves dw NidoranMEvosMoves diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 56aa9f5d..5d447c92 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -1,5 +1,5 @@ MonsterNames:: - table_width NAME_LENGTH - 1, MonsterNames + table_width NAME_LENGTH - 1 db "RHYDON@@@@" db "KANGASKHAN" db "NIDORAN♂@@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 4aec84ea..f0485e16 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -1,5 +1,5 @@ MonsterPalettes: - table_width 1, MonsterPalettes + table_width 1 db PAL_MEWMON ; MISSINGNO db PAL_GREENMON ; BULBASAUR db PAL_GREENMON ; IVYSAUR |