Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
data/trainers/attributes.asm
View File

@@ -1,6 +1,6 @@
TrainerClassAttributes:
; entries correspond to trainer classes (see constants/trainer_constants.asm)
table_width NUM_TRAINER_ATTRIBUTES, TrainerClassAttributes
table_width NUM_TRAINER_ATTRIBUTES
; Falkner
db NO_ITEM, NO_ITEM ; items

2
data/trainers/class_names.asm
View File

@@ -1,6 +1,6 @@
TrainerClassNames::
; entries correspond to trainer classes (see constants/trainer_constants.asm)
list_start TrainerClassNames
list_start
li "LEADER"
li "LEADER"
li "LEADER"

2
data/trainers/dvs.asm
View File

@@ -1,6 +1,6 @@
TrainerClassDVs:
; entries correspond to trainer classes (see constants/trainer_constants.asm)
table_width 2, TrainerClassDVs
table_width 2
; atk,def,spd,spc
dn 9, 10, 7, 7 ; FALKNER
dn 8, 8, 8, 8 ; WHITNEY

2
data/trainers/encounter_music.asm
View File

@@ -2,7 +2,7 @@
TrainerEncounterMusic::
; entries correspond to trainer classes (see constants/trainer_constants.asm)
table_width 1, TrainerEncounterMusic
table_width 1
db MUSIC_HIKER_ENCOUNTER ; none
db MUSIC_YOUNGSTER_ENCOUNTER ; falkner
db MUSIC_LASS_ENCOUNTER ; whitney

2
data/trainers/genders.asm
View File

@@ -2,7 +2,7 @@
BTTrainerClassGenders:
; entries correspond to trainer classes
table_width 1, BTTrainerClassGenders
table_width 1
db MALE ; FALKNER
db FEMALE ; WHITNEY
db FEMALE ; BUGSY

2
data/trainers/palettes.asm
View File

@@ -4,7 +4,7 @@ TrainerPalettes:
; Each .gbcpal is generated from the corresponding .png, and
; only the middle two colors are included, not black or white.
table_width PAL_COLOR_SIZE * 2, TrainerPalettes
table_width PAL_COLOR_SIZE * 2
PlayerPalette: ; Chris uses the same colors as Cal
INCBIN "gfx/trainers/cal.gbcpal", middle_colors

2
data/trainers/party_pointers.asm
View File

@@ -2,7 +2,7 @@
TrainerGroups:
; entries correspond to trainer classes (see constants/trainer_constants.asm)
table_width 2, TrainerGroups
table_width 2
dw FalknerGroup
dw WhitneyGroup
dw BugsyGroup

2
data/trainers/pic_pointers.asm
View File

@@ -2,7 +2,7 @@
TrainerPicPointers::
; entries correspond to trainer classes (see constants/trainer_constants.asm)
table_width 3, TrainerPicPointers
table_width 3
dba_pic FalknerPic
dba_pic WhitneyPic
dba_pic BugsyPic

2
data/trainers/sprites.asm
View File

@@ -1,6 +1,6 @@
BTTrainerClassSprites:
; entries correspond to trainer classes
table_width 1, BTTrainerClassSprites
table_width 1
db SPRITE_FALKNER
db SPRITE_WHITNEY
db SPRITE_BUGSY