ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-26 21:33:53 +01:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/constants/trainers.h
View File

@ -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

5
src/data/pokemon/trainer_class_lookups.h
View File

@ -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,
};

2
src/data/text/trainer_class_names.h
View File

@ -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"),
};

4
src/data/trainers.h
View File

@ -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"),