From 2779421ad479312eba5a0fc5bb993473e83465ee Mon Sep 17 00:00:00 2001 From: Melody Date: Mon, 3 Dec 2018 08:01:52 -0500 Subject: fix brendan/may/wally consistency issues --- src/data/pokemon/trainer_class_lookups.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/data/pokemon') diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h index 4d3492e8b..6d28a9a06 100644 --- a/src/data/pokemon/trainer_class_lookups.h +++ b/src/data/pokemon/trainer_class_lookups.h @@ -62,13 +62,13 @@ const u8 gFacilityClassToPicIndex[] = [FACILITY_CLASS_SWIMMER_F] = TRAINER_PIC_SWIMMER_F, [FACILITY_CLASS_TWINS] = TRAINER_PIC_TWINS, [FACILITY_CLASS_SAILOR] = TRAINER_PIC_SAILOR, - [FACILITY_CLASS_PKMN_TRAINER_WALLY] = TRAINER_PIC_WALLY, - [FACILITY_CLASS_PKMN_TRAINER_BRENDAN] = TRAINER_PIC_BRENDAN, - [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2] = TRAINER_PIC_BRENDAN, - [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3] = TRAINER_PIC_BRENDAN, - [FACILITY_CLASS_PKMN_TRAINER_MAY] = TRAINER_PIC_MAY, - [FACILITY_CLASS_PKMN_TRAINER_MAY_2] = TRAINER_PIC_MAY, - [FACILITY_CLASS_PKMN_TRAINER_MAY_3] = TRAINER_PIC_MAY, + [FACILITY_CLASS_WALLY] = TRAINER_PIC_WALLY, + [FACILITY_CLASS_BRENDAN] = TRAINER_PIC_BRENDAN, + [FACILITY_CLASS_BRENDAN_2] = TRAINER_PIC_BRENDAN, + [FACILITY_CLASS_BRENDAN_3] = TRAINER_PIC_BRENDAN, + [FACILITY_CLASS_MAY] = TRAINER_PIC_MAY, + [FACILITY_CLASS_MAY_2] = TRAINER_PIC_MAY, + [FACILITY_CLASS_MAY_3] = TRAINER_PIC_MAY, [FACILITY_CLASS_PKMN_BREEDER_M] = TRAINER_PIC_POKEMON_BREEDER_M, [FACILITY_CLASS_BUG_CATCHER] = TRAINER_PIC_BUG_CATCHER, [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_PIC_POKEMON_RANGER_M, @@ -148,13 +148,13 @@ const u8 gFacilityClassToTrainerClass[] = [FACILITY_CLASS_SWIMMER_F] = TRAINER_CLASS_SWIMMER_F, [FACILITY_CLASS_TWINS] = TRAINER_CLASS_TWINS, [FACILITY_CLASS_SAILOR] = TRAINER_CLASS_SAILOR, - [FACILITY_CLASS_PKMN_TRAINER_WALLY] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_MAY] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_MAY_2] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_MAY_3] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_WALLY] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_MAY] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_BRENDAN_2] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_BRENDAN_3] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_MAY_2] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_MAY_3] = TRAINER_CLASS_PKMN_TRAINER_3, [FACILITY_CLASS_PKMN_BREEDER_M] = TRAINER_CLASS_PKMN_BREEDER, [FACILITY_CLASS_BUG_CATCHER] = TRAINER_CLASS_BUG_CATCHER, [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_CLASS_PKMN_RANGER, -- cgit v1.2.3