dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

USE PROTAG

Browse Source
This commit is contained in:
DizzyEggg
2019-05-25 14:44:09 +02:00
committed by huderlem
parent e706280503
commit a074f36766
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/trainers.h
+1 -1
View File
@@ -267,7 +267,7 @@
#define TRAINER_CLASS_FACTORY_HEAD 0x3e #define TRAINER_CLASS_FACTORY_HEAD 0x3e
#define TRAINER_CLASS_PIKE_QUEEN 0x3f #define TRAINER_CLASS_PIKE_QUEEN 0x3f
#define TRAINER_CLASS_PYRAMID_KING 0x40 #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_MALE 0 // standard male encounter music
#define TRAINER_ENCOUNTER_MUSIC_FEMALE 1 // standard female encounter music #define TRAINER_ENCOUNTER_MUSIC_FEMALE 1 // standard female encounter music
src/data/pokemon/trainer_class_lookups.h
+2 -3
View File
@@ -166,7 +166,6 @@ const u8 gFacilityClassToTrainerClass[] =
[FACILITY_CLASS_DOME_ACE_TUCKER] = TRAINER_CLASS_DOME_ACE, [FACILITY_CLASS_DOME_ACE_TUCKER] = TRAINER_CLASS_DOME_ACE,
[FACILITY_CLASS_RED] = TRAINER_CLASS_PKMN_TRAINER_3, [FACILITY_CLASS_RED] = TRAINER_CLASS_PKMN_TRAINER_3,
[FACILITY_CLASS_LEAF] = TRAINER_CLASS_PKMN_TRAINER_3, [FACILITY_CLASS_LEAF] = TRAINER_CLASS_PKMN_TRAINER_3,
[FACILITY_CLASS_RS_BRENDAN] = TRAINER_CLASS_RS_PLAYER, [FACILITY_CLASS_RS_BRENDAN] = TRAINER_CLASS_RS_PROTAG,
[FACILITY_CLASS_RS_MAY] = TRAINER_CLASS_RS_PLAYER, [FACILITY_CLASS_RS_MAY] = TRAINER_CLASS_RS_PROTAG,
}; };
src/data/text/trainer_class_names.h
+1 -1
View File
@@ -64,5 +64,5 @@ const u8 gTrainerClassNames[][13] = {
[TRAINER_CLASS_FACTORY_HEAD] = _("FACTORY HEAD"), [TRAINER_CLASS_FACTORY_HEAD] = _("FACTORY HEAD"),
[TRAINER_CLASS_PIKE_QUEEN] = _("PIKE QUEEN"), [TRAINER_CLASS_PIKE_QUEEN] = _("PIKE QUEEN"),
[TRAINER_CLASS_PYRAMID_KING] = _("PYRAMID KING"), [TRAINER_CLASS_PYRAMID_KING] = _("PYRAMID KING"),
[TRAINER_CLASS_RS_PLAYER] = _("{PKMN} TRAINER"), [TRAINER_CLASS_RS_PROTAG] = _("{PKMN} TRAINER"),
}; };
src/data/trainers.h
+2 -2
View File
@@ -11944,7 +11944,7 @@ const struct Trainer gTrainers[] = {
[TRAINER_BRENDAN_16] = [TRAINER_BRENDAN_16] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RS_PLAYER, .trainerClass = TRAINER_CLASS_RS_PROTAG,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_RS_BRENDAN, .trainerPic = TRAINER_PIC_RS_BRENDAN,
.trainerName = _("BRENDAN"), .trainerName = _("BRENDAN"),
@@ -11958,7 +11958,7 @@ const struct Trainer gTrainers[] = {
[TRAINER_MAY_16] = [TRAINER_MAY_16] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RS_PLAYER, .trainerClass = TRAINER_CLASS_RS_PROTAG,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_RS_MAY, .trainerPic = TRAINER_PIC_RS_MAY,
.trainerName = _("MAY"), .trainerName = _("MAY"),