diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2019-05-25 14:44:09 +0200 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-05-25 08:26:40 -0500 |
| commit | a074f36766fbfe62a2bb921286fb332a42d1a776 (patch) | |
| tree | 998a4d7128b6b0c5e4558ae424b60c1491c79d99 | |
| parent | e7062805030c23a11179d73a69da50076390ef73 (diff) | |
USE PROTAG
| -rw-r--r-- | include/constants/trainers.h | 2 | ||||
| -rw-r--r-- | src/data/pokemon/trainer_class_lookups.h | 5 | ||||
| -rw-r--r-- | src/data/text/trainer_class_names.h | 2 | ||||
| -rw-r--r-- | src/data/trainers.h | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/include/constants/trainers.h b/include/constants/trainers.h index 10b50290d..a99242a57 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -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_RS_PLAYER 0x41 +#define TRAINER_CLASS_RS_PROTAG 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 f0dc47bff..0f2b53a18 100644 --- a/src/data/pokemon/trainer_class_lookups.h +++ b/src/data/pokemon/trainer_class_lookups.h @@ -166,7 +166,6 @@ 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_RS_PLAYER, - [FACILITY_CLASS_RS_MAY] = TRAINER_CLASS_RS_PLAYER, + [FACILITY_CLASS_RS_BRENDAN] = TRAINER_CLASS_RS_PROTAG, + [FACILITY_CLASS_RS_MAY] = TRAINER_CLASS_RS_PROTAG, }; - diff --git a/src/data/text/trainer_class_names.h b/src/data/text/trainer_class_names.h index 3150d9b6c..f012e877b 100644 --- a/src/data/text/trainer_class_names.h +++ b/src/data/text/trainer_class_names.h @@ -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_RS_PLAYER] = _("{PKMN} TRAINER"), + [TRAINER_CLASS_RS_PROTAG] = _("{PKMN} TRAINER"), }; diff --git a/src/data/trainers.h b/src/data/trainers.h index d58ded98f..57950377a 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_RS_PLAYER, + .trainerClass = TRAINER_CLASS_RS_PROTAG, .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_RS_PLAYER, + .trainerClass = TRAINER_CLASS_RS_PROTAG, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_MAY, .trainerName = _("MAY"), |