diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-03-02 10:48:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-02 10:48:56 -0500 |
| commit | 6280a3786ba77956fae95bb11b425e7301d0a6fa (patch) | |
| tree | b140b92b4bd9113d0dea6c6ed8197ace1f93f8fe /src/data | |
| parent | 47f6e9f97396d1486fe515b8a994bbc285060419 (diff) | |
| parent | 5198a05272716990bcd98b9b216d3431adb25a3e (diff) | |
Merge branch 'master' into doc-sixisland
Diffstat (limited to 'src/data')
| -rw-r--r-- | src/data/pokemon/trainer_class_lookups.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h index faf23bf31..2309f85a1 100644 --- a/src/data/pokemon/trainer_class_lookups.h +++ b/src/data/pokemon/trainer_class_lookups.h @@ -133,10 +133,10 @@ const u8 gFacilityClassToPicIndex[] = [FACILITY_CLASS_CRUSH_KIN] = 130, [FACILITY_CLASS_SIS_AND_BRO_2] = 131, [FACILITY_CLASS_PKMN_PROF] = 132, - [FACILITY_CLASS_PLAYER] = 133, - [FACILITY_CLASS_PLAYER_2] = 134, - [FACILITY_CLASS_PLAYER_3] = 135, - [FACILITY_CLASS_PLAYER_4] = 136, + [FACILITY_CLASS_BRENDAN] = TRAINER_PIC_RS_BRENDAN_2, + [FACILITY_CLASS_MAY] = TRAINER_PIC_RS_MAY_2, + [FACILITY_CLASS_RED] = TRAINER_PIC_RED, + [FACILITY_CLASS_LEAF] = TRAINER_PIC_LEAF, [FACILITY_CLASS_TEAM_ROCKET_2] = 137, [FACILITY_CLASS_PSYCHIC_4] = 138, [FACILITY_CLASS_CRUSH_GIRL] = 139, @@ -287,10 +287,10 @@ const u8 gFacilityClassToTrainerClass[] = [FACILITY_CLASS_CRUSH_KIN] = CLASS_CRUSH_KIN, [FACILITY_CLASS_SIS_AND_BRO_2] = CLASS_SIS_AND_BRO_2, [FACILITY_CLASS_PKMN_PROF] = CLASS_PKMN_PROF, - [FACILITY_CLASS_PLAYER] = CLASS_PLAYER, - [FACILITY_CLASS_PLAYER_2] = CLASS_PLAYER, - [FACILITY_CLASS_PLAYER_3] = CLASS_PLAYER, - [FACILITY_CLASS_PLAYER_4] = CLASS_PLAYER, + [FACILITY_CLASS_BRENDAN] = CLASS_PLAYER, + [FACILITY_CLASS_MAY] = CLASS_PLAYER, + [FACILITY_CLASS_RED] = CLASS_PLAYER, + [FACILITY_CLASS_LEAF] = CLASS_PLAYER, [FACILITY_CLASS_TEAM_ROCKET_2] = CLASS_TEAM_ROCKET, [FACILITY_CLASS_PSYCHIC_4] = CLASS_PSYCHIC_2, [FACILITY_CLASS_CRUSH_GIRL] = CLASS_CRUSH_GIRL, |