atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename PKMN TRAINER CALSS 4

Browse source
This commit is contained in:
DizzyEggg 2019-05-25 14:35:44 +02:00 committed by huderlem
parent 22880768d5
commit e706280503
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/constants/trainers.h
View file

@ -202,8 +202,8 @@
#define FACILITY_CLASSES_COUNT 0x52 #define FACILITY_CLASSES_COUNT 0x52
#define TRAINER_CLASS_PKMN_TRAINER_1 0x0 #define TRAINER_CLASS_PKMN_TRAINER_1 0x0 // Unused
#define TRAINER_CLASS_PKMN_TRAINER_2 0x1 #define TRAINER_CLASS_PKMN_TRAINER_2 0x1 // Unused
#define TRAINER_CLASS_HIKER 0x2 #define TRAINER_CLASS_HIKER 0x2
#define TRAINER_CLASS_TEAM_AQUA 0x3 #define TRAINER_CLASS_TEAM_AQUA 0x3
#define TRAINER_CLASS_PKMN_BREEDER 0x4 #define TRAINER_CLASS_PKMN_BREEDER 0x4
@ -250,7 +250,7 @@
#define TRAINER_CLASS_SWIMMER_F 0x2d #define TRAINER_CLASS_SWIMMER_F 0x2d
#define TRAINER_CLASS_TWINS 0x2e #define TRAINER_CLASS_TWINS 0x2e
#define TRAINER_CLASS_SAILOR 0x2f #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_MAGMA_ADMIN 0x31
#define TRAINER_CLASS_PKMN_TRAINER_3 0x32 #define TRAINER_CLASS_PKMN_TRAINER_3 0x32
#define TRAINER_CLASS_BUG_CATCHER 0x33 #define TRAINER_CLASS_BUG_CATCHER 0x33
@ -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_PKMN_TRAINER_4 0x41 #define TRAINER_CLASS_RS_PLAYER 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

4
src/data/pokemon/trainer_class_lookups.h
View file

@ -166,7 +166,7 @@ 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_PKMN_TRAINER_4, [FACILITY_CLASS_RS_BRENDAN] = TRAINER_CLASS_RS_PLAYER,
[FACILITY_CLASS_RS_MAY] = TRAINER_CLASS_PKMN_TRAINER_4, [FACILITY_CLASS_RS_MAY] = TRAINER_CLASS_RS_PLAYER,
}; };

4
src/data/text/trainer_class_names.h
View file

@ -47,7 +47,7 @@ const u8 gTrainerClassNames[][13] = {
[TRAINER_CLASS_SWIMMER_F] = _("SWIMMER♀"), [TRAINER_CLASS_SWIMMER_F] = _("SWIMMER♀"),
[TRAINER_CLASS_TWINS] = _("TWINS"), [TRAINER_CLASS_TWINS] = _("TWINS"),
[TRAINER_CLASS_SAILOR] = _("SAILOR"), [TRAINER_CLASS_SAILOR] = _("SAILOR"),
[TRAINER_CLASS_COOLTRAINER_UNUSED] = _("COOLTRAINER"), [TRAINER_CLASS_COOLTRAINER_2] = _("COOLTRAINER"),
[TRAINER_CLASS_MAGMA_ADMIN] = _("MAGMA ADMIN"), [TRAINER_CLASS_MAGMA_ADMIN] = _("MAGMA ADMIN"),
[TRAINER_CLASS_PKMN_TRAINER_3] = _("{PKMN} TRAINER"), [TRAINER_CLASS_PKMN_TRAINER_3] = _("{PKMN} TRAINER"),
[TRAINER_CLASS_BUG_CATCHER] = _("BUG CATCHER"), [TRAINER_CLASS_BUG_CATCHER] = _("BUG CATCHER"),
@ -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_PKMN_TRAINER_4] = _("{PKMN} TRAINER"), [TRAINER_CLASS_RS_PLAYER] = _("{PKMN} TRAINER"),
}; };

4
src/data/trainers.h
View file

@ -11944,7 +11944,7 @@ const struct Trainer gTrainers[] = {
[TRAINER_BRENDAN_16] = [TRAINER_BRENDAN_16] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_4, .trainerClass = TRAINER_CLASS_RS_PLAYER,
.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_PKMN_TRAINER_4, .trainerClass = TRAINER_CLASS_RS_PLAYER,
.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"),