diff options
| -rw-r--r-- | include/constants/trainers.h | 8 | ||||
| -rw-r--r-- | src/data/pokemon/trainer_class_lookups.h | 4 | ||||
| -rw-r--r-- | src/data/text/trainer_class_names.h | 4 | ||||
| -rw-r--r-- | src/data/trainers.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/include/constants/trainers.h b/include/constants/trainers.h index 2a6c306b4..10b50290d 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -202,8 +202,8 @@ #define FACILITY_CLASSES_COUNT 0x52 -#define TRAINER_CLASS_PKMN_TRAINER_1 0x0 -#define TRAINER_CLASS_PKMN_TRAINER_2 0x1 +#define TRAINER_CLASS_PKMN_TRAINER_1 0x0 // Unused +#define TRAINER_CLASS_PKMN_TRAINER_2 0x1 // Unused #define TRAINER_CLASS_HIKER 0x2 #define TRAINER_CLASS_TEAM_AQUA 0x3 #define TRAINER_CLASS_PKMN_BREEDER 0x4 @@ -250,7 +250,7 @@ #define TRAINER_CLASS_SWIMMER_F 0x2d #define TRAINER_CLASS_TWINS 0x2e #define TRAINER_CLASS_SAILOR 0x2f -#define TRAINER_CLASS_COOLTRAINER_UNUSED 0x30 +#define TRAINER_CLASS_COOLTRAINER_2 0x30 // Unused #define TRAINER_CLASS_MAGMA_ADMIN 0x31 #define TRAINER_CLASS_PKMN_TRAINER_3 0x32 #define TRAINER_CLASS_BUG_CATCHER 0x33 @@ -267,7 +267,7 @@ #define TRAINER_CLASS_FACTORY_HEAD 0x3e #define TRAINER_CLASS_PIKE_QUEEN 0x3f #define TRAINER_CLASS_PYRAMID_KING 0x40 -#define TRAINER_CLASS_PKMN_TRAINER_4 0x41 +#define TRAINER_CLASS_RS_PLAYER 0x41 #define TRAINER_ENCOUNTER_MUSIC_MALE 0 // standard male encounter music #define TRAINER_ENCOUNTER_MUSIC_FEMALE 1 // standard female encounter music diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h index 04c7ab3c4..f0dc47bff 100644 --- a/src/data/pokemon/trainer_class_lookups.h +++ b/src/data/pokemon/trainer_class_lookups.h @@ -166,7 +166,7 @@ const u8 gFacilityClassToTrainerClass[] = [FACILITY_CLASS_DOME_ACE_TUCKER] = TRAINER_CLASS_DOME_ACE, [FACILITY_CLASS_RED] = TRAINER_CLASS_PKMN_TRAINER_3, [FACILITY_CLASS_LEAF] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_RS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_4, - [FACILITY_CLASS_RS_MAY] = TRAINER_CLASS_PKMN_TRAINER_4, + [FACILITY_CLASS_RS_BRENDAN] = TRAINER_CLASS_RS_PLAYER, + [FACILITY_CLASS_RS_MAY] = TRAINER_CLASS_RS_PLAYER, }; diff --git a/src/data/text/trainer_class_names.h b/src/data/text/trainer_class_names.h index dd750b354..3150d9b6c 100644 --- a/src/data/text/trainer_class_names.h +++ b/src/data/text/trainer_class_names.h @@ -47,7 +47,7 @@ const u8 gTrainerClassNames[][13] = { [TRAINER_CLASS_SWIMMER_F] = _("SWIMMER♀"), [TRAINER_CLASS_TWINS] = _("TWINS"), [TRAINER_CLASS_SAILOR] = _("SAILOR"), - [TRAINER_CLASS_COOLTRAINER_UNUSED] = _("COOLTRAINER"), + [TRAINER_CLASS_COOLTRAINER_2] = _("COOLTRAINER"), [TRAINER_CLASS_MAGMA_ADMIN] = _("MAGMA ADMIN"), [TRAINER_CLASS_PKMN_TRAINER_3] = _("{PKMN} TRAINER"), [TRAINER_CLASS_BUG_CATCHER] = _("BUG CATCHER"), @@ -64,5 +64,5 @@ const u8 gTrainerClassNames[][13] = { [TRAINER_CLASS_FACTORY_HEAD] = _("FACTORY HEAD"), [TRAINER_CLASS_PIKE_QUEEN] = _("PIKE QUEEN"), [TRAINER_CLASS_PYRAMID_KING] = _("PYRAMID KING"), - [TRAINER_CLASS_PKMN_TRAINER_4] = _("{PKMN} TRAINER"), + [TRAINER_CLASS_RS_PLAYER] = _("{PKMN} TRAINER"), }; diff --git a/src/data/trainers.h b/src/data/trainers.h index 33806e812..d58ded98f 100644 --- a/src/data/trainers.h +++ b/src/data/trainers.h @@ -11944,7 +11944,7 @@ const struct Trainer gTrainers[] = { [TRAINER_BRENDAN_16] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_PKMN_TRAINER_4, + .trainerClass = TRAINER_CLASS_RS_PLAYER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_BRENDAN, .trainerName = _("BRENDAN"), @@ -11958,7 +11958,7 @@ const struct Trainer gTrainers[] = { [TRAINER_MAY_16] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_PKMN_TRAINER_4, + .trainerClass = TRAINER_CLASS_RS_PLAYER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_MAY, .trainerName = _("MAY"), |