diff options
Diffstat (limited to 'data/trainers')
| -rw-r--r-- | data/trainers/attributes.asm | 3 | ||||
| -rw-r--r-- | data/trainers/class_names.asm | 2 | ||||
| -rw-r--r-- | data/trainers/dvs.asm | 3 | ||||
| -rw-r--r-- | data/trainers/gendered_trainers.asm | 4 | ||||
| -rw-r--r-- | data/trainers/genders.asm | 3 | ||||
| -rw-r--r-- | data/trainers/palettes.asm | 3 |
6 files changed, 7 insertions, 11 deletions
diff --git a/data/trainers/attributes.asm b/data/trainers/attributes.asm index b64e2b3b4..364f62492 100644 --- a/data/trainers/attributes.asm +++ b/data/trainers/attributes.asm @@ -1,4 +1,4 @@ -TrainerClassAttributes: ; 3959c +TrainerClassAttributes: ; entries correspond to trainer classes (see constants/trainer_constants.asm) ; Falkner @@ -403,4 +403,3 @@ TrainerClassAttributes: ; 3959c dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY dw CONTEXT_USE | SWITCH_SOMETIMES -; 39771 diff --git a/data/trainers/class_names.asm b/data/trainers/class_names.asm index 48d81f910..66c953492 100644 --- a/data/trainers/class_names.asm +++ b/data/trainers/class_names.asm @@ -1,4 +1,4 @@ -TrainerClassNames:: ; 2c1ef +TrainerClassNames:: ; entries correspond to trainer classes (see constants/trainer_constants.asm) db "LEADER@" db "LEADER@" diff --git a/data/trainers/dvs.asm b/data/trainers/dvs.asm index 20188096c..5ed883681 100644 --- a/data/trainers/dvs.asm +++ b/data/trainers/dvs.asm @@ -1,4 +1,4 @@ -TrainerClassDVs: ; 270d6 +TrainerClassDVs: ; entries correspond to trainer classes (see constants/trainer_constants.asm) ; atk,def,spd,spc dn 9, 10, 7, 7 ; FALKNER @@ -68,4 +68,3 @@ TrainerClassDVs: ; 270d6 dn 9, 8, 8, 8 ; OFFICER dn 7, 14, 10, 8 ; GRUNTF dn 9, 8, 8, 8 ; MYSTICALMAN -; 2715c diff --git a/data/trainers/gendered_trainers.asm b/data/trainers/gendered_trainers.asm index 90df4c5f8..c3ff6ffd4 100644 --- a/data/trainers/gendered_trainers.asm +++ b/data/trainers/gendered_trainers.asm @@ -1,6 +1,6 @@ ; Used by GetMobileOTTrainerClass -MaleTrainers: ; 4e95d +MaleTrainers: db BURGLAR db YOUNGSTER db SCHOOLBOY @@ -28,7 +28,7 @@ MaleTrainers: ; 4e95d db SCIENTIST .End -FemaleTrainers: ; 4e976 +FemaleTrainers: db MEDIUM db LASS db BEAUTY diff --git a/data/trainers/genders.asm b/data/trainers/genders.asm index e9e78f4bf..1bfc925d2 100644 --- a/data/trainers/genders.asm +++ b/data/trainers/genders.asm @@ -1,6 +1,6 @@ ; Used by BattleTowerText -BTTrainerClassGenders: ; 11f2f0 +BTTrainerClassGenders: ; entries correspond to trainer classes db MALE ; FALKNER db FEMALE ; WHITNEY @@ -68,4 +68,3 @@ BTTrainerClassGenders: ; 11f2f0 db MALE ; BLUE db MALE ; OFFICER db FEMALE ; GRUNTF -; 11f332 diff --git a/data/trainers/palettes.asm b/data/trainers/palettes.asm index c502846c4..130c867bc 100644 --- a/data/trainers/palettes.asm +++ b/data/trainers/palettes.asm @@ -1,4 +1,4 @@ -TrainerPalettes: ; b0ce +TrainerPalettes: ; entries correspond to trainer classes PlayerPalette: ; Chris uses the same colors as Cal @@ -71,4 +71,3 @@ INCLUDE "gfx/trainers/blue.pal" INCLUDE "gfx/trainers/officer.pal" INCLUDE "gfx/trainers/grunt_f.pal" INCLUDE "gfx/trainers/mysticalman.pal" -; b1de |