Don't pass redundant label names to table_width and list_start (#1160)

This commit is contained in:
Rangi
2024-12-27 12:35:35 -05:00
committed by GitHub
parent 3f686e67da
commit 85ddf0e90a
140 changed files with 214 additions and 203 deletions

View File

@@ -22,7 +22,7 @@ MACRO tmhm
ENDM
BaseData::
table_width BASE_DATA_SIZE, BaseData
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"

View File

@@ -5,7 +5,7 @@ ENDM
PokemonCries::
; entries correspond to constants/pokemon_constants.asm
table_width MON_CRY_LENGTH, PokemonCries
table_width MON_CRY_LENGTH
mon_cry CRY_BULBASAUR, 128, 129 ; BULBASAUR
mon_cry CRY_BULBASAUR, 32, 256 ; IVYSAUR
mon_cry CRY_BULBASAUR, 0, 320 ; VENUSAUR

View File

@@ -1,6 +1,6 @@
PokedexDataPointerTable:
; entries correspond to constants/pokemon_constants.asm
table_width 2, PokedexDataPointerTable
table_width 2
dw BulbasaurPokedexEntry
dw IvysaurPokedexEntry
dw VenusaurPokedexEntry

View File

@@ -1,7 +1,7 @@
; Every Pokémon sorted alphabetically by name.
AlphabeticalPokedexOrder:
table_width 1, AlphabeticalPokedexOrder
table_width 1
db ABRA
db AERODACTYL
db AIPOM

View File

@@ -1,7 +1,7 @@
; Every Pokémon sorted in New Pokédex Order.
NewPokedexOrder:
table_width 1, NewPokedexOrder
table_width 1
db CHIKORITA
db BAYLEEF
db MEGANIUM

View File

@@ -1,5 +1,5 @@
EggMovePointers::
table_width 2, EggMovePointers
table_width 2
dw BulbasaurEggMoves
dw NoEggMoves
dw NoEggMoves

View File

@@ -1,7 +1,7 @@
; Evolutions and attacks are grouped together since they're both checked at level-up.
EvosAttacksPointers::
table_width 2, EvosAttacksPointers
table_width 2
dw BulbasaurEvosAttacks
dw IvysaurEvosAttacks
dw VenusaurEvosAttacks

View File

@@ -1,7 +1,7 @@
; The original base Special stat for each Pokémon from Red/Blue
KantoMonSpecials:
table_width 1, KantoMonSpecials
table_width 1
db 65 ; BULBASAUR
db 80 ; IVYSAUR
db 100 ; VENUSAUR

View File

@@ -1,5 +1,5 @@
Pokered_MonIndices:
table_width 1, Pokered_MonIndices
table_width 1
db RHYDON
db KANGASKHAN
db NIDORAN_M

View File

@@ -1,7 +1,7 @@
; party menu icons
MonMenuIcons:
table_width 1, MonMenuIcons
table_width 1
db ICON_BULBASAUR ; BULBASAUR
db ICON_BULBASAUR ; IVYSAUR
db ICON_BULBASAUR ; VENUSAUR

View File

@@ -1,5 +1,5 @@
PokemonNames::
table_width NAME_LENGTH - 1, PokemonNames
table_width NAME_LENGTH - 1
db "BULBASAUR@"
db "IVYSAUR@@@"
db "VENUSAUR@@"

View File

@@ -6,7 +6,7 @@ PokemonPalettes:
; Shiny palettes are defined directly, not generated.
; 2 middle palettes, normal and shiny, with 2 colors each
table_width PAL_COLOR_SIZE * 2 * 2, PokemonPalettes
table_width PAL_COLOR_SIZE * 2 * 2
; 000
RGB 30, 22, 17

View File

@@ -2,7 +2,7 @@
PokemonPicPointers::
; entries correspond to Pokémon species
table_width 3 * 2, PokemonPicPointers
table_width 3 * 2
dba_pics BulbasaurFrontpic, BulbasaurBackpic
dba_pics IvysaurFrontpic, IvysaurBackpic
dba_pics VenusaurFrontpic, VenusaurBackpic

View File

@@ -1,6 +1,6 @@
UnownPicPointers::
; entries correspond to Unown letters
table_width 3 * 2, UnownPicPointers
table_width 3 * 2
dba_pics UnownAFrontpic, UnownABackpic
dba_pics UnownBFrontpic, UnownBBackpic
dba_pics UnownCFrontpic, UnownCBackpic

View File

@@ -7,7 +7,7 @@ ENDM
UnownWords:
; entries correspond to UNOWN_* form constants
table_width 2, UnownWords
table_width 2
dw UnownWordA ; unused
dw UnownWordA
dw UnownWordB