diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-01-09 15:49:02 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2022-01-10 13:48:08 -0500 |
| commit | 08a18d6e32d5e9d02c42eed46ef7356c3ad41df7 (patch) | |
| tree | 44d3ad18d681d6e3328c411cf8fc7e23cbd9a2f6 | |
| parent | d0c79e4e479d633b65cb5a821de882416946a975 (diff) | |
Sync/update trainer classes
35 files changed, 4318 insertions, 5111 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index d1f46fef1..949af06ed 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -11,7 +11,6 @@ #include "constants/moves.h" #include "constants/songs.h" #include "constants/species.h" -#include "constants/trainer_classes.h" #include "constants/vars.h" #include "constants/battle.h" #include "constants/heal_locations.h" diff --git a/data/text/trainer_class_names.inc b/data/text/trainer_class_names.inc deleted file mode 100644 index 3c4955064..000000000 --- a/data/text/trainer_class_names.inc +++ /dev/null @@ -1,107 +0,0 @@ - .string "{PKMN} TRAINER$", 13 - .string "{PKMN} TRAINER$", 13 - .string "AQUA LEADER$", 13 - .string "TEAM AQUA$", 13 - .string "AROMA LADY$", 13 - .string "RUIN MANIAC$", 13 - .string "INTERVIEWER$", 13 - .string "TUBER$", 13 - .string "TUBER$", 13 - .string "COOLTRAINER$", 13 - .string "HEX MANIAC$", 13 - .string "LADY$", 13 - .string "BEAUTY$", 13 - .string "RICH BOY$", 13 - .string "POKéMANIAC$", 13 - .string "SWIMMER♂$", 13 - .string "BLACK BELT$", 13 - .string "GUITARIST$", 13 - .string "KINDLER$", 13 - .string "CAMPER$", 13 - .string "BUG MANIAC$", 13 - .string "PSYCHIC$", 13 - .string "GENTLEMAN$", 13 - .string "ELITE FOUR$", 13 - .string "LEADER$", 13 - .string "SCHOOL KID$", 13 - .string "SR. AND JR.$", 13 - .string "POKéFAN$", 13 - .string "EXPERT$", 13 - .string "YOUNGSTER$", 13 - .string "CHAMPION$", 13 - .string "FISHERMAN$", 13 - .string "TRIATHLETE$", 13 - .string "DRAGON TAMER$", 13 - .string "BIRD KEEPER$", 13 - .string "NINJA BOY$", 13 - .string "BATTLE GIRL$", 13 - .string "PARASOL LADY$", 13 - .string "SWIMMER♀$", 13 - .string "PICNICKER$", 13 - .string "TWINS$", 13 - .string "SAILOR$", 13 - .string "BOARDER$", 13 - .string "COLLECTOR$", 13 - .string "{PKMN} TRAINER$", 13 - .string "{PKMN} BREEDER$", 13 - .string "{PKMN} RANGER$", 13 - .string "MAGMA LEADER$", 13 - .string "TEAM MAGMA$", 13 - .string "LASS$", 13 - .string "BUG CATCHER$", 13 - .string "HIKER$", 13 - .string "YOUNG COUPLE$", 13 - .string "OLD COUPLE$", 13 - .string "SIS AND BRO$", 13 - .string "AQUA ADMIN$", 13 - .string "MAGMA ADMIN$", 13 - .string "YOUNGSTER$", 13 - .string "BUG CATCHER$", 13 - .string "LASS$", 13 - .string "SAILOR$", 13 - .string "CAMPER$", 13 - .string "PICNICKER$", 13 - .string "POKéMANIAC$", 13 - .string "SUPER NERD$", 13 - .string "HIKER$", 13 - .string "BIKER$", 13 - .string "BURGLAR$", 13 - .string "ENGINEER$", 13 - .string "FISHERMAN$", 13 - .string "SWIMMER♂$", 13 - .string "CUE BALL$", 13 - .string "GAMER$", 13 - .string "BEAUTY$", 13 - .string "SWIMMER♀$", 13 - .string "PSYCHIC$", 13 - .string "ROCKER$", 13 - .string "JUGGLER$", 13 - .string "TAMER$", 13 - .string "BIRD KEEPER$", 13 - .string "BLACK BELT$", 13 - .string "RIVAL$", 13 - .string "SCIENTIST$", 13 - .string "BOSS$", 13 - .string "LEADER$", 13 - .string "TEAM ROCKET$", 13 - .string "COOLTRAINER$", 13 - .string "ELITE FOUR$", 13 - .string "GENTLEMAN$", 13 - .string "RIVAL$", 13 - .string "CHAMPION$", 13 - .string "CHANNELER$", 13 - .string "TWINS$", 13 - .string "COOL COUPLE$", 13 - .string "YOUNG COUPLE$", 13 - .string "CRUSH KIN$", 13 - .string "SIS AND BRO$", 13 - .string "{PKMN} PROF.$", 13 - .string "PLAYER$", 13 - .string "CRUSH GIRL$", 13 - .string "TUBER$", 13 - .string "{PKMN} BREEDER$", 13 - .string "{PKMN} RANGER$", 13 - .string "AROMA LADY$", 13 - .string "RUIN MANIAC$", 13 - .string "LADY$", 13 - .string "PAINTER$", 13 diff --git a/graphics/trainers/front_pics/pokemon_breeder_f_front_pic.png b/graphics/trainers/front_pics/pokemon_breeder_front_pic.png Binary files differindex 35ff34854..35ff34854 100644 --- a/graphics/trainers/front_pics/pokemon_breeder_f_front_pic.png +++ b/graphics/trainers/front_pics/pokemon_breeder_front_pic.png diff --git a/graphics/trainers/front_pics/rival_1_front_pic.png b/graphics/trainers/front_pics/rival_early_front_pic.png Binary files differindex 75022cef7..75022cef7 100644 --- a/graphics/trainers/front_pics/rival_1_front_pic.png +++ b/graphics/trainers/front_pics/rival_early_front_pic.png diff --git a/graphics/trainers/front_pics/rival_2_front_pic.png b/graphics/trainers/front_pics/rival_late_front_pic.png Binary files differindex 822ac12c4..822ac12c4 100644 --- a/graphics/trainers/front_pics/rival_2_front_pic.png +++ b/graphics/trainers/front_pics/rival_late_front_pic.png diff --git a/graphics/trainers/front_pics/pokemon_breeder_m_front_pic.png b/graphics/trainers/front_pics/rs_pokemon_breeder_m_front_pic.png Binary files differindex da37f87dd..da37f87dd 100644 --- a/graphics/trainers/front_pics/pokemon_breeder_m_front_pic.png +++ b/graphics/trainers/front_pics/rs_pokemon_breeder_m_front_pic.png diff --git a/graphics/trainers/palettes/pokemon_breeder_f.pal b/graphics/trainers/palettes/pokemon_breeder.pal index bfc59e3af..bfc59e3af 100644 --- a/graphics/trainers/palettes/pokemon_breeder_f.pal +++ b/graphics/trainers/palettes/pokemon_breeder.pal diff --git a/graphics/trainers/palettes/rival_1.pal b/graphics/trainers/palettes/rival_early.pal index fa9ae905b..fa9ae905b 100644 --- a/graphics/trainers/palettes/rival_1.pal +++ b/graphics/trainers/palettes/rival_early.pal diff --git a/graphics/trainers/palettes/rival_2.pal b/graphics/trainers/palettes/rival_late.pal index fa9ae905b..fa9ae905b 100644 --- a/graphics/trainers/palettes/rival_2.pal +++ b/graphics/trainers/palettes/rival_late.pal diff --git a/graphics/trainers/palettes/pokemon_breeder_m.pal b/graphics/trainers/palettes/rs_pokemon_breeder_m.pal index 6551f8482..6551f8482 100644 --- a/graphics/trainers/palettes/pokemon_breeder_m.pal +++ b/graphics/trainers/palettes/rs_pokemon_breeder_m.pal diff --git a/include/constants/facility_trainer_classes.h b/include/constants/facility_trainer_classes.h deleted file mode 100644 index fe94608dd..000000000 --- a/include/constants/facility_trainer_classes.h +++ /dev/null @@ -1,155 +0,0 @@ -#ifndef GUARD_CONSTANTS_FACILITY_TRAINER_CLASSES_H -#define GUARD_CONSTANTS_FACILITY_TRAINER_CLASSES_H - -#define FACILITY_CLASS_AQUA_LEADER 0x00 -#define FACILITY_CLASS_TEAM_AQUA 0x01 -#define FACILITY_CLASS_TEAM_AQUA_2 0x02 -#define FACILITY_CLASS_AROMA_LADY 0x03 -#define FACILITY_CLASS_RUIN_MANIAC 0x04 -#define FACILITY_CLASS_INTERVIEWER 0x05 -#define FACILITY_CLASS_TUBER 0x06 -#define FACILITY_CLASS_TUBER_2 0x07 -#define FACILITY_CLASS_COOLTRAINER 0x08 -#define FACILITY_CLASS_COOLTRAINER_2 0x09 -#define FACILITY_CLASS_HEX_MANIAC 0x0A -#define FACILITY_CLASS_LADY 0x0B -#define FACILITY_CLASS_BEAUTY 0x0C -#define FACILITY_CLASS_RICH_BOY 0x0D -#define FACILITY_CLASS_POKEMANIAC 0x0E -#define FACILITY_CLASS_SWIMMER_MALE 0x0F -#define FACILITY_CLASS_BLACK_BELT 0x10 -#define FACILITY_CLASS_GUITARIST 0x11 -#define FACILITY_CLASS_KINDLER 0x12 -#define FACILITY_CLASS_CAMPER 0x13 -#define FACILITY_CLASS_BUG_MANIAC 0x14 -#define FACILITY_CLASS_PSYCHIC 0x15 -#define FACILITY_CLASS_PSYCHIC_2 0x16 -#define FACILITY_CLASS_GENTLEMAN 0x17 -#define FACILITY_CLASS_ELITE_FOUR 0x18 -#define FACILITY_CLASS_ELITE_FOUR_2 0x19 -#define FACILITY_CLASS_LEADER 0x1A -#define FACILITY_CLASS_LEADER_2 0x1B -#define FACILITY_CLASS_LEADER_3 0x1C -#define FACILITY_CLASS_SCHOOL_KID 0x1D -#define FACILITY_CLASS_SCHOOL_KID_2 0x1E -#define FACILITY_CLASS_SR_AND_JR 0x1F -#define FACILITY_CLASS_POKEFAN 0x20 -#define FACILITY_CLASS_POKEFAN_2 0x21 -#define FACILITY_CLASS_EXPERT 0x22 -#define FACILITY_CLASS_EXPERT_2 0x23 -#define FACILITY_CLASS_YOUNGSTER 0x24 -#define FACILITY_CLASS_CHAMPION 0x25 -#define FACILITY_CLASS_FISHERMAN 0x26 -#define FACILITY_CLASS_TRIATHLETE 0x27 -#define FACILITY_CLASS_TRIATHLETE_2 0x28 -#define FACILITY_CLASS_TRIATHLETE_3 0x29 -#define FACILITY_CLASS_TRIATHLETE_4 0x2A -#define FACILITY_CLASS_TRIATHLETE_5 0x2B -#define FACILITY_CLASS_TRIATHLETE_6 0x2C -#define FACILITY_CLASS_DRAGON_TAMER 0x2D -#define FACILITY_CLASS_BIRD_KEEPER 0x2E -#define FACILITY_CLASS_NINJA_BOY 0x2F -#define FACILITY_CLASS_BATTLE_GIRL 0x30 -#define FACILITY_CLASS_PARASOL_LADY 0x31 -#define FACILITY_CLASS_SWIMMER_FEMALE 0x32 -#define FACILITY_CLASS_PICNICKER 0x33 -#define FACILITY_CLASS_TWINS 0x34 -#define FACILITY_CLASS_SAILOR 0x35 -#define FACILITY_CLASS_BOARDER 0x36 -#define FACILITY_CLASS_BOARDER_2 0x37 -#define FACILITY_CLASS_COLLECTOR 0x38 -#define FACILITY_CLASS_PKMN_TRAINER 0x39 -#define FACILITY_CLASS_PKMN_TRAINER_2 0x3A -#define FACILITY_CLASS_PKMN_TRAINER_3 0x3B -#define FACILITY_CLASS_PKMN_TRAINER_4 0x3C -#define FACILITY_CLASS_PKMN_TRAINER_5 0x3D -#define FACILITY_CLASS_PKMN_TRAINER_6 0x3E -#define FACILITY_CLASS_PKMN_TRAINER_7 0x3F -#define FACILITY_CLASS_PKMN_BREEDER 0x40 -#define FACILITY_CLASS_PKMN_BREEDER_2 0x41 -#define FACILITY_CLASS_PKMN_RANGER 0x42 -#define FACILITY_CLASS_PKMN_RANGER_2 0x43 -#define FACILITY_CLASS_MAGMA_LEADER 0x44 -#define FACILITY_CLASS_TEAM_MAGMA 0x45 -#define FACILITY_CLASS_TEAM_MAGMA_2 0x46 -#define FACILITY_CLASS_LASS 0x47 -#define FACILITY_CLASS_BUG_CATCHER 0x48 -#define FACILITY_CLASS_HIKER 0x49 -#define FACILITY_CLASS_YOUNG_COUPLE 0x4A -#define FACILITY_CLASS_OLD_COUPLE 0x4B -#define FACILITY_CLASS_SIS_AND_BRO 0x4C -#define FACILITY_CLASS_AQUA_ADMIN 0x4D -#define FACILITY_CLASS_AQUA_ADMIN_2 0x4E -#define FACILITY_CLASS_MAGMA_ADMIN 0x4F -#define FACILITY_CLASS_MAGMA_ADMIN_2 0x50 -#define FACILITY_CLASS_LEADER_4 0x51 -#define FACILITY_CLASS_LEADER_5 0x52 -#define FACILITY_CLASS_LEADER_6 0x53 -#define FACILITY_CLASS_LEADER_7 0x54 -#define FACILITY_CLASS_LEADER_8 0x55 -#define FACILITY_CLASS_ELITE_FOUR_3 0x56 -#define FACILITY_CLASS_ELITE_FOUR_4 0x57 -#define FACILITY_CLASS_YOUNGSTER_2 0x58 -#define FACILITY_CLASS_BUG_CATCHER_2 0x59 -#define FACILITY_CLASS_LASS_2 0x5A -#define FACILITY_CLASS_SAILOR_2 0x5B -#define FACILITY_CLASS_CAMPER_2 0x5C -#define FACILITY_CLASS_PICNICKER_2 0x5D -#define FACILITY_CLASS_POKEMANIAC_2 0x5E -#define FACILITY_CLASS_SUPER_NERD 0x5F -#define FACILITY_CLASS_HIKER_2 0x60 -#define FACILITY_CLASS_BIKER 0x61 -#define FACILITY_CLASS_BURGLAR 0x62 -#define FACILITY_CLASS_ENGINEER 0x63 -#define FACILITY_CLASS_FISHERMAN_2 0x64 -#define FACILITY_CLASS_SWIMMER_MALE_2 0x65 -#define FACILITY_CLASS_CUE_BALL 0x66 -#define FACILITY_CLASS_GAMER 0x67 -#define FACILITY_CLASS_BEAUTY_2 0x68 -#define FACILITY_CLASS_SWIMMER_FEMALE_2 0x69 -#define FACILITY_CLASS_PSYCHIC_3 0x6A -#define FACILITY_CLASS_ROCKER 0x6B -#define FACILITY_CLASS_JUGGLER 0x6C -#define FACILITY_CLASS_TAMER 0x6D -#define FACILITY_CLASS_BIRD_KEEPER_2 0x6E -#define FACILITY_CLASS_BLACK_BELT_2 0x6F -#define FACILITY_CLASS_RIVAL 0x70 -#define FACILITY_CLASS_SCIENTIST 0x71 -#define FACILITY_CLASS_BOSS 0x72 -#define FACILITY_CLASS_TEAM_ROCKET 0x73 -#define FACILITY_CLASS_COOLTRAINER_3 0x74 -#define FACILITY_CLASS_COOLTRAINER_4 0x75 -#define FACILITY_CLASS_ELITE_FOUR_5 0x76 -#define FACILITY_CLASS_ELITE_FOUR_6 0x77 -#define FACILITY_CLASS_LEADER_9 0x78 -#define FACILITY_CLASS_LEADER_10 0x79 -#define FACILITY_CLASS_GENTLEMAN_2 0x7A -#define FACILITY_CLASS_RIVAL_2 0x7B -#define FACILITY_CLASS_CHAMPION_2 0x7C -#define FACILITY_CLASS_CHANNELER 0x7D -#define FACILITY_CLASS_TWINS_2 0x7E -#define FACILITY_CLASS_COOL_COUPLE 0x7F -#define FACILITY_CLASS_YOUNG_COUPLE_2 0x80 -#define FACILITY_CLASS_CRUSH_KIN 0x81 -#define FACILITY_CLASS_SIS_AND_BRO_2 0x82 -#define FACILITY_CLASS_PKMN_PROF 0x83 -#define FACILITY_CLASS_BRENDAN 0x84 -#define FACILITY_CLASS_MAY 0x85 -#define FACILITY_CLASS_RED 0x86 -#define FACILITY_CLASS_LEAF 0x87 -#define FACILITY_CLASS_TEAM_ROCKET_2 0x88 -#define FACILITY_CLASS_PSYCHIC_4 0x89 -#define FACILITY_CLASS_CRUSH_GIRL 0x8A -#define FACILITY_CLASS_TUBER_3 0x8B -#define FACILITY_CLASS_PKMN_BREEDER_3 0x8C -#define FACILITY_CLASS_PKMN_RANGER_3 0x8D -#define FACILITY_CLASS_PKMN_RANGER_4 0x8E -#define FACILITY_CLASS_AROMA_LADY_2 0x8F -#define FACILITY_CLASS_RUIN_MANIAC_2 0x90 -#define FACILITY_CLASS_LADY_2 0x91 -#define FACILITY_CLASS_PAINTER 0x92 -#define FACILITY_CLASS_ELITE_FOUR_7 0x93 -#define FACILITY_CLASS_ELITE_FOUR_8 0x94 -#define FACILITY_CLASS_CHAMPION_3 0x95 - -#endif //GUARD_CONSTANTS_FACILITY_TRAINER_CLASSES_H diff --git a/include/constants/opponents.h b/include/constants/opponents.h index 6262ab817..6c6081ef0 100644 --- a/include/constants/opponents.h +++ b/include/constants/opponents.h @@ -2,83 +2,84 @@ #define GUARD_CONSTANTS_OPPONENTS_H #define TRAINER_NONE 0 -#define TRAINER_AQUA_LEADER_1 1 -#define TRAINER_TEAM_AQUA_1 2 -#define TRAINER_TEAM_AQUA_2 3 -#define TRAINER_AROMA_LADY_1 4 -#define TRAINER_RUIN_MANIAC_1 5 -#define TRAINER_INTERVIEWER_1 6 -#define TRAINER_TUBER_1 7 -#define TRAINER_TUBER_2 8 -#define TRAINER_COOLTRAINER_1 9 -#define TRAINER_COOLTRAINER_2 10 -#define TRAINER_HEX_MANIAC_1 11 -#define TRAINER_LADY_1 12 -#define TRAINER_BEAUTY_1 13 -#define TRAINER_RICH_BOY_1 14 -#define TRAINER_POKEMANIAC_1 15 -#define TRAINER_SWIMMER_MALE_1 16 -#define TRAINER_BLACK_BELT_1 17 -#define TRAINER_GUITARIST_1 18 -#define TRAINER_KINDLER_1 19 -#define TRAINER_CAMPER_1 20 -#define TRAINER_BUG_MANIAC_1 21 -#define TRAINER_PSYCHIC_1 22 -#define TRAINER_PSYCHIC_2 23 -#define TRAINER_GENTLEMAN_1 24 +// Dummy trainers for all the RS trainer classes +#define TRAINER_AQUA_LEADER 1 +#define TRAINER_AQUA_GRUNT_M 2 +#define TRAINER_AQUA_GRUNT_F 3 +#define TRAINER_RS_AROMA_LADY 4 +#define TRAINER_RS_RUIN_MANIAC 5 +#define TRAINER_INTERVIEWER 6 +#define TRAINER_RS_TUBER_F 7 +#define TRAINER_RS_TUBER_M 8 +#define TRAINER_RS_COOLTRAINER_M 9 +#define TRAINER_RS_COOLTRAINER_F 10 +#define TRAINER_HEX_MANIAC 11 +#define TRAINER_RS_LADY 12 +#define TRAINER_RS_BEAUTY 13 +#define TRAINER_RICH_BOY 14 +#define TRAINER_RS_POKEMANIAC 15 +#define TRAINER_RS_SWIMMER_M 16 +#define TRAINER_RS_BLACK_BELT 17 +#define TRAINER_GUITARIST 18 +#define TRAINER_KINDLER 19 +#define TRAINER_RS_CAMPER 20 +#define TRAINER_BUG_MANIAC 21 +#define TRAINER_RS_PSYCHIC_M 22 +#define TRAINER_RS_PSYCHIC_F 23 +#define TRAINER_RS_GENTLEMAN 24 #define TRAINER_ELITE_FOUR_SIDNEY 25 #define TRAINER_ELITE_FOUR_PHOEBE 26 #define TRAINER_LEADER_ROXANNE 27 #define TRAINER_LEADER_BRAWLY 28 #define TRAINER_LEADER_TATE_LIZA 29 -#define TRAINER_SCHOOL_KID_1 30 -#define TRAINER_SCHOOL_KID_2 31 -#define TRAINER_SR_AND_JR_1 32 -#define TRAINER_POKEFAN_1 33 -#define TRAINER_POKEFAN_2 34 -#define TRAINER_EXPERT_1 35 -#define TRAINER_EXPERT_2 36 -#define TRAINER_YOUNGSTER_1 37 -#define TRAINER_CHAMPION_1 38 -#define TRAINER_FISHERMAN_1 39 -#define TRAINER_TRIATHLETE_1 40 -#define TRAINER_TRIATHLETE_2 41 -#define TRAINER_TRIATHLETE_3 42 -#define TRAINER_TRIATHLETE_4 43 -#define TRAINER_TRIATHLETE_5 44 -#define TRAINER_TRIATHLETE_6 45 -#define TRAINER_DRAGON_TAMER_1 46 -#define TRAINER_BIRD_KEEPER_1 47 -#define TRAINER_NINJA_BOY_1 48 -#define TRAINER_BATTLE_GIRL_1 49 -#define TRAINER_PARASOL_LADY_1 50 -#define TRAINER_SWIMMER_FEMALE_1 51 -#define TRAINER_PICNICKER_1 52 -#define TRAINER_TWINS_1 53 -#define TRAINER_SAILOR_1 54 -#define TRAINER_BOARDER_1 55 -#define TRAINER_BOARDER_2 56 -#define TRAINER_COLLECTOR_1 57 -#define TRAINER_PKMN_TRAINER_2 58 -#define TRAINER_PKMN_TRAINER_3 59 -#define TRAINER_PKMN_TRAINER_4 60 -#define TRAINER_PKMN_TRAINER_5 61 -#define TRAINER_PKMN_TRAINER_6 62 -#define TRAINER_PKMN_TRAINER_7 63 -#define TRAINER_PKMN_TRAINER_8 64 -#define TRAINER_PKMN_BREEDER_1 65 -#define TRAINER_PKMN_BREEDER_2 66 -#define TRAINER_PKMN_RANGER_1 67 -#define TRAINER_PKMN_RANGER_2 68 -#define TRAINER_MAGMA_LEADER_1 69 -#define TRAINER_TEAM_MAGMA_1 70 -#define TRAINER_TEAM_MAGMA_2 71 -#define TRAINER_LASS_1 72 -#define TRAINER_BUG_CATCHER_1 73 -#define TRAINER_HIKER_1 74 -#define TRAINER_YOUNG_COUPLE_1 75 -#define TRAINER_OLD_COUPLE_1 76 -#define TRAINER_SIS_AND_BRO_1 77 +#define TRAINER_SCHOOL_KID_M 30 +#define TRAINER_SCHOOL_KID_F 31 +#define TRAINER_SR_AND_JR 32 +#define TRAINER_POKEFAN_M 33 +#define TRAINER_POKEFAN_F 34 +#define TRAINER_EXPERT_M 35 +#define TRAINER_EXPERT_F 36 +#define TRAINER_RS_YOUNGSTER 37 +#define TRAINER_RS_CHAMPION 38 +#define TRAINER_RS_FISHERMAN 39 +#define TRAINER_CYCLING_TRIATHLETE_M 40 +#define TRAINER_CYCLING_TRIATHLETE_F 41 +#define TRAINER_RUNNING_TRIATHLETE_M 42 +#define TRAINER_RUNNING_TRIATHLETE_F 43 +#define TRAINER_SWIMMING_TRIATHLETE_M 44 +#define TRAINER_SWIMMING_TRIATHLETE_F 45 +#define TRAINER_DRAGON_TAMER 46 +#define TRAINER_RS_BIRD_KEEPER 47 +#define TRAINER_NINJA_BOY 48 +#define TRAINER_BATTLE_GIRL 49 +#define TRAINER_PARASOL_LADY 50 +#define TRAINER_RS_SWIMMER_F 51 +#define TRAINER_RS_PICNICKER 52 +#define TRAINER_RS_TWINS 53 +#define TRAINER_RS_SAILOR 54 +#define TRAINER_BOARDER_M 55 +#define TRAINER_BOARDER_F 56 +#define TRAINER_COLLECTOR 57 +#define TRAINER_WALLY 58 +#define TRAINER_BRENDAN 59 +#define TRAINER_BRENDAN_2 60 +#define TRAINER_BRENDAN_3 61 +#define TRAINER_MAY 62 +#define TRAINER_MAY_2 63 +#define TRAINER_MAY_3 64 +#define TRAINER_RS_PKMN_BREEDER_M 65 +#define TRAINER_RS_PKMN_BREEDER_F 66 +#define TRAINER_RS_PKMN_RANGER_M 67 +#define TRAINER_RS_PKMN_RANGER_F 68 +#define TRAINER_MAGMA_LEADER 69 +#define TRAINER_MAGMA_GRUNT_M 70 +#define TRAINER_MAMGA_GRUNT_F 71 +#define TRAINER_RS_LASS 72 +#define TRAINER_RS_BUG_CATCHER 73 +#define TRAINER_RS_HIKER 74 +#define TRAINER_RS_YOUNG_COUPLE 75 +#define TRAINER_OLD_COUPLE 76 +#define TRAINER_RS_SIS_AND_BRO 77 #define TRAINER_AQUA_ADMIN_MATT 78 #define TRAINER_AQUA_ADMIN_SHELLY 79 #define TRAINER_MAGMA_ADMIN_TABITHA 80 @@ -90,6 +91,7 @@ #define TRAINER_LEADER_WALLACE 86 #define TRAINER_ELITE_FOUR_GLACIA 87 #define TRAINER_ELITE_FOUR_DRAKE 88 +// Actual FRLG trainers start here #define TRAINER_YOUNGSTER_BEN 89 #define TRAINER_YOUNGSTER_CALVIN 90 #define TRAINER_YOUNGSTER_JOSH 91 diff --git a/include/constants/trainer_classes.h b/include/constants/trainer_classes.h deleted file mode 100644 index f0c6d4123..000000000 --- a/include/constants/trainer_classes.h +++ /dev/null @@ -1,112 +0,0 @@ -#ifndef GUARD_TRAINER_CLASSES_H -#define GUARD_TRAINER_CLASSES_H - -#define CLASS_PKMN_TRAINER 0x00 -#define CLASS_PKMN_TRAINER_2 0x01 -#define CLASS_AQUA_LEADER 0x02 -#define CLASS_TEAM_AQUA 0x03 -#define CLASS_AROMA_LADY 0x04 -#define CLASS_RUIN_MANIAC 0x05 -#define CLASS_INTERVIEWER 0x06 -#define CLASS_TUBER 0x07 -#define CLASS_TUBER_2 0x08 -#define CLASS_COOLTRAINER 0x09 -#define CLASS_HEX_MANIAC 0x0A -#define CLASS_LADY 0x0B -#define CLASS_BEAUTY 0x0C -#define CLASS_RICH_BOY 0x0D -#define CLASS_POKEMANIAC 0x0E -#define CLASS_SWIMMER_MALE 0x0F -#define CLASS_BLACK_BELT 0x10 -#define CLASS_GUITARIST 0x11 -#define CLASS_KINDLER 0x12 -#define CLASS_CAMPER 0x13 -#define CLASS_BUG_MANIAC 0x14 -#define CLASS_PSYCHIC 0x15 -#define CLASS_GENTLEMAN 0x16 -#define CLASS_ELITE_FOUR 0x17 -#define CLASS_LEADER 0x18 -#define CLASS_SCHOOL_KID 0x19 -#define CLASS_SR_AND_JR 0x1A -#define CLASS_POKEFAN 0x1B -#define CLASS_EXPERT 0x1C -#define CLASS_YOUNGSTER 0x1D -#define CLASS_CHAMPION 0x1E -#define CLASS_FISHERMAN 0x1F -#define CLASS_TRIATHLETE 0x20 -#define CLASS_DRAGON_TAMER 0x21 -#define CLASS_BIRD_KEEPER 0x22 -#define CLASS_NINJA_BOY 0x23 -#define CLASS_BATTLE_GIRL 0x24 -#define CLASS_PARASOL_LADY 0x25 -#define CLASS_SWIMMER_FEMALE 0x26 -#define CLASS_PICNICKER 0x27 -#define CLASS_TWINS 0x28 -#define CLASS_SAILOR 0x29 -#define CLASS_BOARDER 0x2A -#define CLASS_COLLECTOR 0x2B -#define CLASS_PKMN_TRAINER_3 0x2C -#define CLASS_PKMN_BREEDER 0x2D -#define CLASS_PKMN_RANGER 0x2E -#define CLASS_MAGMA_LEADER 0x2F -#define CLASS_TEAM_MAGMA 0x30 -#define CLASS_LASS 0x31 -#define CLASS_BUG_CATCHER 0x32 -#define CLASS_HIKER 0x33 -#define CLASS_YOUNG_COUPLE 0x34 -#define CLASS_OLD_COUPLE 0x35 -#define CLASS_SIS_AND_BRO 0x36 -#define CLASS_AQUA_ADMIN 0x37 -#define CLASS_MAGMA_ADMIN 0x38 -#define CLASS_YOUNGSTER_2 0x39 -#define CLASS_BUG_CATCHER_2 0x3A -#define CLASS_LASS_2 0x3B -#define CLASS_SAILOR_2 0x3C -#define CLASS_CAMPER_2 0x3D -#define CLASS_PICNICKER_2 0x3E -#define CLASS_POKEMANIAC_2 0x3F -#define CLASS_SUPER_NERD 0x40 -#define CLASS_HIKER_2 0x41 -#define CLASS_BIKER 0x42 -#define CLASS_BURGLAR 0x43 -#define CLASS_ENGINEER 0x44 -#define CLASS_FISHERMAN_2 0x45 -#define CLASS_SWIMMER_MALE_2 0x46 -#define CLASS_CUE_BALL 0x47 -#define CLASS_GAMER 0x48 -#define CLASS_BEAUTY_2 0x49 -#define CLASS_SWIMMER_FEMALE_2 0x4A -#define CLASS_PSYCHIC_2 0x4B -#define CLASS_ROCKER 0x4C -#define CLASS_JUGGLER 0x4D -#define CLASS_TAMER 0x4E -#define CLASS_BIRD_KEEPER_2 0x4F -#define CLASS_BLACK_BELT_2 0x50 -#define CLASS_RIVAL 0x51 -#define CLASS_SCIENTIST 0x52 -#define CLASS_BOSS 0x53 -#define CLASS_LEADER_2 0x54 -#define CLASS_TEAM_ROCKET 0x55 -#define CLASS_COOLTRAINER_2 0x56 -#define CLASS_ELITE_FOUR_2 0x57 -#define CLASS_GENTLEMAN_2 0x58 -#define CLASS_RIVAL_2 0x59 -#define CLASS_CHAMPION_2 0x5A -#define CLASS_CHANNELER 0x5B -#define CLASS_TWINS_2 0x5C -#define CLASS_COOL_COUPLE 0x5D -#define CLASS_YOUNG_COUPLE_2 0x5E -#define CLASS_CRUSH_KIN 0x5F -#define CLASS_SIS_AND_BRO_2 0x60 -#define CLASS_PKMN_PROF 0x61 -#define CLASS_PLAYER 0x62 -#define CLASS_CRUSH_GIRL 0x63 -#define CLASS_TUBER_3 0x64 -#define CLASS_PKMN_BREEDER_2 0x65 -#define CLASS_PKMN_RANGER_2 0x66 -#define CLASS_AROMA_LADY_2 0x67 -#define CLASS_RUIN_MANIAC_2 0x68 -#define CLASS_LADY_2 0x69 -#define CLASS_PAINTER 0x6A - -#endif // GUARD_TRAINER_CLASSES_H diff --git a/include/constants/trainers.h b/include/constants/trainers.h index cc62fbcbe..9563bf8b4 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -25,7 +25,7 @@ #define TRAINER_PIC_RS_RUIN_MANIAC 4 #define TRAINER_PIC_INTERVIEWER 5 #define TRAINER_PIC_RS_TUBER_F 6 -#define TRAINER_PIC_TUBER_M 7 +#define TRAINER_PIC_RS_TUBER_M 7 #define TRAINER_PIC_RS_COOLTRAINER_M 8 #define TRAINER_PIC_RS_COOLTRAINER_F 9 #define TRAINER_PIC_HEX_MANIAC 10 @@ -76,7 +76,7 @@ #define TRAINER_PIC_WALLY 55 #define TRAINER_PIC_RS_BRENDAN_1 56 #define TRAINER_PIC_RS_MAY_1 57 -#define TRAINER_PIC_POKEMON_BREEDER_M 58 +#define TRAINER_PIC_RS_POKEMON_BREEDER_M 58 #define TRAINER_PIC_RS_POKEMON_BREEDER_F 59 #define TRAINER_PIC_RS_POKEMON_RANGER_M 60 #define TRAINER_PIC_RS_POKEMON_RANGER_F 61 @@ -124,7 +124,7 @@ #define TRAINER_PIC_TAMER 103 #define TRAINER_PIC_BIRD_KEEPER 104 #define TRAINER_PIC_BLACK_BELT 105 -#define TRAINER_PIC_RIVAL_1 106 +#define TRAINER_PIC_RIVAL_EARLY 106 #define TRAINER_PIC_SCIENTIST 107 #define TRAINER_PIC_LEADER_GIOVANNI 108 #define TRAINER_PIC_ROCKET_GRUNT_M 109 @@ -142,7 +142,7 @@ #define TRAINER_PIC_LEADER_BLAINE 121 #define TRAINER_PIC_LEADER_SABRINA 122 #define TRAINER_PIC_GENTLEMAN 123 -#define TRAINER_PIC_RIVAL_2 124 +#define TRAINER_PIC_RIVAL_LATE 124 #define TRAINER_PIC_CHAMPION_RIVAL 125 #define TRAINER_PIC_CHANNELER 126 #define TRAINER_PIC_TWINS 127 @@ -159,7 +159,7 @@ #define TRAINER_PIC_PSYCHIC_F 138 #define TRAINER_PIC_CRUSH_GIRL 139 #define TRAINER_PIC_TUBER_F 140 -#define TRAINER_PIC_POKEMON_BREEDER_F 141 +#define TRAINER_PIC_POKEMON_BREEDER 141 #define TRAINER_PIC_POKEMON_RANGER_M 142 #define TRAINER_PIC_POKEMON_RANGER_F 143 #define TRAINER_PIC_AROMA_LADY 144 @@ -170,6 +170,265 @@ // Leftover from R/S #define TRAINER_SECRET_BASE 1024 +#define TRAINER_CLASS_NONE 0 +#define TRAINER_CLASS_PKMN_TRAINER_UNUSED 1 +#define TRAINER_CLASS_AQUA_LEADER 2 +#define TRAINER_CLASS_TEAM_AQUA 3 +#define TRAINER_CLASS_RS_AROMA_LADY 4 +#define TRAINER_CLASS_RS_RUIN_MANIAC 5 +#define TRAINER_CLASS_INTERVIEWER 6 +#define TRAINER_CLASS_RS_TUBER_F 7 +#define TRAINER_CLASS_RS_TUBER_M 8 +#define TRAINER_CLASS_RS_COOLTRAINER 9 +#define TRAINER_CLASS_HEX_MANIAC 10 +#define TRAINER_CLASS_RS_LADY 11 +#define TRAINER_CLASS_RS_BEAUTY 12 +#define TRAINER_CLASS_RICH_BOY 13 +#define TRAINER_CLASS_RS_POKEMANIAC 14 +#define TRAINER_CLASS_RS_SWIMMER_M 15 +#define TRAINER_CLASS_RS_BLACK_BELT 16 +#define TRAINER_CLASS_GUITARIST 17 +#define TRAINER_CLASS_KINDLER 18 +#define TRAINER_CLASS_RS_CAMPER 19 +#define TRAINER_CLASS_BUG_MANIAC 20 +#define TRAINER_CLASS_RS_PSYCHIC 21 +#define TRAINER_CLASS_RS_GENTLEMAN 22 +#define TRAINER_CLASS_RS_ELITE_FOUR 23 +#define TRAINER_CLASS_RS_LEADER 24 +#define TRAINER_CLASS_SCHOOL_KID 25 +#define TRAINER_CLASS_SR_AND_JR 26 +#define TRAINER_CLASS_POKEFAN 27 +#define TRAINER_CLASS_EXPERT 28 +#define TRAINER_CLASS_RS_YOUNGSTER 29 +#define TRAINER_CLASS_RS_CHAMPION 30 +#define TRAINER_CLASS_RS_FISHERMAN 31 +#define TRAINER_CLASS_TRIATHLETE 32 +#define TRAINER_CLASS_DRAGON_TAMER 33 +#define TRAINER_CLASS_RS_BIRD_KEEPER 34 +#define TRAINER_CLASS_NINJA_BOY 35 +#define TRAINER_CLASS_BATTLE_GIRL 36 +#define TRAINER_CLASS_PARASOL_LADY 37 +#define TRAINER_CLASS_RS_SWIMMER_F 38 +#define TRAINER_CLASS_RS_PICNICKER 39 +#define TRAINER_CLASS_RS_TWINS 40 +#define TRAINER_CLASS_RS_SAILOR 41 +#define TRAINER_CLASS_BOARDER 42 +#define TRAINER_CLASS_COLLECTOR 43 +#define TRAINER_CLASS_PKMN_TRAINER 44 +#define TRAINER_CLASS_RS_PKMN_BREEDER 45 +#define TRAINER_CLASS_RS_PKMN_RANGER 46 +#define TRAINER_CLASS_MAGMA_LEADER 47 +#define TRAINER_CLASS_TEAM_MAGMA 48 +#define TRAINER_CLASS_RS_LASS 49 +#define TRAINER_CLASS_RS_BUG_CATCHER 50 +#define TRAINER_CLASS_RS_HIKER 51 +#define TRAINER_CLASS_RS_YOUNG_COUPLE 52 +#define TRAINER_CLASS_OLD_COUPLE 53 +#define TRAINER_CLASS_RS_SIS_AND_BRO 54 +#define TRAINER_CLASS_AQUA_ADMIN 55 +#define TRAINER_CLASS_MAGMA_ADMIN 56 +#define TRAINER_CLASS_YOUNGSTER 57 +#define TRAINER_CLASS_BUG_CATCHER 58 +#define TRAINER_CLASS_LASS 59 +#define TRAINER_CLASS_SAILOR 60 +#define TRAINER_CLASS_CAMPER 61 +#define TRAINER_CLASS_PICNICKER 62 +#define TRAINER_CLASS_POKEMANIAC 63 +#define TRAINER_CLASS_SUPER_NERD 64 +#define TRAINER_CLASS_HIKER 65 +#define TRAINER_CLASS_BIKER 66 +#define TRAINER_CLASS_BURGLAR 67 +#define TRAINER_CLASS_ENGINEER 68 +#define TRAINER_CLASS_FISHERMAN 69 +#define TRAINER_CLASS_SWIMMER_M 70 +#define TRAINER_CLASS_CUE_BALL 71 +#define TRAINER_CLASS_GAMER 72 +#define TRAINER_CLASS_BEAUTY 73 +#define TRAINER_CLASS_SWIMMER_F 74 +#define TRAINER_CLASS_PSYCHIC 75 +#define TRAINER_CLASS_ROCKER 76 +#define TRAINER_CLASS_JUGGLER 77 +#define TRAINER_CLASS_TAMER 78 +#define TRAINER_CLASS_BIRD_KEEPER 79 +#define TRAINER_CLASS_BLACK_BELT 80 +#define TRAINER_CLASS_RIVAL_EARLY 81 +#define TRAINER_CLASS_SCIENTIST 82 +#define TRAINER_CLASS_BOSS 83 +#define TRAINER_CLASS_LEADER 84 +#define TRAINER_CLASS_TEAM_ROCKET 85 +#define TRAINER_CLASS_COOLTRAINER 86 +#define TRAINER_CLASS_ELITE_FOUR 87 +#define TRAINER_CLASS_GENTLEMAN 88 +#define TRAINER_CLASS_RIVAL_LATE 89 +#define TRAINER_CLASS_CHAMPION 90 +#define TRAINER_CLASS_CHANNELER 91 +#define TRAINER_CLASS_TWINS 92 +#define TRAINER_CLASS_COOL_COUPLE 93 +#define TRAINER_CLASS_YOUNG_COUPLE 94 +#define TRAINER_CLASS_CRUSH_KIN 95 +#define TRAINER_CLASS_SIS_AND_BRO 96 +#define TRAINER_CLASS_PKMN_PROF 97 +#define TRAINER_CLASS_PLAYER 98 +#define TRAINER_CLASS_CRUSH_GIRL 99 +#define TRAINER_CLASS_TUBER 100 +#define TRAINER_CLASS_PKMN_BREEDER 101 +#define TRAINER_CLASS_PKMN_RANGER 102 +#define TRAINER_CLASS_AROMA_LADY 103 +#define TRAINER_CLASS_RUIN_MANIAC 104 +#define TRAINER_CLASS_LADY 105 +#define TRAINER_CLASS_PAINTER 106 + +#define FACILITY_CLASS_AQUA_LEADER_ARCHIE 0 +#define FACILITY_CLASS_AQUA_GRUNT_M 1 +#define FACILITY_CLASS_AQUA_GRUNT_F 2 +#define FACILITY_CLASS_RS_AROMA_LADY 3 +#define FACILITY_CLASS_RS_RUIN_MANIAC 4 +#define FACILITY_CLASS_INTERVIEWER 5 +#define FACILITY_CLASS_RS_TUBER_F 6 +#define FACILITY_CLASS_RS_TUBER_M 7 +#define FACILITY_CLASS_RS_COOLTRAINER_M 8 +#define FACILITY_CLASS_RS_COOLTRAINER_F 9 +#define FACILITY_CLASS_HEX_MANIAC 10 +#define FACILITY_CLASS_RS_LADY 11 +#define FACILITY_CLASS_RS_BEAUTY 12 +#define FACILITY_CLASS_RICH_BOY 13 +#define FACILITY_CLASS_RS_POKEMANIAC 14 +#define FACILITY_CLASS_RS_SWIMMER_M 15 +#define FACILITY_CLASS_RS_BLACK_BELT 16 +#define FACILITY_CLASS_GUITARIST 17 +#define FACILITY_CLASS_KINDLER 18 +#define FACILITY_CLASS_RS_CAMPER 19 +#define FACILITY_CLASS_BUG_MANIAC 20 +#define FACILITY_CLASS_RS_PSYCHIC_M 21 +#define FACILITY_CLASS_RS_PSYCHIC_F 22 +#define FACILITY_CLASS_RS_GENTLEMAN 23 +#define FACILITY_CLASS_ELITE_FOUR_SIDNEY 24 +#define FACILITY_CLASS_ELITE_FOUR_PHOEBE 25 +#define FACILITY_CLASS_LEADER_ROXANNE 26 +#define FACILITY_CLASS_LEADER_BRAWLY 27 +#define FACILITY_CLASS_LEADER_TATE_AND_LIZA 28 +#define FACILITY_CLASS_SCHOOL_KID_M 29 +#define FACILITY_CLASS_SCHOOL_KID_F 30 +#define FACILITY_CLASS_SR_AND_JR 31 +#define FACILITY_CLASS_POKEFAN_M 32 +#define FACILITY_CLASS_POKEFAN_F 33 +#define FACILITY_CLASS_EXPERT_M 34 +#define FACILITY_CLASS_EXPERT_F 35 +#define FACILITY_CLASS_RS_YOUNGSTER 36 +#define FACILITY_CLASS_CHAMPION_STEVEN 37 +#define FACILITY_CLASS_RS_FISHERMAN 38 +#define FACILITY_CLASS_CYCLING_TRIATHLETE_M 39 +#define FACILITY_CLASS_CYCLING_TRIATHLETE_F 40 +#define FACILITY_CLASS_RUNNING_TRIATHLETE_M 41 +#define FACILITY_CLASS_RUNNING_TRIATHLETE_F 42 +#define FACILITY_CLASS_SWIMMING_TRIATHLETE_M 43 +#define FACILITY_CLASS_SWIMMING_TRIATHLETE_F 44 +#define FACILITY_CLASS_DRAGON_TAMER 45 +#define FACILITY_CLASS_RS_BIRD_KEEPER 46 +#define FACILITY_CLASS_NINJA_BOY 47 +#define FACILITY_CLASS_BATTLE_GIRL 48 +#define FACILITY_CLASS_PARASOL_LADY 49 +#define FACILITY_CLASS_RS_SWIMMER_F 50 +#define FACILITY_CLASS_RS_PICNICKER 51 +#define FACILITY_CLASS_RS_TWINS 52 +#define FACILITY_CLASS_RS_SAILOR 53 +#define FACILITY_CLASS_BOARDER_M 54 +#define FACILITY_CLASS_BOARDER_F 55 +#define FACILITY_CLASS_COLLECTOR 56 +#define FACILITY_CLASS_PKMN_TRAINER_WALLY 57 +#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN 58 +#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2 59 +#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3 60 +#define FACILITY_CLASS_PKMN_TRAINER_MAY 61 +#define FACILITY_CLASS_PKMN_TRAINER_MAY_2 62 +#define FACILITY_CLASS_PKMN_TRAINER_MAY_3 63 +#define FACILITY_CLASS_RS_PKMN_BREEDER_M 64 +#define FACILITY_CLASS_RS_PKMN_BREEDER_F 65 +#define FACILITY_CLASS_RS_PKMN_RANGER_M 66 +#define FACILITY_CLASS_RS_PKMN_RANGER_F 67 +#define FACILITY_CLASS_MAGMA_LEADER_MAXIE 68 +#define FACILITY_CLASS_MAGMA_GRUNT_M 69 +#define FACILITY_CLASS_MAGMA_GRUNT_F 70 +#define FACILITY_CLASS_RS_LASS 71 +#define FACILITY_CLASS_RS_BUG_CATCHER 72 +#define FACILITY_CLASS_RS_HIKER 73 +#define FACILITY_CLASS_RS_YOUNG_COUPLE 74 +#define FACILITY_CLASS_OLD_COUPLE 75 +#define FACILITY_CLASS_RS_SIS_AND_BRO 76 +#define FACILITY_CLASS_AQUA_ADMIN_M 77 +#define FACILITY_CLASS_AQUA_ADMIN_F 78 +#define FACILITY_CLASS_MAGMA_ADMIN_M 79 +#define FACILITY_CLASS_MAGMA_ADMIN_F 80 +#define FACILITY_CLASS_LEADER_WATTSON 81 +#define FACILITY_CLASS_LEADER_FLANNERY 82 +#define FACILITY_CLASS_LEADER_NORMAN 83 +#define FACILITY_CLASS_LEADER_WINONA 84 +#define FACILITY_CLASS_LEADER_WALLACE 85 +#define FACILITY_CLASS_ELITE_FOUR_GLACIA 86 +#define FACILITY_CLASS_ELITE_FOUR_DRAKE 87 +#define FACILITY_CLASS_YOUNGSTER 88 +#define FACILITY_CLASS_BUG_CATCHER 89 +#define FACILITY_CLASS_LASS 90 +#define FACILITY_CLASS_SAILOR 91 +#define FACILITY_CLASS_CAMPER 92 +#define FACILITY_CLASS_PICNICKER 93 +#define FACILITY_CLASS_POKEMANIAC 94 +#define FACILITY_CLASS_SUPER_NERD 95 +#define FACILITY_CLASS_HIKER 96 +#define FACILITY_CLASS_BIKER 97 +#define FACILITY_CLASS_BURGLAR 98 +#define FACILITY_CLASS_ENGINEER 99 +#define FACILITY_CLASS_FISHERMAN 100 +#define FACILITY_CLASS_SWIMMER_M 101 +#define FACILITY_CLASS_CUE_BALL 102 +#define FACILITY_CLASS_GAMER 103 +#define FACILITY_CLASS_BEAUTY 104 +#define FACILITY_CLASS_SWIMMER_F 105 +#define FACILITY_CLASS_PSYCHIC_M 106 +#define FACILITY_CLASS_ROCKER 107 +#define FACILITY_CLASS_JUGGLER 108 +#define FACILITY_CLASS_TAMER 109 +#define FACILITY_CLASS_BIRD_KEEPER 110 +#define FACILITY_CLASS_BLACK_BELT 111 +#define FACILITY_CLASS_RIVAL_EARLY 112 +#define FACILITY_CLASS_SCIENTIST 113 +#define FACILITY_CLASS_BOSS 114 +#define FACILITY_CLASS_ROCKET_GRUNT_M 115 +#define FACILITY_CLASS_COOLTRAINER_M 116 +#define FACILITY_CLASS_COOLTRAINER_F 117 +#define FACILITY_CLASS_ELITE_FOUR_LORELEI 118 +#define FACILITY_CLASS_ELITE_FOUR_BRUNO 119 +#define FACILITY_CLASS_LEADER_M 120 +#define FACILITY_CLASS_LEADER_F 121 +#define FACILITY_CLASS_GENTLEMAN 122 +#define FACILITY_CLASS_RIVAL_LATE 123 +#define FACILITY_CLASS_CHAMPION_RIVAL 124 +#define FACILITY_CLASS_CHANNELER 125 +#define FACILITY_CLASS_TWINS 126 +#define FACILITY_CLASS_COOL_COUPLE 127 +#define FACILITY_CLASS_YOUNG_COUPLE 128 +#define FACILITY_CLASS_CRUSH_KIN 129 +#define FACILITY_CLASS_SIS_AND_BRO 130 +#define FACILITY_CLASS_PKMN_PROF 131 +#define FACILITY_CLASS_BRENDAN 132 +#define FACILITY_CLASS_MAY 133 +#define FACILITY_CLASS_RED 134 +#define FACILITY_CLASS_LEAF 135 +#define FACILITY_CLASS_ROCKET_GRUNT_F 136 +#define FACILITY_CLASS_PSYCHIC_F 137 +#define FACILITY_CLASS_CRUSH_GIRL 138 +#define FACILITY_CLASS_TUBER 139 +#define FACILITY_CLASS_PKMN_BREEDER 140 +#define FACILITY_CLASS_PKMN_RANGER_M 141 +#define FACILITY_CLASS_PKMN_RANGER_F 142 +#define FACILITY_CLASS_AROMA_LADY 143 +#define FACILITY_CLASS_RUIN_MANIAC 144 +#define FACILITY_CLASS_LADY 145 +#define FACILITY_CLASS_PAINTER 146 +#define FACILITY_CLASS_ELITE_FOUR_AGATHA 147 +#define FACILITY_CLASS_ELITE_FOUR_LANCE 148 +#define FACILITY_CLASS_CHAMPION_RIVAL_2 149 + #define F_TRAINER_FEMALE (1 << 7) // All trainer parties specify the IV, level, and species for each Pokémon in the diff --git a/include/graphics.h b/include/graphics.h index a92b798ae..ded24bd7b 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2501,7 +2501,7 @@ extern const u32 gTrainerFrontPic_Collector[]; extern const u32 gTrainerFrontPic_Wally[]; extern const u32 gTrainerFrontPic_RSBrendan1[]; extern const u32 gTrainerFrontPic_RSMay1[]; -extern const u32 gTrainerFrontPic_PokemonBreederM[]; +extern const u32 gTrainerFrontPic_RSPokemonBreederM[]; extern const u32 gTrainerFrontPic_RSPokemonBreederF[]; extern const u32 gTrainerFrontPic_RSPokemonRangerM[]; extern const u32 gTrainerFrontPic_RSPokemonRangerF[]; @@ -2549,7 +2549,7 @@ extern const u32 gTrainerFrontPic_Juggler[]; extern const u32 gTrainerFrontPic_Tamer[]; extern const u32 gTrainerFrontPic_BirdKeeper[]; extern const u32 gTrainerFrontPic_BlackBelt[]; -extern const u32 gTrainerFrontPic_Rival1[]; +extern const u32 gTrainerFrontPic_RivalEarly[]; extern const u32 gTrainerFrontPic_Scientist[]; extern const u32 gTrainerFrontPic_LeaderGiovanni[]; extern const u32 gTrainerFrontPic_RocketGruntM[]; @@ -2567,7 +2567,7 @@ extern const u32 gTrainerFrontPic_LeaderKoga[]; extern const u32 gTrainerFrontPic_LeaderBlaine[]; extern const u32 gTrainerFrontPic_LeaderSabrina[]; extern const u32 gTrainerFrontPic_Gentleman[]; -extern const u32 gTrainerFrontPic_Rival2[]; +extern const u32 gTrainerFrontPic_RivalLate[]; extern const u32 gTrainerFrontPic_ChampionRival[]; extern const u32 gTrainerFrontPic_Channeler[]; extern const u32 gTrainerFrontPic_Twins[]; @@ -2584,7 +2584,7 @@ extern const u32 gTrainerFrontPic_RocketGruntF[]; extern const u32 gTrainerFrontPic_PsychicF[]; extern const u32 gTrainerFrontPic_CrushGirl[]; extern const u32 gTrainerFrontPic_TuberF[]; -extern const u32 gTrainerFrontPic_PokemonBreederF[]; +extern const u32 gTrainerFrontPic_PokemonBreeder[]; extern const u32 gTrainerFrontPic_PokemonRangerM[]; extern const u32 gTrainerFrontPic_PokemonRangerF[]; extern const u32 gTrainerFrontPic_AromaLady[]; @@ -2654,7 +2654,7 @@ extern const u32 gTrainerPalette_LeafBackPic[]; extern const u32 gTrainerPalette_RedBackPic[]; extern const u32 gTrainerPalette_PokedudeBackPic[]; extern const u32 gTrainerPalette_OldManBackPic[]; -extern const u32 gTrainerPalette_PokemonBreederM[]; +extern const u32 gTrainerPalette_RSPokemonBreederM[]; extern const u32 gTrainerPalette_RSPokemonBreederF[]; extern const u32 gTrainerPalette_RSPokemonRangerM[]; extern const u32 gTrainerPalette_RSPokemonRangerF[]; @@ -2702,7 +2702,7 @@ extern const u32 gTrainerPalette_Juggler[]; extern const u32 gTrainerPalette_Tamer[]; extern const u32 gTrainerPalette_BirdKeeper[]; extern const u32 gTrainerPalette_BlackBelt[]; -extern const u32 gTrainerPalette_Rival1[]; +extern const u32 gTrainerPalette_RivalEarly[]; extern const u32 gTrainerPalette_Scientist[]; extern const u32 gTrainerPalette_LeaderGiovanni[]; extern const u32 gTrainerPalette_RocketGruntM[]; @@ -2720,7 +2720,7 @@ extern const u32 gTrainerPalette_LeaderKoga[]; extern const u32 gTrainerPalette_LeaderBlaine[]; extern const u32 gTrainerPalette_LeaderSabrina[]; extern const u32 gTrainerPalette_Gentleman[]; -extern const u32 gTrainerPalette_Rival2[]; +extern const u32 gTrainerPalette_RivalLate[]; extern const u32 gTrainerPalette_ChampionRival[]; extern const u32 gTrainerPalette_Channeler[]; extern const u32 gTrainerPalette_Twins[]; @@ -2737,7 +2737,7 @@ extern const u32 gTrainerPalette_RocketGruntF[]; extern const u32 gTrainerPalette_PsychicF[]; extern const u32 gTrainerPalette_CrushGirl[]; extern const u32 gTrainerPalette_TuberF[]; -extern const u32 gTrainerPalette_PokemonBreederF[]; +extern const u32 gTrainerPalette_PokemonBreeder[]; extern const u32 gTrainerPalette_PokemonRangerM[]; extern const u32 gTrainerPalette_PokemonRangerF[]; extern const u32 gTrainerPalette_AromaLady[]; diff --git a/src/battle_bg.c b/src/battle_bg.c index f3480bd45..7a4aa9d12 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -12,7 +12,7 @@ #include "trig.h" #include "constants/maps.h" #include "constants/songs.h" -#include "constants/trainer_classes.h" +#include "constants/trainers.h" #define TAG_VS_LETTERS 10000 @@ -992,12 +992,12 @@ void DrawBattleEntryBackground(void) if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) { u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass; - if (trainerClass == CLASS_LEADER_2) + if (trainerClass == TRAINER_CLASS_LEADER) { LoadBattleTerrainEntryGfx(BATTLE_TERRAIN_BUILDING); return; } - else if (trainerClass == CLASS_CHAMPION_2) + else if (trainerClass == TRAINER_CLASS_CHAMPION) { LoadBattleTerrainEntryGfx(BATTLE_TERRAIN_BUILDING); return; @@ -1029,14 +1029,10 @@ static u8 GetBattleTerrainOverride(void) } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) { - if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_LEADER_2) - { + if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_LEADER) return BATTLE_TERRAIN_LEADER; - } - else if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_CHAMPION_2) - { + else if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_CHAMPION) return BATTLE_TERRAIN_CHAMPION; - } } battleScene = GetCurrentMapBattleScene(); if (battleScene == MAP_BATTLE_SCENE_NORMAL) diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 410fd2e4c..b2dc31480 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -13,7 +13,7 @@ #include "battle_message.h" #include "constants/battle_anim.h" #include "constants/songs.h" -#include "constants/facility_trainer_classes.h" +#include "constants/trainers.h" static void LinkOpponentHandleGetMonData(void); static void LinkOpponentHandleGetRawMonData(void); @@ -1117,9 +1117,9 @@ static void LinkOpponentHandleDrawTrainerPic(void) || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_EMERALD) { if (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender != MALE) - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_5]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_MAY]; else - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_2]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_BRENDAN]; } else if (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender != MALE) { @@ -1142,9 +1142,9 @@ static void LinkOpponentHandleDrawTrainerPic(void) || (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_EMERALD) { if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != MALE) - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_5]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_MAY]; else - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_2]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_BRENDAN]; } else if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != MALE) { diff --git a/src/battle_main.c b/src/battle_main.c index f53fc2bce..5e870c6e7 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -42,7 +42,7 @@ #include "constants/moves.h" #include "constants/pokemon.h" #include "constants/songs.h" -#include "constants/trainer_classes.h" +#include "constants/trainers.h" static void SpriteCB_UnusedDebugSprite(struct Sprite *sprite); static void HandleAction_UseMove(void); @@ -450,110 +450,110 @@ const u8 gTypeNames[][TYPE_NAME_LENGTH + 1] = // This is a factor in how much money you get for beating a trainer. const struct TrainerMoney gTrainerMoneyTable[] = { - { CLASS_LEADER_2, 25 }, - { CLASS_ELITE_FOUR_2, 25 }, - { CLASS_PKMN_PROF, 25 }, - { CLASS_RIVAL, 4 }, - { CLASS_RIVAL_2, 9 }, - { CLASS_CHAMPION_2, 25 }, - { CLASS_YOUNGSTER_2, 4 }, - { CLASS_BUG_CATCHER_2, 3 }, - { CLASS_HIKER_2, 9 }, - { CLASS_BIRD_KEEPER_2, 6 }, - { CLASS_PICNICKER_2, 5 }, - { CLASS_SUPER_NERD, 6 }, - { CLASS_FISHERMAN_2, 9 }, - { CLASS_TEAM_ROCKET, 8 }, - { CLASS_LASS_2, 4 }, - { CLASS_BEAUTY_2, 18 }, - { CLASS_BLACK_BELT_2, 6 }, - { CLASS_CUE_BALL, 6 }, - { CLASS_CHANNELER, 8 }, - { CLASS_ROCKER, 6 }, - { CLASS_GENTLEMAN_2, 18 }, - { CLASS_BURGLAR, 22 }, - { CLASS_SWIMMER_MALE_2, 1 }, - { CLASS_ENGINEER, 12 }, - { CLASS_JUGGLER, 10 }, - { CLASS_SAILOR_2, 8 }, - { CLASS_COOLTRAINER_2, 9 }, - { CLASS_POKEMANIAC_2, 12 }, - { CLASS_TAMER, 10 }, - { CLASS_CAMPER_2, 5 }, - { CLASS_PSYCHIC_2, 5 }, - { CLASS_BIKER, 5 }, - { CLASS_GAMER, 18 }, - { CLASS_SCIENTIST, 12 }, - { CLASS_CRUSH_GIRL, 6 }, - { CLASS_TUBER_3, 1 }, - { CLASS_PKMN_BREEDER_2, 7 }, - { CLASS_PKMN_RANGER_2, 9 }, - { CLASS_AROMA_LADY_2, 7 }, - { CLASS_RUIN_MANIAC_2, 12 }, - { CLASS_LADY_2, 50 }, - { CLASS_PAINTER, 4 }, - { CLASS_TWINS_2, 3 }, - { CLASS_YOUNG_COUPLE_2, 7 }, - { CLASS_SIS_AND_BRO_2, 1 }, - { CLASS_COOL_COUPLE, 6 }, - { CLASS_CRUSH_KIN, 6 }, - { CLASS_SWIMMER_FEMALE_2, 1 }, - { CLASS_PLAYER, 1 }, - { CLASS_LEADER, 25 }, - { CLASS_ELITE_FOUR, 25 }, - { CLASS_LASS, 4 }, - { CLASS_YOUNGSTER, 4 }, - { CLASS_PKMN_TRAINER_3, 15 }, - { CLASS_HIKER, 10 }, - { CLASS_BEAUTY, 20 }, - { CLASS_FISHERMAN, 10 }, - { CLASS_LADY, 50 }, - { CLASS_TRIATHLETE, 10 }, - { CLASS_TEAM_AQUA, 5 }, - { CLASS_TWINS, 3 }, - { CLASS_SWIMMER_FEMALE, 2 }, - { CLASS_BUG_CATCHER, 4 }, - { CLASS_SCHOOL_KID, 5 }, - { CLASS_RICH_BOY, 50 }, - { CLASS_SR_AND_JR, 4 }, - { CLASS_BLACK_BELT, 8 }, - { CLASS_TUBER, 1 }, - { CLASS_HEX_MANIAC, 6 }, - { CLASS_PKMN_BREEDER, 10 }, - { CLASS_TEAM_MAGMA, 5 }, - { CLASS_INTERVIEWER, 12 }, - { CLASS_TUBER_2, 1 }, - { CLASS_YOUNG_COUPLE, 8 }, - { CLASS_GUITARIST, 8 }, - { CLASS_GENTLEMAN, 20 }, - { CLASS_CHAMPION, 50 }, - { CLASS_MAGMA_LEADER, 20 }, - { CLASS_BATTLE_GIRL, 6 }, - { CLASS_SWIMMER_MALE, 2 }, - { CLASS_POKEFAN, 20 }, - { CLASS_EXPERT, 10 }, - { CLASS_DRAGON_TAMER, 12 }, - { CLASS_BIRD_KEEPER, 8 }, - { CLASS_NINJA_BOY, 3 }, - { CLASS_PARASOL_LADY, 10 }, - { CLASS_BUG_MANIAC, 15 }, - { CLASS_SAILOR, 8 }, - { CLASS_COLLECTOR, 15 }, - { CLASS_PKMN_RANGER, 12 }, - { CLASS_MAGMA_ADMIN, 10 }, - { CLASS_AROMA_LADY, 10 }, - { CLASS_RUIN_MANIAC, 15 }, - { CLASS_COOLTRAINER, 12 }, - { CLASS_POKEMANIAC, 15 }, - { CLASS_KINDLER, 8 }, - { CLASS_CAMPER, 4 }, - { CLASS_PICNICKER, 4 }, - { CLASS_PSYCHIC, 6 }, - { CLASS_SIS_AND_BRO, 3 }, - { CLASS_OLD_COUPLE, 10 }, - { CLASS_AQUA_ADMIN, 10 }, - { CLASS_AQUA_LEADER, 20 }, - { CLASS_BOSS, 25 }, + { TRAINER_CLASS_LEADER, 25 }, + { TRAINER_CLASS_ELITE_FOUR, 25 }, + { TRAINER_CLASS_PKMN_PROF, 25 }, + { TRAINER_CLASS_RIVAL_EARLY, 4 }, + { TRAINER_CLASS_RIVAL_LATE, 9 }, + { TRAINER_CLASS_CHAMPION, 25 }, + { TRAINER_CLASS_YOUNGSTER, 4 }, + { TRAINER_CLASS_BUG_CATCHER, 3 }, + { TRAINER_CLASS_HIKER, 9 }, + { TRAINER_CLASS_BIRD_KEEPER, 6 }, + { TRAINER_CLASS_PICNICKER, 5 }, + { TRAINER_CLASS_SUPER_NERD, 6 }, + { TRAINER_CLASS_FISHERMAN, 9 }, + { TRAINER_CLASS_TEAM_ROCKET, 8 }, + { TRAINER_CLASS_LASS, 4 }, + { TRAINER_CLASS_BEAUTY, 18 }, + { TRAINER_CLASS_BLACK_BELT, 6 }, + { TRAINER_CLASS_CUE_BALL, 6 }, + { TRAINER_CLASS_CHANNELER, 8 }, + { TRAINER_CLASS_ROCKER, 6 }, + { TRAINER_CLASS_GENTLEMAN, 18 }, + { TRAINER_CLASS_BURGLAR, 22 }, + { TRAINER_CLASS_SWIMMER_M, 1 }, + { TRAINER_CLASS_ENGINEER, 12 }, + { TRAINER_CLASS_JUGGLER, 10 }, + { TRAINER_CLASS_SAILOR, 8 }, + { TRAINER_CLASS_COOLTRAINER, 9 }, + { TRAINER_CLASS_POKEMANIAC, 12 }, + { TRAINER_CLASS_TAMER, 10 }, + { TRAINER_CLASS_CAMPER, 5 }, + { TRAINER_CLASS_PSYCHIC, 5 }, + { TRAINER_CLASS_BIKER, 5 }, + { TRAINER_CLASS_GAMER, 18 }, + { TRAINER_CLASS_SCIENTIST, 12 }, + { TRAINER_CLASS_CRUSH_GIRL, 6 }, + { TRAINER_CLASS_TUBER, 1 }, + { TRAINER_CLASS_PKMN_BREEDER, 7 }, + { TRAINER_CLASS_PKMN_RANGER, 9 }, + { TRAINER_CLASS_AROMA_LADY, 7 }, + { TRAINER_CLASS_RUIN_MANIAC, 12 }, + { TRAINER_CLASS_LADY, 50 }, + { TRAINER_CLASS_PAINTER, 4 }, + { TRAINER_CLASS_TWINS, 3 }, + { TRAINER_CLASS_YOUNG_COUPLE, 7 }, + { TRAINER_CLASS_SIS_AND_BRO, 1 }, + { TRAINER_CLASS_COOL_COUPLE, 6 }, + { TRAINER_CLASS_CRUSH_KIN, 6 }, + { TRAINER_CLASS_SWIMMER_F, 1 }, + { TRAINER_CLASS_PLAYER, 1 }, + { TRAINER_CLASS_RS_LEADER, 25 }, + { TRAINER_CLASS_RS_ELITE_FOUR, 25 }, + { TRAINER_CLASS_RS_LASS, 4 }, + { TRAINER_CLASS_RS_YOUNGSTER, 4 }, + { TRAINER_CLASS_PKMN_TRAINER, 15 }, + { TRAINER_CLASS_RS_HIKER, 10 }, + { TRAINER_CLASS_RS_BEAUTY, 20 }, + { TRAINER_CLASS_RS_FISHERMAN, 10 }, + { TRAINER_CLASS_RS_LADY, 50 }, + { TRAINER_CLASS_TRIATHLETE, 10 }, + { TRAINER_CLASS_TEAM_AQUA, 5 }, + { TRAINER_CLASS_RS_TWINS, 3 }, + { TRAINER_CLASS_RS_SWIMMER_F, 2 }, + { TRAINER_CLASS_RS_BUG_CATCHER, 4 }, + { TRAINER_CLASS_SCHOOL_KID, 5 }, + { TRAINER_CLASS_RICH_BOY, 50 }, + { TRAINER_CLASS_SR_AND_JR, 4 }, + { TRAINER_CLASS_RS_BLACK_BELT, 8 }, + { TRAINER_CLASS_RS_TUBER_F, 1 }, + { TRAINER_CLASS_HEX_MANIAC, 6 }, + { TRAINER_CLASS_RS_PKMN_BREEDER, 10 }, + { TRAINER_CLASS_TEAM_MAGMA, 5 }, + { TRAINER_CLASS_INTERVIEWER, 12 }, + { TRAINER_CLASS_RS_TUBER_M, 1 }, + { TRAINER_CLASS_RS_YOUNG_COUPLE, 8 }, + { TRAINER_CLASS_GUITARIST, 8 }, + { TRAINER_CLASS_RS_GENTLEMAN, 20 }, + { TRAINER_CLASS_RS_CHAMPION, 50 }, + { TRAINER_CLASS_MAGMA_LEADER, 20 }, + { TRAINER_CLASS_BATTLE_GIRL, 6 }, + { TRAINER_CLASS_RS_SWIMMER_M, 2 }, + { TRAINER_CLASS_POKEFAN, 20 }, + { TRAINER_CLASS_EXPERT, 10 }, + { TRAINER_CLASS_DRAGON_TAMER, 12 }, + { TRAINER_CLASS_RS_BIRD_KEEPER, 8 }, + { TRAINER_CLASS_NINJA_BOY, 3 }, + { TRAINER_CLASS_PARASOL_LADY, 10 }, + { TRAINER_CLASS_BUG_MANIAC, 15 }, + { TRAINER_CLASS_RS_SAILOR, 8 }, + { TRAINER_CLASS_COLLECTOR, 15 }, + { TRAINER_CLASS_RS_PKMN_RANGER, 12 }, + { TRAINER_CLASS_MAGMA_ADMIN, 10 }, + { TRAINER_CLASS_RS_AROMA_LADY, 10 }, + { TRAINER_CLASS_RS_RUIN_MANIAC, 15 }, + { TRAINER_CLASS_RS_COOLTRAINER, 12 }, + { TRAINER_CLASS_RS_POKEMANIAC, 15 }, + { TRAINER_CLASS_KINDLER, 8 }, + { TRAINER_CLASS_RS_CAMPER, 4 }, + { TRAINER_CLASS_RS_PICNICKER, 4 }, + { TRAINER_CLASS_RS_PSYCHIC, 6 }, + { TRAINER_CLASS_RS_SIS_AND_BRO, 3 }, + { TRAINER_CLASS_OLD_COUPLE, 10 }, + { TRAINER_CLASS_AQUA_ADMIN, 10 }, + { TRAINER_CLASS_AQUA_LEADER, 20 }, + { TRAINER_CLASS_BOSS, 25 }, { 0xFF, 5 }, }; @@ -3644,15 +3644,15 @@ static void HandleEndTurn_BattleWon(void) gBattlescriptCurrInstr = BattleScript_LocalTrainerBattleWon; switch (gTrainers[gTrainerBattleOpponent_A].trainerClass) { - case CLASS_LEADER_2: - case CLASS_CHAMPION_2: + case TRAINER_CLASS_LEADER: + case TRAINER_CLASS_CHAMPION: PlayBGM(MUS_VICTORY_GYM_LEADER); break; - case CLASS_BOSS: - case CLASS_TEAM_ROCKET: - case CLASS_COOLTRAINER_2: - case CLASS_ELITE_FOUR_2: - case CLASS_GENTLEMAN_2: + case TRAINER_CLASS_BOSS: + case TRAINER_CLASS_TEAM_ROCKET: + case TRAINER_CLASS_COOLTRAINER: + case TRAINER_CLASS_ELITE_FOUR: + case TRAINER_CLASS_GENTLEMAN: default: PlayBGM(MUS_VICTORY_TRAINER); break; diff --git a/src/battle_message.c b/src/battle_message.c index 20b7f9c75..73735d49c 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -18,7 +18,7 @@ #include "graphics.h" #include "constants/moves.h" #include "constants/items.h" -#include "constants/trainer_classes.h" +#include "constants/trainers.h" struct BattleWindowText { @@ -2021,9 +2021,9 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) } else { - if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_RIVAL - || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_RIVAL_2 - || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_CHAMPION_2) + if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_RIVAL_EARLY + || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_RIVAL_LATE + || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_CHAMPION) toCpy = GetExpandedPlaceholder(PLACEHOLDER_ID_RIVAL); else toCpy = gTrainers[gTrainerBattleOpponent_A].trainerName; diff --git a/src/battle_setup.c b/src/battle_setup.c index 62df9965d..49e2d9e01 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -31,7 +31,7 @@ #include "constants/maps.h" #include "constants/songs.h" #include "constants/pokemon.h" -#include "constants/trainer_classes.h" +#include "constants/trainers.h" enum { @@ -613,7 +613,7 @@ static u8 GetTrainerBattleTransition(void) if (gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) return B_TRANSITION_BLUE; - if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_ELITE_FOUR_2) + if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_ELITE_FOUR) { if (gTrainerBattleOpponent_A == TRAINER_ELITE_FOUR_LORELEI || gTrainerBattleOpponent_A == TRAINER_ELITE_FOUR_LORELEI_2) return B_TRANSITION_LORELEI; @@ -625,7 +625,7 @@ static u8 GetTrainerBattleTransition(void) return B_TRANSITION_LANCE; return B_TRANSITION_BLUE; } - if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_CHAMPION_2) + if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_CHAMPION) return B_TRANSITION_BLUE; if (gTrainers[gTrainerBattleOpponent_A].doubleBattle == TRUE) minPartyCount = 2; // double battles always at least have 2 pokemon. diff --git a/src/battle_tower.c b/src/battle_tower.c index 4c6934781..5c6672f6e 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -49,7 +49,10 @@ const u8 unref_83FFAAC[] = { const u8 unref_83FFABF[] = _("100"); -#include "data/battle_tower/trainers.h" +static const struct BattleTowerTrainer sBattleTowerTrainers[] = +{ + +}; static const u16 sBattleTowerHeldItems[] = { ITEM_NONE, @@ -488,7 +491,7 @@ u8 GetBattleTowerTrainerFrontSpriteId(void) } else if (gSaveBlock2Ptr->battleTower.battleTowerTrainerId < BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID) { - return gFacilityClassToPicIndex[gBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].trainerClass]; + return gFacilityClassToPicIndex[sBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].trainerClass]; } else { @@ -508,7 +511,7 @@ u8 GetBattleTowerTrainerClassNameId(void) } else { - return gFacilityClassToTrainerClass[gBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].trainerClass]; + return gFacilityClassToTrainerClass[sBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].trainerClass]; } } @@ -523,7 +526,7 @@ void GetBattleTowerTrainerName(u8 *dest) else if (gSaveBlock2Ptr->battleTower.battleTowerTrainerId < BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID) { for (i = 0; i < 3; i++) - dest[i] = gBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].name[i]; + dest[i] = sBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].name[i]; } else { @@ -630,7 +633,7 @@ static void FillBattleTowerTrainerParty(void) level = 50; } - teamFlags = gBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].teamFlags; + teamFlags = sBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].teamFlags; // Attempt to fill the trainer's party with random Pokemon until 3 have been // successfully chosen. The trainer's party may not have duplicate pokemon species @@ -847,7 +850,7 @@ void PrintBattleTowerTrainerGreeting(void) if (gSaveBlock2Ptr->battleTower.battleTowerTrainerId == BATTLE_TOWER_EREADER_TRAINER_ID) BufferBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.ereaderTrainer.greeting); else if (gSaveBlock2Ptr->battleTower.battleTowerTrainerId < BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID) - BufferBattleTowerTrainerMessage(gBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].greeting); + BufferBattleTowerTrainerMessage(sBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].greeting); else BufferBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.records[gSaveBlock2Ptr->battleTower.battleTowerTrainerId - BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID].greeting); } diff --git a/src/data.c b/src/data.c index 3f6a340eb..2b1d802ab 100644 --- a/src/data.c +++ b/src/data.c @@ -6,7 +6,7 @@ #include "constants/items.h" #include "constants/moves.h" #include "constants/battle_ai.h" -#include "constants/trainer_classes.h" +#include "constants/trainers.h" const struct SpriteFrameImage gSpriteImages_BattlerPlayerLeft[] = { diff --git a/src/data/battle_tower/trainers.h b/src/data/battle_tower/trainers.h deleted file mode 100644 index f69625c82..000000000 --- a/src/data/battle_tower/trainers.h +++ /dev/null @@ -1,4 +0,0 @@ -const struct BattleTowerTrainer gBattleTowerTrainers[] = -{ - -}; diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 07183e288..cd7463a4e 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -172,8 +172,8 @@ const u32 gTrainerPalette_RSBrendan1[] = INCBIN_U32("graphics/trainers/palettes/ const u32 gTrainerFrontPic_RSMay1[] = INCBIN_U32("graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz"); const u32 gTrainerPalette_RSMay1[] = INCBIN_U32("graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz"); -const u32 gTrainerFrontPic_PokemonBreederM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_m_front_pic.4bpp.lz"); -const u32 gTrainerPalette_PokemonBreederM[] = INCBIN_U32("graphics/trainers/palettes/pokemon_breeder_m.gbapal.lz"); +const u32 gTrainerFrontPic_RSPokemonBreederM[] = INCBIN_U32("graphics/trainers/front_pics/rs_pokemon_breeder_m_front_pic.4bpp.lz"); +const u32 gTrainerPalette_RSPokemonBreederM[] = INCBIN_U32("graphics/trainers/palettes/rs_pokemon_breeder_m.gbapal.lz"); const u32 gTrainerFrontPic_RSPokemonBreederF[] = INCBIN_U32("graphics/trainers/front_pics/rs_pokemon_breeder_f_front_pic.4bpp.lz"); const u32 gTrainerPalette_RSPokemonBreederF[] = INCBIN_U32("graphics/trainers/palettes/rs_pokemon_breeder_f.gbapal.lz"); @@ -316,8 +316,8 @@ const u32 gTrainerPalette_BirdKeeper[] = INCBIN_U32("graphics/trainers/palettes/ const u32 gTrainerFrontPic_BlackBelt[] = INCBIN_U32("graphics/trainers/front_pics/black_belt_front_pic.4bpp.lz"); const u32 gTrainerPalette_BlackBelt[] = INCBIN_U32("graphics/trainers/palettes/black_belt.gbapal.lz"); -const u32 gTrainerFrontPic_Rival1[] = INCBIN_U32("graphics/trainers/front_pics/rival_1_front_pic.4bpp.lz"); -const u32 gTrainerPalette_Rival1[] = INCBIN_U32("graphics/trainers/palettes/rival_1.gbapal.lz"); +const u32 gTrainerFrontPic_RivalEarly[] = INCBIN_U32("graphics/trainers/front_pics/rival_early_front_pic.4bpp.lz"); +const u32 gTrainerPalette_RivalEarly[] = INCBIN_U32("graphics/trainers/palettes/rival_early.gbapal.lz"); const u32 gTrainerFrontPic_Scientist[] = INCBIN_U32("graphics/trainers/front_pics/scientist_front_pic.4bpp.lz"); const u32 gTrainerPalette_Scientist[] = INCBIN_U32("graphics/trainers/palettes/scientist.gbapal.lz"); @@ -370,8 +370,8 @@ const u32 gTrainerPalette_LeaderSabrina[] = INCBIN_U32("graphics/trainers/palett const u32 gTrainerFrontPic_Gentleman[] = INCBIN_U32("graphics/trainers/front_pics/gentleman_front_pic.4bpp.lz"); const u32 gTrainerPalette_Gentleman[] = INCBIN_U32("graphics/trainers/palettes/gentleman.gbapal.lz"); -const u32 gTrainerFrontPic_Rival2[] = INCBIN_U32("graphics/trainers/front_pics/rival_2_front_pic.4bpp.lz"); -const u32 gTrainerPalette_Rival2[] = INCBIN_U32("graphics/trainers/palettes/rival_2.gbapal.lz"); +const u32 gTrainerFrontPic_RivalLate[] = INCBIN_U32("graphics/trainers/front_pics/rival_late_front_pic.4bpp.lz"); +const u32 gTrainerPalette_RivalLate[] = INCBIN_U32("graphics/trainers/palettes/rival_late.gbapal.lz"); const u32 gTrainerFrontPic_ChampionRival[] = INCBIN_U32("graphics/trainers/front_pics/champion_rival_front_pic.4bpp.lz"); const u32 gTrainerPalette_ChampionRival[] = INCBIN_U32("graphics/trainers/palettes/champion_rival.gbapal.lz"); @@ -421,8 +421,8 @@ const u32 gTrainerPalette_CrushGirl[] = INCBIN_U32("graphics/trainers/palettes/c const u32 gTrainerFrontPic_TuberF[] = INCBIN_U32("graphics/trainers/front_pics/tuber_f_front_pic.4bpp.lz"); const u32 gTrainerPalette_TuberF[] = INCBIN_U32("graphics/trainers/palettes/tuber_f.gbapal.lz"); -const u32 gTrainerFrontPic_PokemonBreederF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_f_front_pic.4bpp.lz"); -const u32 gTrainerPalette_PokemonBreederF[] = INCBIN_U32("graphics/trainers/palettes/pokemon_breeder_f.gbapal.lz"); +const u32 gTrainerFrontPic_PokemonBreeder[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_front_pic.4bpp.lz"); +const u32 gTrainerPalette_PokemonBreeder[] = INCBIN_U32("graphics/trainers/palettes/pokemon_breeder.gbapal.lz"); const u32 gTrainerFrontPic_PokemonRangerM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_m_front_pic.4bpp.lz"); const u32 gTrainerPalette_PokemonRangerM[] = INCBIN_U32("graphics/trainers/palettes/pokemon_ranger_m.gbapal.lz"); diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h index 2309f85a1..e7611d758 100644 --- a/src/data/pokemon/trainer_class_lookups.h +++ b/src/data/pokemon/trainer_class_lookups.h @@ -1,308 +1,312 @@ -// TODO: document trainer pic indices with macro const u8 gFacilityClassToPicIndex[] = { - [FACILITY_CLASS_AQUA_LEADER] = 0, - [FACILITY_CLASS_TEAM_AQUA] = 1, - [FACILITY_CLASS_TEAM_AQUA_2] = 2, - [FACILITY_CLASS_AROMA_LADY] = 3, - [FACILITY_CLASS_RUIN_MANIAC] = 4, - [FACILITY_CLASS_INTERVIEWER] = 5, - [FACILITY_CLASS_TUBER] = 6, - [FACILITY_CLASS_TUBER_2] = 7, - [FACILITY_CLASS_COOLTRAINER] = 8, - [FACILITY_CLASS_COOLTRAINER_2] = 9, - [FACILITY_CLASS_HEX_MANIAC] = 10, - [FACILITY_CLASS_LADY] = 11, - [FACILITY_CLASS_BEAUTY] = 12, - [FACILITY_CLASS_RICH_BOY] = 13, - [FACILITY_CLASS_POKEMANIAC] = 14, - [FACILITY_CLASS_SWIMMER_MALE] = 15, - [FACILITY_CLASS_BLACK_BELT] = 16, - [FACILITY_CLASS_GUITARIST] = 17, - [FACILITY_CLASS_KINDLER] = 18, - [FACILITY_CLASS_CAMPER] = 19, - [FACILITY_CLASS_BUG_MANIAC] = 20, - [FACILITY_CLASS_PSYCHIC] = 21, - [FACILITY_CLASS_PSYCHIC_2] = 22, - [FACILITY_CLASS_GENTLEMAN] = 23, - [FACILITY_CLASS_ELITE_FOUR] = 24, - [FACILITY_CLASS_ELITE_FOUR_2] = 25, - [FACILITY_CLASS_LEADER] = 26, - [FACILITY_CLASS_LEADER_2] = 27, - [FACILITY_CLASS_LEADER_3] = 28, - [FACILITY_CLASS_SCHOOL_KID] = 29, - [FACILITY_CLASS_SCHOOL_KID_2] = 30, - [FACILITY_CLASS_SR_AND_JR] = 31, - [FACILITY_CLASS_POKEFAN] = 32, - [FACILITY_CLASS_POKEFAN_2] = 33, - [FACILITY_CLASS_EXPERT] = 34, - [FACILITY_CLASS_EXPERT_2] = 35, - [FACILITY_CLASS_YOUNGSTER] = 36, - [FACILITY_CLASS_CHAMPION] = 37, - [FACILITY_CLASS_FISHERMAN] = 38, - [FACILITY_CLASS_TRIATHLETE] = 39, - [FACILITY_CLASS_TRIATHLETE_2] = 40, - [FACILITY_CLASS_TRIATHLETE_3] = 41, - [FACILITY_CLASS_TRIATHLETE_4] = 42, - [FACILITY_CLASS_TRIATHLETE_5] = 43, - [FACILITY_CLASS_TRIATHLETE_6] = 44, - [FACILITY_CLASS_DRAGON_TAMER] = 45, - [FACILITY_CLASS_BIRD_KEEPER] = 46, - [FACILITY_CLASS_NINJA_BOY] = 47, - [FACILITY_CLASS_BATTLE_GIRL] = 48, - [FACILITY_CLASS_PARASOL_LADY] = 49, - [FACILITY_CLASS_SWIMMER_FEMALE] = 50, - [FACILITY_CLASS_PICNICKER] = 51, - [FACILITY_CLASS_TWINS] = 52, - [FACILITY_CLASS_SAILOR] = 53, - [FACILITY_CLASS_BOARDER] = 36, - [FACILITY_CLASS_BOARDER_2] = 36, - [FACILITY_CLASS_COLLECTOR] = 54, - [FACILITY_CLASS_PKMN_TRAINER] = 55, - [FACILITY_CLASS_PKMN_TRAINER_2] = 56, - [FACILITY_CLASS_PKMN_TRAINER_3] = 56, - [FACILITY_CLASS_PKMN_TRAINER_4] = 56, - [FACILITY_CLASS_PKMN_TRAINER_5] = 57, - [FACILITY_CLASS_PKMN_TRAINER_6] = 57, - [FACILITY_CLASS_PKMN_TRAINER_7] = 57, - [FACILITY_CLASS_PKMN_BREEDER] = 58, - [FACILITY_CLASS_PKMN_BREEDER_2] = 59, - [FACILITY_CLASS_PKMN_RANGER] = 60, - [FACILITY_CLASS_PKMN_RANGER_2] = 61, - [FACILITY_CLASS_MAGMA_LEADER] = 62, - [FACILITY_CLASS_TEAM_MAGMA] = 63, - [FACILITY_CLASS_TEAM_MAGMA_2] = 64, - [FACILITY_CLASS_LASS] = 65, - [FACILITY_CLASS_BUG_CATCHER] = 66, - [FACILITY_CLASS_HIKER] = 67, - [FACILITY_CLASS_YOUNG_COUPLE] = 68, - [FACILITY_CLASS_OLD_COUPLE] = 69, - [FACILITY_CLASS_SIS_AND_BRO] = 70, - [FACILITY_CLASS_AQUA_ADMIN] = 71, - [FACILITY_CLASS_AQUA_ADMIN_2] = 72, - [FACILITY_CLASS_MAGMA_ADMIN] = 73, - [FACILITY_CLASS_MAGMA_ADMIN_2] = 74, - [FACILITY_CLASS_LEADER_4] = 75, - [FACILITY_CLASS_LEADER_5] = 76, - [FACILITY_CLASS_LEADER_6] = 77, - [FACILITY_CLASS_LEADER_7] = 78, - [FACILITY_CLASS_LEADER_8] = 79, - [FACILITY_CLASS_ELITE_FOUR_3] = 80, - [FACILITY_CLASS_ELITE_FOUR_4] = 81, - [FACILITY_CLASS_YOUNGSTER_2] = 82, - [FACILITY_CLASS_BUG_CATCHER_2] = 83, - [FACILITY_CLASS_LASS_2] = 84, - [FACILITY_CLASS_SAILOR_2] = 85, - [FACILITY_CLASS_CAMPER_2] = 86, - [FACILITY_CLASS_PICNICKER_2] = 87, - [FACILITY_CLASS_POKEMANIAC_2] = 88, - [FACILITY_CLASS_SUPER_NERD] = 89, - [FACILITY_CLASS_HIKER_2] = 90, - [FACILITY_CLASS_BIKER] = 91, - [FACILITY_CLASS_BURGLAR] = 92, - [FACILITY_CLASS_ENGINEER] = 93, - [FACILITY_CLASS_FISHERMAN_2] = 94, - [FACILITY_CLASS_SWIMMER_MALE_2] = 95, - [FACILITY_CLASS_CUE_BALL] = 96, - [FACILITY_CLASS_GAMER] = 97, - [FACILITY_CLASS_BEAUTY_2] = 98, - [FACILITY_CLASS_SWIMMER_FEMALE_2] = 99, - [FACILITY_CLASS_PSYCHIC_3] = 100, - [FACILITY_CLASS_ROCKER] = 101, - [FACILITY_CLASS_JUGGLER] = 102, - [FACILITY_CLASS_TAMER] = 103, - [FACILITY_CLASS_BIRD_KEEPER_2] = 104, - [FACILITY_CLASS_BLACK_BELT_2] = 105, - [FACILITY_CLASS_RIVAL] = 106, - [FACILITY_CLASS_SCIENTIST] = 107, - [FACILITY_CLASS_BOSS] = 108, - [FACILITY_CLASS_TEAM_ROCKET] = 109, - [FACILITY_CLASS_COOLTRAINER_3] = 110, - [FACILITY_CLASS_COOLTRAINER_4] = 111, - [FACILITY_CLASS_ELITE_FOUR_5] = 112, - [FACILITY_CLASS_ELITE_FOUR_6] = 113, - [FACILITY_CLASS_LEADER_9] = 116, - [FACILITY_CLASS_LEADER_10] = 117, - [FACILITY_CLASS_GENTLEMAN_2] = 123, - [FACILITY_CLASS_RIVAL_2] = 124, - [FACILITY_CLASS_CHAMPION_2] = 125, - [FACILITY_CLASS_CHANNELER] = 126, - [FACILITY_CLASS_TWINS_2] = 127, - [FACILITY_CLASS_COOL_COUPLE] = 128, - [FACILITY_CLASS_YOUNG_COUPLE_2] = 129, - [FACILITY_CLASS_CRUSH_KIN] = 130, - [FACILITY_CLASS_SIS_AND_BRO_2] = 131, - [FACILITY_CLASS_PKMN_PROF] = 132, - [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, - [FACILITY_CLASS_TUBER_3] = 140, - [FACILITY_CLASS_PKMN_BREEDER_3] = 141, - [FACILITY_CLASS_PKMN_RANGER_3] = 142, - [FACILITY_CLASS_PKMN_RANGER_4] = 143, - [FACILITY_CLASS_AROMA_LADY_2] = 144, - [FACILITY_CLASS_RUIN_MANIAC_2] = 145, - [FACILITY_CLASS_LADY_2] = 146, - [FACILITY_CLASS_PAINTER] = 147, - [FACILITY_CLASS_ELITE_FOUR_7] = 112, - [FACILITY_CLASS_ELITE_FOUR_8] = 113, - [FACILITY_CLASS_CHAMPION_3] = 125, + [FACILITY_CLASS_AQUA_LEADER_ARCHIE] = TRAINER_PIC_AQUA_LEADER_ARCHIE, + [FACILITY_CLASS_AQUA_GRUNT_M] = TRAINER_PIC_AQUA_GRUNT_M, + [FACILITY_CLASS_AQUA_GRUNT_F] = TRAINER_PIC_AQUA_GRUNT_F, + [FACILITY_CLASS_RS_AROMA_LADY] = TRAINER_PIC_RS_AROMA_LADY, + [FACILITY_CLASS_RS_RUIN_MANIAC] = TRAINER_PIC_RS_RUIN_MANIAC, + [FACILITY_CLASS_INTERVIEWER] = TRAINER_PIC_INTERVIEWER, + [FACILITY_CLASS_RS_TUBER_F] = TRAINER_PIC_RS_TUBER_F, + [FACILITY_CLASS_RS_TUBER_M] = TRAINER_PIC_RS_TUBER_M, + [FACILITY_CLASS_RS_COOLTRAINER_M] = TRAINER_PIC_RS_COOLTRAINER_M, + [FACILITY_CLASS_RS_COOLTRAINER_F] = TRAINER_PIC_RS_COOLTRAINER_F, + [FACILITY_CLASS_HEX_MANIAC] = TRAINER_PIC_HEX_MANIAC, + [FACILITY_CLASS_RS_LADY] = TRAINER_PIC_RS_LADY, + [FACILITY_CLASS_RS_BEAUTY] = TRAINER_PIC_RS_BEAUTY, + [FACILITY_CLASS_RICH_BOY] = TRAINER_PIC_RICH_BOY, + [FACILITY_CLASS_RS_POKEMANIAC] = TRAINER_PIC_RS_POKEMANIAC, + [FACILITY_CLASS_RS_SWIMMER_M] = TRAINER_PIC_RS_SWIMMER_M, + [FACILITY_CLASS_RS_BLACK_BELT] = TRAINER_PIC_RS_BLACK_BELT, + [FACILITY_CLASS_GUITARIST] = TRAINER_PIC_GUITARIST, + [FACILITY_CLASS_KINDLER] = TRAINER_PIC_KINDLER, + [FACILITY_CLASS_RS_CAMPER] = TRAINER_PIC_RS_CAMPER, + [FACILITY_CLASS_BUG_MANIAC] = TRAINER_PIC_BUG_MANIAC, + [FACILITY_CLASS_RS_PSYCHIC_M] = TRAINER_PIC_RS_PSYCHIC_M, + [FACILITY_CLASS_RS_PSYCHIC_F] = TRAINER_PIC_RS_PSYCHIC_F, + [FACILITY_CLASS_RS_GENTLEMAN] = TRAINER_PIC_RS_GENTLEMAN, + [FACILITY_CLASS_ELITE_FOUR_SIDNEY] = TRAINER_PIC_ELITE_FOUR_SIDNEY, + [FACILITY_CLASS_ELITE_FOUR_PHOEBE] = TRAINER_PIC_ELITE_FOUR_PHOEBE, + [FACILITY_CLASS_LEADER_ROXANNE] = TRAINER_PIC_LEADER_ROXANNE, + [FACILITY_CLASS_LEADER_BRAWLY] = TRAINER_PIC_LEADER_BRAWLY, + [FACILITY_CLASS_LEADER_TATE_AND_LIZA] = TRAINER_PIC_LEADER_TATE_AND_LIZA, + [FACILITY_CLASS_SCHOOL_KID_M] = TRAINER_PIC_SCHOOL_KID_M, + [FACILITY_CLASS_SCHOOL_KID_F] = TRAINER_PIC_SCHOOL_KID_F, + [FACILITY_CLASS_SR_AND_JR] = TRAINER_PIC_SR_AND_JR, + [FACILITY_CLASS_POKEFAN_M] = TRAINER_PIC_POKEFAN_M, + [FACILITY_CLASS_POKEFAN_F] = TRAINER_PIC_POKEFAN_F, + [FACILITY_CLASS_EXPERT_M] = TRAINER_PIC_EXPERT_M, + [FACILITY_CLASS_EXPERT_F] = TRAINER_PIC_EXPERT_F, + [FACILITY_CLASS_RS_YOUNGSTER] = TRAINER_PIC_RS_YOUNGSTER, + [FACILITY_CLASS_CHAMPION_STEVEN] = TRAINER_PIC_CHAMPION_STEVEN, + [FACILITY_CLASS_RS_FISHERMAN] = TRAINER_PIC_RS_FISHERMAN, + [FACILITY_CLASS_CYCLING_TRIATHLETE_M] = TRAINER_PIC_CYCLING_TRIATHLETE_M, + [FACILITY_CLASS_CYCLING_TRIATHLETE_F] = TRAINER_PIC_CYCLING_TRIATHLETE_F, + [FACILITY_CLASS_RUNNING_TRIATHLETE_M] = TRAINER_PIC_RUNNING_TRIATHLETE_M, + [FACILITY_CLASS_RUNNING_TRIATHLETE_F] = TRAINER_PIC_RUNNING_TRIATHLETE_F, + [FACILITY_CLASS_SWIMMING_TRIATHLETE_M] = TRAINER_PIC_SWIMMING_TRIATHLETE_M, + [FACILITY_CLASS_SWIMMING_TRIATHLETE_F] = TRAINER_PIC_SWIMMING_TRIATHLETE_F, + [FACILITY_CLASS_DRAGON_TAMER] = TRAINER_PIC_DRAGON_TAMER, + [FACILITY_CLASS_RS_BIRD_KEEPER] = TRAINER_PIC_RS_BIRD_KEEPER, + [FACILITY_CLASS_NINJA_BOY] = TRAINER_PIC_NINJA_BOY, + [FACILITY_CLASS_BATTLE_GIRL] = TRAINER_PIC_BATTLE_GIRL, + [FACILITY_CLASS_PARASOL_LADY] = TRAINER_PIC_PARASOL_LADY, + [FACILITY_CLASS_RS_SWIMMER_F] = TRAINER_PIC_RS_SWIMMER_F, + [FACILITY_CLASS_RS_PICNICKER] = TRAINER_PIC_RS_PICNICKER, + [FACILITY_CLASS_RS_TWINS] = TRAINER_PIC_RS_TWINS, + [FACILITY_CLASS_RS_SAILOR] = TRAINER_PIC_RS_SAILOR, + [FACILITY_CLASS_BOARDER_M] = TRAINER_PIC_RS_YOUNGSTER, + [FACILITY_CLASS_BOARDER_F] = TRAINER_PIC_RS_YOUNGSTER, + [FACILITY_CLASS_COLLECTOR] = TRAINER_PIC_COLLECTOR, + [FACILITY_CLASS_PKMN_TRAINER_WALLY] = TRAINER_PIC_WALLY, + [FACILITY_CLASS_PKMN_TRAINER_BRENDAN] = TRAINER_PIC_RS_BRENDAN_1, + [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2] = TRAINER_PIC_RS_BRENDAN_1, + [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3] = TRAINER_PIC_RS_BRENDAN_1, + [FACILITY_CLASS_PKMN_TRAINER_MAY] = TRAINER_PIC_RS_MAY_1, + [FACILITY_CLASS_PKMN_TRAINER_MAY_2] = TRAINER_PIC_RS_MAY_1, + [FACILITY_CLASS_PKMN_TRAINER_MAY_3] = TRAINER_PIC_RS_MAY_1, + [FACILITY_CLASS_RS_PKMN_BREEDER_M] = TRAINER_PIC_RS_POKEMON_BREEDER_M, + [FACILITY_CLASS_RS_PKMN_BREEDER_F] = TRAINER_PIC_RS_POKEMON_BREEDER_F, + [FACILITY_CLASS_RS_PKMN_RANGER_M] = TRAINER_PIC_RS_POKEMON_RANGER_M, + [FACILITY_CLASS_RS_PKMN_RANGER_F] = TRAINER_PIC_RS_POKEMON_RANGER_F, + [FACILITY_CLASS_MAGMA_LEADER_MAXIE] = TRAINER_PIC_MAGMA_LEADER_MAXIE, + [FACILITY_CLASS_MAGMA_GRUNT_M] = TRAINER_PIC_MAGMA_GRUNT_M, + [FACILITY_CLASS_MAGMA_GRUNT_F] = TRAINER_PIC_MAGMA_GRUNT_F, + [FACILITY_CLASS_RS_LASS] = TRAINER_PIC_RS_LASS, + [FACILITY_CLASS_RS_BUG_CATCHER] = TRAINER_PIC_RS_BUG_CATCHER, + [FACILITY_CLASS_RS_HIKER] = TRAINER_PIC_RS_HIKER, + [FACILITY_CLASS_RS_YOUNG_COUPLE] = TRAINER_PIC_RS_YOUNG_COUPLE, + [FACILITY_CLASS_OLD_COUPLE] = TRAINER_PIC_OLD_COUPLE, + [FACILITY_CLASS_RS_SIS_AND_BRO] = TRAINER_PIC_RS_SIS_AND_BRO, + [FACILITY_CLASS_AQUA_ADMIN_M] = TRAINER_PIC_AQUA_ADMIN_M, + [FACILITY_CLASS_AQUA_ADMIN_F] = TRAINER_PIC_AQUA_ADMIN_F, + [FACILITY_CLASS_MAGMA_ADMIN_M] = TRAINER_PIC_MAGMA_ADMIN_M, + [FACILITY_CLASS_MAGMA_ADMIN_F] = TRAINER_PIC_MAGMA_ADMIN_F, + [FACILITY_CLASS_LEADER_WATTSON] = TRAINER_PIC_LEADER_WATTSON, + [FACILITY_CLASS_LEADER_FLANNERY] = TRAINER_PIC_LEADER_FLANNERY, + [FACILITY_CLASS_LEADER_NORMAN] = TRAINER_PIC_LEADER_NORMAN, + [FACILITY_CLASS_LEADER_WINONA] = TRAINER_PIC_LEADER_WINONA, + [FACILITY_CLASS_LEADER_WALLACE] = TRAINER_PIC_LEADER_WALLACE, + [FACILITY_CLASS_ELITE_FOUR_GLACIA] = TRAINER_PIC_ELITE_FOUR_GLACIA, + [FACILITY_CLASS_ELITE_FOUR_DRAKE] = TRAINER_PIC_ELITE_FOUR_DRAKE, + [FACILITY_CLASS_YOUNGSTER] = TRAINER_PIC_YOUNGSTER, + [FACILITY_CLASS_BUG_CATCHER] = TRAINER_PIC_BUG_CATCHER, + [FACILITY_CLASS_LASS] = TRAINER_PIC_LASS, + [FACILITY_CLASS_SAILOR] = TRAINER_PIC_SAILOR, + [FACILITY_CLASS_CAMPER] = TRAINER_PIC_CAMPER, + [FACILITY_CLASS_PICNICKER] = TRAINER_PIC_PICNICKER, + [FACILITY_CLASS_POKEMANIAC] = TRAINER_PIC_POKEMANIAC, + [FACILITY_CLASS_SUPER_NERD] = TRAINER_PIC_SUPER_NERD, + [FACILITY_CLASS_HIKER] = TRAINER_PIC_HIKER, + [FACILITY_CLASS_BIKER] = TRAINER_PIC_BIKER, + [FACILITY_CLASS_BURGLAR] = TRAINER_PIC_BURGLAR, + [FACILITY_CLASS_ENGINEER] = TRAINER_PIC_ENGINEER, + [FACILITY_CLASS_FISHERMAN] = TRAINER_PIC_FISHERMAN, + [FACILITY_CLASS_SWIMMER_M] = TRAINER_PIC_SWIMMER_M, + [FACILITY_CLASS_CUE_BALL] = TRAINER_PIC_CUE_BALL, + [FACILITY_CLASS_GAMER] = TRAINER_PIC_GAMER, + [FACILITY_CLASS_BEAUTY] = TRAINER_PIC_BEAUTY, + [FACILITY_CLASS_SWIMMER_F] = TRAINER_PIC_SWIMMER_F, + [FACILITY_CLASS_PSYCHIC_M] = TRAINER_PIC_PSYCHIC_M, + [FACILITY_CLASS_ROCKER] = TRAINER_PIC_ROCKER, + [FACILITY_CLASS_JUGGLER] = TRAINER_PIC_JUGGLER, + [FACILITY_CLASS_TAMER] = TRAINER_PIC_TAMER, + [FACILITY_CLASS_BIRD_KEEPER] = TRAINER_PIC_BIRD_KEEPER, + [FACILITY_CLASS_BLACK_BELT] = TRAINER_PIC_BLACK_BELT, + [FACILITY_CLASS_RIVAL_EARLY] = TRAINER_PIC_RIVAL_EARLY, + [FACILITY_CLASS_SCIENTIST] = TRAINER_PIC_SCIENTIST, + [FACILITY_CLASS_BOSS] = TRAINER_PIC_LEADER_GIOVANNI, + [FACILITY_CLASS_ROCKET_GRUNT_M] = TRAINER_PIC_ROCKET_GRUNT_M, + [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_PIC_COOLTRAINER_M, + [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_PIC_COOLTRAINER_F, + [FACILITY_CLASS_ELITE_FOUR_LORELEI] = TRAINER_PIC_ELITE_FOUR_LORELEI, + [FACILITY_CLASS_ELITE_FOUR_BRUNO] = TRAINER_PIC_ELITE_FOUR_BRUNO, + [FACILITY_CLASS_LEADER_M] = TRAINER_PIC_LEADER_BROCK, + [FACILITY_CLASS_LEADER_F] = TRAINER_PIC_LEADER_MISTY, + [FACILITY_CLASS_GENTLEMAN] = TRAINER_PIC_GENTLEMAN, + [FACILITY_CLASS_RIVAL_LATE] = TRAINER_PIC_RIVAL_LATE, + [FACILITY_CLASS_CHAMPION_RIVAL] = TRAINER_PIC_CHAMPION_RIVAL, + [FACILITY_CLASS_CHANNELER] = TRAINER_PIC_CHANNELER, + [FACILITY_CLASS_TWINS] = TRAINER_PIC_TWINS, + [FACILITY_CLASS_COOL_COUPLE] = TRAINER_PIC_COOL_COUPLE, + [FACILITY_CLASS_YOUNG_COUPLE] = TRAINER_PIC_YOUNG_COUPLE, + [FACILITY_CLASS_CRUSH_KIN] = TRAINER_PIC_CRUSH_KIN, + [FACILITY_CLASS_SIS_AND_BRO] = TRAINER_PIC_SIS_AND_BRO, + [FACILITY_CLASS_PKMN_PROF] = TRAINER_PIC_PROFESSOR_OAK, + [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_ROCKET_GRUNT_F] = TRAINER_PIC_ROCKET_GRUNT_F, + [FACILITY_CLASS_PSYCHIC_F] = TRAINER_PIC_PSYCHIC_F, + [FACILITY_CLASS_CRUSH_GIRL] = TRAINER_PIC_CRUSH_GIRL, + [FACILITY_CLASS_TUBER] = TRAINER_PIC_TUBER_F, + [FACILITY_CLASS_PKMN_BREEDER] = TRAINER_PIC_POKEMON_BREEDER, + [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_PIC_POKEMON_RANGER_M, + [FACILITY_CLASS_PKMN_RANGER_F] = TRAINER_PIC_POKEMON_RANGER_F, + [FACILITY_CLASS_AROMA_LADY] = TRAINER_PIC_AROMA_LADY, + [FACILITY_CLASS_RUIN_MANIAC] = TRAINER_PIC_RUIN_MANIAC, + [FACILITY_CLASS_LADY] = TRAINER_PIC_LADY, + [FACILITY_CLASS_PAINTER] = TRAINER_PIC_PAINTER, +#ifdef BUGFIX + [FACILITY_CLASS_ELITE_FOUR_AGATHA] = TRAINER_PIC_ELITE_FOUR_AGATHA, + [FACILITY_CLASS_ELITE_FOUR_LANCE] = TRAINER_PIC_ELITE_FOUR_LANCE, +#else + [FACILITY_CLASS_ELITE_FOUR_AGATHA] = TRAINER_PIC_ELITE_FOUR_LORELEI, + [FACILITY_CLASS_ELITE_FOUR_LANCE] = TRAINER_PIC_ELITE_FOUR_BRUNO, +#endif + [FACILITY_CLASS_CHAMPION_RIVAL_2] = TRAINER_PIC_CHAMPION_RIVAL, }; const u8 gFacilityClassToTrainerClass[] = { - [FACILITY_CLASS_AQUA_LEADER] = CLASS_AQUA_LEADER, - [FACILITY_CLASS_TEAM_AQUA] = CLASS_TEAM_AQUA, - [FACILITY_CLASS_TEAM_AQUA_2] = CLASS_TEAM_AQUA, - [FACILITY_CLASS_AROMA_LADY] = CLASS_AROMA_LADY, - [FACILITY_CLASS_RUIN_MANIAC] = CLASS_RUIN_MANIAC, - [FACILITY_CLASS_INTERVIEWER] = CLASS_INTERVIEWER, - [FACILITY_CLASS_TUBER] = CLASS_TUBER, - [FACILITY_CLASS_TUBER_2] = CLASS_TUBER_2, - [FACILITY_CLASS_COOLTRAINER] = CLASS_COOLTRAINER, - [FACILITY_CLASS_COOLTRAINER_2] = CLASS_COOLTRAINER, - [FACILITY_CLASS_HEX_MANIAC] = CLASS_HEX_MANIAC, - [FACILITY_CLASS_LADY] = CLASS_LADY, - [FACILITY_CLASS_BEAUTY] = CLASS_BEAUTY, - [FACILITY_CLASS_RICH_BOY] = CLASS_RICH_BOY, - [FACILITY_CLASS_POKEMANIAC] = CLASS_POKEMANIAC, - [FACILITY_CLASS_SWIMMER_MALE] = CLASS_SWIMMER_MALE, - [FACILITY_CLASS_BLACK_BELT] = CLASS_BLACK_BELT, - [FACILITY_CLASS_GUITARIST] = CLASS_GUITARIST, - [FACILITY_CLASS_KINDLER] = CLASS_KINDLER, - [FACILITY_CLASS_CAMPER] = CLASS_CAMPER, - [FACILITY_CLASS_BUG_MANIAC] = CLASS_BUG_MANIAC, - [FACILITY_CLASS_PSYCHIC] = CLASS_PSYCHIC, - [FACILITY_CLASS_PSYCHIC_2] = CLASS_PSYCHIC, - [FACILITY_CLASS_GENTLEMAN] = CLASS_GENTLEMAN, - [FACILITY_CLASS_ELITE_FOUR] = CLASS_ELITE_FOUR, - [FACILITY_CLASS_ELITE_FOUR_2] = CLASS_ELITE_FOUR, - [FACILITY_CLASS_LEADER] = CLASS_LEADER, - [FACILITY_CLASS_LEADER_2] = CLASS_LEADER, - [FACILITY_CLASS_LEADER_3] = CLASS_LEADER, - [FACILITY_CLASS_SCHOOL_KID] = CLASS_SCHOOL_KID, - [FACILITY_CLASS_SCHOOL_KID_2] = CLASS_SCHOOL_KID, - [FACILITY_CLASS_SR_AND_JR] = CLASS_SR_AND_JR, - [FACILITY_CLASS_POKEFAN] = CLASS_POKEFAN, - [FACILITY_CLASS_POKEFAN_2] = CLASS_POKEFAN, - [FACILITY_CLASS_EXPERT] = CLASS_EXPERT, - [FACILITY_CLASS_EXPERT_2] = CLASS_EXPERT, - [FACILITY_CLASS_YOUNGSTER] = CLASS_YOUNGSTER, - [FACILITY_CLASS_CHAMPION] = CLASS_CHAMPION, - [FACILITY_CLASS_FISHERMAN] = CLASS_FISHERMAN, - [FACILITY_CLASS_TRIATHLETE] = CLASS_TRIATHLETE, - [FACILITY_CLASS_TRIATHLETE_2] = CLASS_TRIATHLETE, - [FACILITY_CLASS_TRIATHLETE_3] = CLASS_TRIATHLETE, - [FACILITY_CLASS_TRIATHLETE_4] = CLASS_TRIATHLETE, - [FACILITY_CLASS_TRIATHLETE_5] = CLASS_TRIATHLETE, - [FACILITY_CLASS_TRIATHLETE_6] = CLASS_TRIATHLETE, - [FACILITY_CLASS_DRAGON_TAMER] = CLASS_DRAGON_TAMER, - [FACILITY_CLASS_BIRD_KEEPER] = CLASS_BIRD_KEEPER, - [FACILITY_CLASS_NINJA_BOY] = CLASS_NINJA_BOY, - [FACILITY_CLASS_BATTLE_GIRL] = CLASS_BATTLE_GIRL, - [FACILITY_CLASS_PARASOL_LADY] = CLASS_PARASOL_LADY, - [FACILITY_CLASS_SWIMMER_FEMALE] = CLASS_SWIMMER_FEMALE, - [FACILITY_CLASS_PICNICKER] = CLASS_PICNICKER, - [FACILITY_CLASS_TWINS] = CLASS_TWINS, - [FACILITY_CLASS_SAILOR] = CLASS_SAILOR, - [FACILITY_CLASS_BOARDER] = CLASS_BOARDER, - [FACILITY_CLASS_BOARDER_2] = CLASS_BOARDER, - [FACILITY_CLASS_COLLECTOR] = CLASS_COLLECTOR, - [FACILITY_CLASS_PKMN_TRAINER] = CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_2] = CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_3] = CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_4] = CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_5] = CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_6] = CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_7] = CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_BREEDER] = CLASS_PKMN_BREEDER, - [FACILITY_CLASS_PKMN_BREEDER_2] = CLASS_PKMN_BREEDER, - [FACILITY_CLASS_PKMN_RANGER] = CLASS_PKMN_RANGER, - [FACILITY_CLASS_PKMN_RANGER_2] = CLASS_PKMN_RANGER, - [FACILITY_CLASS_MAGMA_LEADER] = CLASS_MAGMA_LEADER, - [FACILITY_CLASS_TEAM_MAGMA] = CLASS_TEAM_MAGMA, - [FACILITY_CLASS_TEAM_MAGMA_2] = CLASS_TEAM_MAGMA, - [FACILITY_CLASS_LASS] = CLASS_LASS, - [FACILITY_CLASS_BUG_CATCHER] = CLASS_BUG_CATCHER, - [FACILITY_CLASS_HIKER] = CLASS_HIKER, - [FACILITY_CLASS_YOUNG_COUPLE] = CLASS_YOUNG_COUPLE, - [FACILITY_CLASS_OLD_COUPLE] = CLASS_OLD_COUPLE, - [FACILITY_CLASS_SIS_AND_BRO] = CLASS_SIS_AND_BRO, - [FACILITY_CLASS_AQUA_ADMIN] = CLASS_AQUA_ADMIN, - [FACILITY_CLASS_AQUA_ADMIN_2] = CLASS_AQUA_ADMIN, - [FACILITY_CLASS_MAGMA_ADMIN] = CLASS_MAGMA_ADMIN, - [FACILITY_CLASS_MAGMA_ADMIN_2] = CLASS_MAGMA_ADMIN, - [FACILITY_CLASS_LEADER_4] = CLASS_LEADER, - [FACILITY_CLASS_LEADER_5] = CLASS_LEADER, - [FACILITY_CLASS_LEADER_6] = CLASS_LEADER, - [FACILITY_CLASS_LEADER_7] = CLASS_LEADER, - [FACILITY_CLASS_LEADER_8] = CLASS_LEADER, - [FACILITY_CLASS_ELITE_FOUR_3] = CLASS_ELITE_FOUR, - [FACILITY_CLASS_ELITE_FOUR_4] = CLASS_ELITE_FOUR, - [FACILITY_CLASS_YOUNGSTER_2] = CLASS_YOUNGSTER_2, - [FACILITY_CLASS_BUG_CATCHER_2] = CLASS_BUG_CATCHER_2, - [FACILITY_CLASS_LASS_2] = CLASS_LASS_2, - [FACILITY_CLASS_SAILOR_2] = CLASS_SAILOR_2, - [FACILITY_CLASS_CAMPER_2] = CLASS_CAMPER_2, - [FACILITY_CLASS_PICNICKER_2] = CLASS_PICNICKER_2, - [FACILITY_CLASS_POKEMANIAC_2] = CLASS_POKEMANIAC_2, - [FACILITY_CLASS_SUPER_NERD] = CLASS_SUPER_NERD, - [FACILITY_CLASS_HIKER_2] = CLASS_HIKER_2, - [FACILITY_CLASS_BIKER] = CLASS_BIKER, - [FACILITY_CLASS_BURGLAR] = CLASS_BURGLAR, - [FACILITY_CLASS_ENGINEER] = CLASS_ENGINEER, - [FACILITY_CLASS_FISHERMAN_2] = CLASS_FISHERMAN_2, - [FACILITY_CLASS_SWIMMER_MALE_2] = CLASS_SWIMMER_MALE_2, - [FACILITY_CLASS_CUE_BALL] = CLASS_CUE_BALL, - [FACILITY_CLASS_GAMER] = CLASS_GAMER, - [FACILITY_CLASS_BEAUTY_2] = CLASS_BEAUTY_2, - [FACILITY_CLASS_SWIMMER_FEMALE_2] = CLASS_SWIMMER_FEMALE_2, - [FACILITY_CLASS_PSYCHIC_3] = CLASS_PSYCHIC_2, - [FACILITY_CLASS_ROCKER] = CLASS_ROCKER, - [FACILITY_CLASS_JUGGLER] = CLASS_JUGGLER, - [FACILITY_CLASS_TAMER] = CLASS_TAMER, - [FACILITY_CLASS_BIRD_KEEPER_2] = CLASS_BIRD_KEEPER_2, - [FACILITY_CLASS_BLACK_BELT_2] = CLASS_BLACK_BELT_2, - [FACILITY_CLASS_RIVAL] = CLASS_RIVAL, - [FACILITY_CLASS_SCIENTIST] = CLASS_SCIENTIST, - [FACILITY_CLASS_BOSS] = CLASS_BOSS, - [FACILITY_CLASS_TEAM_ROCKET] = CLASS_TEAM_ROCKET, - [FACILITY_CLASS_COOLTRAINER_3] = CLASS_COOLTRAINER_2, - [FACILITY_CLASS_COOLTRAINER_4] = CLASS_COOLTRAINER_2, - [FACILITY_CLASS_ELITE_FOUR_5] = CLASS_ELITE_FOUR_2, - [FACILITY_CLASS_ELITE_FOUR_6] = CLASS_ELITE_FOUR_2, - [FACILITY_CLASS_LEADER_9] = CLASS_LEADER_2, - [FACILITY_CLASS_LEADER_10] = CLASS_LEADER_2, - [FACILITY_CLASS_GENTLEMAN_2] = CLASS_GENTLEMAN_2, - [FACILITY_CLASS_RIVAL_2] = CLASS_RIVAL_2, - [FACILITY_CLASS_CHAMPION_2] = CLASS_CHAMPION_2, - [FACILITY_CLASS_CHANNELER] = CLASS_CHANNELER, - [FACILITY_CLASS_TWINS_2] = CLASS_TWINS_2, - [FACILITY_CLASS_COOL_COUPLE] = CLASS_COOL_COUPLE, - [FACILITY_CLASS_YOUNG_COUPLE_2] = CLASS_YOUNG_COUPLE_2, - [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_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, - [FACILITY_CLASS_TUBER_3] = CLASS_TUBER_3, - [FACILITY_CLASS_PKMN_BREEDER_3] = CLASS_PKMN_BREEDER_2, - [FACILITY_CLASS_PKMN_RANGER_3] = CLASS_PKMN_RANGER_2, - [FACILITY_CLASS_PKMN_RANGER_4] = CLASS_PKMN_RANGER_2, - [FACILITY_CLASS_AROMA_LADY_2] = CLASS_AROMA_LADY_2, - [FACILITY_CLASS_RUIN_MANIAC_2] = CLASS_RUIN_MANIAC_2, - [FACILITY_CLASS_LADY_2] = CLASS_LADY_2, - [FACILITY_CLASS_PAINTER] = CLASS_PAINTER, - [FACILITY_CLASS_ELITE_FOUR_7] = CLASS_ELITE_FOUR_2, - [FACILITY_CLASS_ELITE_FOUR_8] = CLASS_ELITE_FOUR_2, - [FACILITY_CLASS_CHAMPION_3] = CLASS_CHAMPION_2, + [FACILITY_CLASS_AQUA_LEADER_ARCHIE] = TRAINER_CLASS_AQUA_LEADER, + [FACILITY_CLASS_AQUA_GRUNT_M] = TRAINER_CLASS_TEAM_AQUA, + [FACILITY_CLASS_AQUA_GRUNT_F] = TRAINER_CLASS_TEAM_AQUA, + [FACILITY_CLASS_RS_AROMA_LADY] = TRAINER_CLASS_RS_AROMA_LADY, + [FACILITY_CLASS_RS_RUIN_MANIAC] = TRAINER_CLASS_RS_RUIN_MANIAC, + [FACILITY_CLASS_INTERVIEWER] = TRAINER_CLASS_INTERVIEWER, + [FACILITY_CLASS_RS_TUBER_F] = TRAINER_CLASS_RS_TUBER_F, + [FACILITY_CLASS_RS_TUBER_M] = TRAINER_CLASS_RS_TUBER_M, + [FACILITY_CLASS_RS_COOLTRAINER_M] = TRAINER_CLASS_RS_COOLTRAINER, + [FACILITY_CLASS_RS_COOLTRAINER_F] = TRAINER_CLASS_RS_COOLTRAINER, + [FACILITY_CLASS_HEX_MANIAC] = TRAINER_CLASS_HEX_MANIAC, + [FACILITY_CLASS_RS_LADY] = TRAINER_CLASS_RS_LADY, + [FACILITY_CLASS_RS_BEAUTY] = TRAINER_CLASS_RS_BEAUTY, + [FACILITY_CLASS_RICH_BOY] = TRAINER_CLASS_RICH_BOY, + [FACILITY_CLASS_RS_POKEMANIAC] = TRAINER_CLASS_RS_POKEMANIAC, + [FACILITY_CLASS_RS_SWIMMER_M] = TRAINER_CLASS_RS_SWIMMER_M, + [FACILITY_CLASS_RS_BLACK_BELT] = TRAINER_CLASS_RS_BLACK_BELT, + [FACILITY_CLASS_GUITARIST] = TRAINER_CLASS_GUITARIST, + [FACILITY_CLASS_KINDLER] = TRAINER_CLASS_KINDLER, + [FACILITY_CLASS_RS_CAMPER] = TRAINER_CLASS_RS_CAMPER, + [FACILITY_CLASS_BUG_MANIAC] = TRAINER_CLASS_BUG_MANIAC, + [FACILITY_CLASS_RS_PSYCHIC_M] = TRAINER_CLASS_RS_PSYCHIC, + [FACILITY_CLASS_RS_PSYCHIC_F] = TRAINER_CLASS_RS_PSYCHIC, + [FACILITY_CLASS_RS_GENTLEMAN] = TRAINER_CLASS_RS_GENTLEMAN, + [FACILITY_CLASS_ELITE_FOUR_SIDNEY] = TRAINER_CLASS_RS_ELITE_FOUR, + [FACILITY_CLASS_ELITE_FOUR_PHOEBE] = TRAINER_CLASS_RS_ELITE_FOUR, + [FACILITY_CLASS_LEADER_ROXANNE] = TRAINER_CLASS_RS_LEADER, + [FACILITY_CLASS_LEADER_BRAWLY] = TRAINER_CLASS_RS_LEADER, + [FACILITY_CLASS_LEADER_TATE_AND_LIZA] = TRAINER_CLASS_RS_LEADER, + [FACILITY_CLASS_SCHOOL_KID_M] = TRAINER_CLASS_SCHOOL_KID, + [FACILITY_CLASS_SCHOOL_KID_F] = TRAINER_CLASS_SCHOOL_KID, + [FACILITY_CLASS_SR_AND_JR] = TRAINER_CLASS_SR_AND_JR, + [FACILITY_CLASS_POKEFAN_M] = TRAINER_CLASS_POKEFAN, + [FACILITY_CLASS_POKEFAN_F] = TRAINER_CLASS_POKEFAN, + [FACILITY_CLASS_EXPERT_M] = TRAINER_CLASS_EXPERT, + [FACILITY_CLASS_EXPERT_F] = TRAINER_CLASS_EXPERT, + [FACILITY_CLASS_RS_YOUNGSTER] = TRAINER_CLASS_RS_YOUNGSTER, + [FACILITY_CLASS_CHAMPION_STEVEN] = TRAINER_CLASS_RS_CHAMPION, + [FACILITY_CLASS_RS_FISHERMAN] = TRAINER_CLASS_RS_FISHERMAN, + [FACILITY_CLASS_CYCLING_TRIATHLETE_M] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_CYCLING_TRIATHLETE_F] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_RUNNING_TRIATHLETE_M] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_RUNNING_TRIATHLETE_F] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_SWIMMING_TRIATHLETE_M] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_SWIMMING_TRIATHLETE_F] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_DRAGON_TAMER] = TRAINER_CLASS_DRAGON_TAMER, + [FACILITY_CLASS_RS_BIRD_KEEPER] = TRAINER_CLASS_RS_BIRD_KEEPER, + [FACILITY_CLASS_NINJA_BOY] = TRAINER_CLASS_NINJA_BOY, + [FACILITY_CLASS_BATTLE_GIRL] = TRAINER_CLASS_BATTLE_GIRL, + [FACILITY_CLASS_PARASOL_LADY] = TRAINER_CLASS_PARASOL_LADY, + [FACILITY_CLASS_RS_SWIMMER_F] = TRAINER_CLASS_RS_SWIMMER_F, + [FACILITY_CLASS_RS_PICNICKER] = TRAINER_CLASS_RS_PICNICKER, + [FACILITY_CLASS_RS_TWINS] = TRAINER_CLASS_RS_TWINS, + [FACILITY_CLASS_RS_SAILOR] = TRAINER_CLASS_RS_SAILOR, + [FACILITY_CLASS_BOARDER_M] = TRAINER_CLASS_BOARDER, + [FACILITY_CLASS_BOARDER_F] = TRAINER_CLASS_BOARDER, + [FACILITY_CLASS_COLLECTOR] = TRAINER_CLASS_COLLECTOR, + [FACILITY_CLASS_PKMN_TRAINER_WALLY] = TRAINER_CLASS_PKMN_TRAINER, + [FACILITY_CLASS_PKMN_TRAINER_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER, + [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2] = TRAINER_CLASS_PKMN_TRAINER, + [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3] = TRAINER_CLASS_PKMN_TRAINER, + [FACILITY_CLASS_PKMN_TRAINER_MAY] = TRAINER_CLASS_PKMN_TRAINER, + [FACILITY_CLASS_PKMN_TRAINER_MAY_2] = TRAINER_CLASS_PKMN_TRAINER, + [FACILITY_CLASS_PKMN_TRAINER_MAY_3] = TRAINER_CLASS_PKMN_TRAINER, + [FACILITY_CLASS_RS_PKMN_BREEDER_M] = TRAINER_CLASS_RS_PKMN_BREEDER, + [FACILITY_CLASS_RS_PKMN_BREEDER_F] = TRAINER_CLASS_RS_PKMN_BREEDER, + [FACILITY_CLASS_RS_PKMN_RANGER_M] = TRAINER_CLASS_RS_PKMN_RANGER, + [FACILITY_CLASS_RS_PKMN_RANGER_F] = TRAINER_CLASS_RS_PKMN_RANGER, + [FACILITY_CLASS_MAGMA_LEADER_MAXIE] = TRAINER_CLASS_MAGMA_LEADER, + [FACILITY_CLASS_MAGMA_GRUNT_M] = TRAINER_CLASS_TEAM_MAGMA, + [FACILITY_CLASS_MAGMA_GRUNT_F] = TRAINER_CLASS_TEAM_MAGMA, + [FACILITY_CLASS_RS_LASS] = TRAINER_CLASS_RS_LASS, + [FACILITY_CLASS_RS_BUG_CATCHER] = TRAINER_CLASS_RS_BUG_CATCHER, + [FACILITY_CLASS_RS_HIKER] = TRAINER_CLASS_RS_HIKER, + [FACILITY_CLASS_RS_YOUNG_COUPLE] = TRAINER_CLASS_RS_YOUNG_COUPLE, + [FACILITY_CLASS_OLD_COUPLE] = TRAINER_CLASS_OLD_COUPLE, + [FACILITY_CLASS_RS_SIS_AND_BRO] = TRAINER_CLASS_RS_SIS_AND_BRO, + [FACILITY_CLASS_AQUA_ADMIN_M] = TRAINER_CLASS_AQUA_ADMIN, + [FACILITY_CLASS_AQUA_ADMIN_F] = TRAINER_CLASS_AQUA_ADMIN, + [FACILITY_CLASS_MAGMA_ADMIN_M] = TRAINER_CLASS_MAGMA_ADMIN, + [FACILITY_CLASS_MAGMA_ADMIN_F] = TRAINER_CLASS_MAGMA_ADMIN, + [FACILITY_CLASS_LEADER_WATTSON] = TRAINER_CLASS_RS_LEADER, + [FACILITY_CLASS_LEADER_FLANNERY] = TRAINER_CLASS_RS_LEADER, + [FACILITY_CLASS_LEADER_NORMAN] = TRAINER_CLASS_RS_LEADER, + [FACILITY_CLASS_LEADER_WINONA] = TRAINER_CLASS_RS_LEADER, + [FACILITY_CLASS_LEADER_WALLACE] = TRAINER_CLASS_RS_LEADER, + [FACILITY_CLASS_ELITE_FOUR_GLACIA] = TRAINER_CLASS_RS_ELITE_FOUR, + [FACILITY_CLASS_ELITE_FOUR_DRAKE] = TRAINER_CLASS_RS_ELITE_FOUR, + [FACILITY_CLASS_YOUNGSTER] = TRAINER_CLASS_YOUNGSTER, + [FACILITY_CLASS_BUG_CATCHER] = TRAINER_CLASS_BUG_CATCHER, + [FACILITY_CLASS_LASS] = TRAINER_CLASS_LASS, + [FACILITY_CLASS_SAILOR] = TRAINER_CLASS_SAILOR, + [FACILITY_CLASS_CAMPER] = TRAINER_CLASS_CAMPER, + [FACILITY_CLASS_PICNICKER] = TRAINER_CLASS_PICNICKER, + [FACILITY_CLASS_POKEMANIAC] = TRAINER_CLASS_POKEMANIAC, + [FACILITY_CLASS_SUPER_NERD] = TRAINER_CLASS_SUPER_NERD, + [FACILITY_CLASS_HIKER] = TRAINER_CLASS_HIKER, + [FACILITY_CLASS_BIKER] = TRAINER_CLASS_BIKER, + [FACILITY_CLASS_BURGLAR] = TRAINER_CLASS_BURGLAR, + [FACILITY_CLASS_ENGINEER] = TRAINER_CLASS_ENGINEER, + [FACILITY_CLASS_FISHERMAN] = TRAINER_CLASS_FISHERMAN, + [FACILITY_CLASS_SWIMMER_M] = TRAINER_CLASS_SWIMMER_M, + [FACILITY_CLASS_CUE_BALL] = TRAINER_CLASS_CUE_BALL, + [FACILITY_CLASS_GAMER] = TRAINER_CLASS_GAMER, + [FACILITY_CLASS_BEAUTY] = TRAINER_CLASS_BEAUTY, + [FACILITY_CLASS_SWIMMER_F] = TRAINER_CLASS_SWIMMER_F, + [FACILITY_CLASS_PSYCHIC_M] = TRAINER_CLASS_PSYCHIC, + [FACILITY_CLASS_ROCKER] = TRAINER_CLASS_ROCKER, + [FACILITY_CLASS_JUGGLER] = TRAINER_CLASS_JUGGLER, + [FACILITY_CLASS_TAMER] = TRAINER_CLASS_TAMER, + [FACILITY_CLASS_BIRD_KEEPER] = TRAINER_CLASS_BIRD_KEEPER, + [FACILITY_CLASS_BLACK_BELT] = TRAINER_CLASS_BLACK_BELT, + [FACILITY_CLASS_RIVAL_EARLY] = TRAINER_CLASS_RIVAL_EARLY, + [FACILITY_CLASS_SCIENTIST] = TRAINER_CLASS_SCIENTIST, + [FACILITY_CLASS_BOSS] = TRAINER_CLASS_BOSS, + [FACILITY_CLASS_ROCKET_GRUNT_M] = TRAINER_CLASS_TEAM_ROCKET, + [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_CLASS_COOLTRAINER, + [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_CLASS_COOLTRAINER, + [FACILITY_CLASS_ELITE_FOUR_LORELEI] = TRAINER_CLASS_ELITE_FOUR, + [FACILITY_CLASS_ELITE_FOUR_BRUNO] = TRAINER_CLASS_ELITE_FOUR, + [FACILITY_CLASS_LEADER_M] = TRAINER_CLASS_LEADER, + [FACILITY_CLASS_LEADER_F] = TRAINER_CLASS_LEADER, + [FACILITY_CLASS_GENTLEMAN] = TRAINER_CLASS_GENTLEMAN, + [FACILITY_CLASS_RIVAL_LATE] = TRAINER_CLASS_RIVAL_LATE, + [FACILITY_CLASS_CHAMPION_RIVAL] = TRAINER_CLASS_CHAMPION, + [FACILITY_CLASS_CHANNELER] = TRAINER_CLASS_CHANNELER, + [FACILITY_CLASS_TWINS] = TRAINER_CLASS_TWINS, + [FACILITY_CLASS_COOL_COUPLE] = TRAINER_CLASS_COOL_COUPLE, + [FACILITY_CLASS_YOUNG_COUPLE] = TRAINER_CLASS_YOUNG_COUPLE, + [FACILITY_CLASS_CRUSH_KIN] = TRAINER_CLASS_CRUSH_KIN, + [FACILITY_CLASS_SIS_AND_BRO] = TRAINER_CLASS_SIS_AND_BRO, + [FACILITY_CLASS_PKMN_PROF] = TRAINER_CLASS_PKMN_PROF, + [FACILITY_CLASS_BRENDAN] = TRAINER_CLASS_PLAYER, + [FACILITY_CLASS_MAY] = TRAINER_CLASS_PLAYER, + [FACILITY_CLASS_RED] = TRAINER_CLASS_PLAYER, + [FACILITY_CLASS_LEAF] = TRAINER_CLASS_PLAYER, + [FACILITY_CLASS_ROCKET_GRUNT_F] = TRAINER_CLASS_TEAM_ROCKET, + [FACILITY_CLASS_PSYCHIC_F] = TRAINER_CLASS_PSYCHIC, + [FACILITY_CLASS_CRUSH_GIRL] = TRAINER_CLASS_CRUSH_GIRL, + [FACILITY_CLASS_TUBER] = TRAINER_CLASS_TUBER, + [FACILITY_CLASS_PKMN_BREEDER] = TRAINER_CLASS_PKMN_BREEDER, + [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_CLASS_PKMN_RANGER, + [FACILITY_CLASS_PKMN_RANGER_F] = TRAINER_CLASS_PKMN_RANGER, + [FACILITY_CLASS_AROMA_LADY] = TRAINER_CLASS_AROMA_LADY, + [FACILITY_CLASS_RUIN_MANIAC] = TRAINER_CLASS_RUIN_MANIAC, + [FACILITY_CLASS_LADY] = TRAINER_CLASS_LADY, + [FACILITY_CLASS_PAINTER] = TRAINER_CLASS_PAINTER, + [FACILITY_CLASS_ELITE_FOUR_AGATHA] = TRAINER_CLASS_ELITE_FOUR, + [FACILITY_CLASS_ELITE_FOUR_LANCE] = TRAINER_CLASS_ELITE_FOUR, + [FACILITY_CLASS_CHAMPION_RIVAL_2] = TRAINER_CLASS_CHAMPION, }; diff --git a/src/data/text/trainer_class_names.h b/src/data/text/trainer_class_names.h index 4faae43f4..cedb48b89 100644 --- a/src/data/text/trainer_class_names.h +++ b/src/data/text/trainer_class_names.h @@ -1,109 +1,109 @@ const u8 gTrainerClassNames[][13] = { - _("{PKMN} TRAINER"), - _("{PKMN} TRAINER"), - _("AQUA LEADER"), - _("TEAM AQUA"), - _("AROMA LADY"), - _("RUIN MANIAC"), - _("INTERVIEWER"), - _("TUBER"), - _("TUBER"), - _("COOLTRAINER"), - _("HEX MANIAC"), - _("LADY"), - _("BEAUTY"), - _("RICH BOY"), - _("POKéMANIAC"), - _("SWIMMER♂"), - _("BLACK BELT"), - _("GUITARIST"), - _("KINDLER"), - _("CAMPER"), - _("BUG MANIAC"), - _("PSYCHIC"), - _("GENTLEMAN"), - _("ELITE FOUR"), - _("LEADER"), - _("SCHOOL KID"), - _("SR. AND JR."), - _("POKéFAN"), - _("EXPERT"), - _("YOUNGSTER"), - _("CHAMPION"), - _("FISHERMAN"), - _("TRIATHLETE"), - _("DRAGON TAMER"), - _("BIRD KEEPER"), - _("NINJA BOY"), - _("BATTLE GIRL"), - _("PARASOL LADY"), - _("SWIMMER♀"), - _("PICNICKER"), - _("TWINS"), - _("SAILOR"), - _("BOARDER"), - _("COLLECTOR"), - _("{PKMN} TRAINER"), - _("{PKMN} BREEDER"), - _("{PKMN} RANGER"), - _("MAGMA LEADER"), - _("TEAM MAGMA"), - _("LASS"), - _("BUG CATCHER"), - _("HIKER"), - _("YOUNG COUPLE"), - _("OLD COUPLE"), - _("SIS AND BRO"), - _("AQUA ADMIN"), - _("MAGMA ADMIN"), - _("YOUNGSTER"), - _("BUG CATCHER"), - _("LASS"), - _("SAILOR"), - _("CAMPER"), - _("PICNICKER"), - _("POKéMANIAC"), - _("SUPER NERD"), - _("HIKER"), - _("BIKER"), - _("BURGLAR"), - _("ENGINEER"), - _("FISHERMAN"), - _("SWIMMER♂"), - _("CUE BALL"), - _("GAMER"), - _("BEAUTY"), - _("SWIMMER♀"), - _("PSYCHIC"), - _("ROCKER"), - _("JUGGLER"), - _("TAMER"), - _("BIRD KEEPER"), - _("BLACK BELT"), - _("RIVAL"), - _("SCIENTIST"), - _("BOSS"), - _("LEADER"), - _("TEAM ROCKET"), - _("COOLTRAINER"), - _("ELITE FOUR"), - _("GENTLEMAN"), - _("RIVAL"), - _("CHAMPION"), - _("CHANNELER"), - _("TWINS"), - _("COOL COUPLE"), - _("YOUNG COUPLE"), - _("CRUSH KIN"), - _("SIS AND BRO"), - _("{PKMN} PROF."), - _("PLAYER"), - _("CRUSH GIRL"), - _("TUBER"), - _("{PKMN} BREEDER"), - _("{PKMN} RANGER"), - _("AROMA LADY"), - _("RUIN MANIAC"), - _("LADY"), - _("PAINTER"), + [TRAINER_CLASS_NONE] = _("{PKMN} TRAINER"), + [TRAINER_CLASS_PKMN_TRAINER_UNUSED] = _("{PKMN} TRAINER"), + [TRAINER_CLASS_AQUA_LEADER] = _("AQUA LEADER"), + [TRAINER_CLASS_TEAM_AQUA] = _("TEAM AQUA"), + [TRAINER_CLASS_RS_AROMA_LADY] = _("AROMA LADY"), + [TRAINER_CLASS_RS_RUIN_MANIAC] = _("RUIN MANIAC"), + [TRAINER_CLASS_INTERVIEWER] = _("INTERVIEWER"), + [TRAINER_CLASS_RS_TUBER_F] = _("TUBER"), + [TRAINER_CLASS_RS_TUBER_M] = _("TUBER"), + [TRAINER_CLASS_RS_COOLTRAINER] = _("COOLTRAINER"), + [TRAINER_CLASS_HEX_MANIAC] = _("HEX MANIAC"), + [TRAINER_CLASS_RS_LADY] = _("LADY"), + [TRAINER_CLASS_RS_BEAUTY] = _("BEAUTY"), + [TRAINER_CLASS_RICH_BOY] = _("RICH BOY"), + [TRAINER_CLASS_RS_POKEMANIAC] = _("POKéMANIAC"), + [TRAINER_CLASS_RS_SWIMMER_M] = _("SWIMMER♂"), + [TRAINER_CLASS_RS_BLACK_BELT] = _("BLACK BELT"), + [TRAINER_CLASS_GUITARIST] = _("GUITARIST"), + [TRAINER_CLASS_KINDLER] = _("KINDLER"), + [TRAINER_CLASS_RS_CAMPER] = _("CAMPER"), + [TRAINER_CLASS_BUG_MANIAC] = _("BUG MANIAC"), + [TRAINER_CLASS_RS_PSYCHIC] = _("PSYCHIC"), + [TRAINER_CLASS_RS_GENTLEMAN] = _("GENTLEMAN"), + [TRAINER_CLASS_RS_ELITE_FOUR] = _("ELITE FOUR"), + [TRAINER_CLASS_RS_LEADER] = _("LEADER"), + [TRAINER_CLASS_SCHOOL_KID] = _("SCHOOL KID"), + [TRAINER_CLASS_SR_AND_JR] = _("SR. AND JR."), + [TRAINER_CLASS_POKEFAN] = _("POKéFAN"), + [TRAINER_CLASS_EXPERT] = _("EXPERT"), + [TRAINER_CLASS_RS_YOUNGSTER] = _("YOUNGSTER"), + [TRAINER_CLASS_RS_CHAMPION] = _("CHAMPION"), + [TRAINER_CLASS_RS_FISHERMAN] = _("FISHERMAN"), + [TRAINER_CLASS_TRIATHLETE] = _("TRIATHLETE"), + [TRAINER_CLASS_DRAGON_TAMER] = _("DRAGON TAMER"), + [TRAINER_CLASS_RS_BIRD_KEEPER] = _("BIRD KEEPER"), + [TRAINER_CLASS_NINJA_BOY] = _("NINJA BOY"), + [TRAINER_CLASS_BATTLE_GIRL] = _("BATTLE GIRL"), + [TRAINER_CLASS_PARASOL_LADY] = _("PARASOL LADY"), + [TRAINER_CLASS_RS_SWIMMER_F] = _("SWIMMER♀"), + [TRAINER_CLASS_RS_PICNICKER] = _("PICNICKER"), + [TRAINER_CLASS_RS_TWINS] = _("TWINS"), + [TRAINER_CLASS_RS_SAILOR] = _("SAILOR"), + [TRAINER_CLASS_BOARDER] = _("BOARDER"), + [TRAINER_CLASS_COLLECTOR] = _("COLLECTOR"), + [TRAINER_CLASS_PKMN_TRAINER] = _("{PKMN} TRAINER"), + [TRAINER_CLASS_RS_PKMN_BREEDER] = _("{PKMN} BREEDER"), + [TRAINER_CLASS_RS_PKMN_RANGER] = _("{PKMN} RANGER"), + [TRAINER_CLASS_MAGMA_LEADER] = _("MAGMA LEADER"), + [TRAINER_CLASS_TEAM_MAGMA] = _("TEAM MAGMA"), + [TRAINER_CLASS_RS_LASS] = _("LASS"), + [TRAINER_CLASS_RS_BUG_CATCHER] = _("BUG CATCHER"), + [TRAINER_CLASS_RS_HIKER] = _("HIKER"), + [TRAINER_CLASS_RS_YOUNG_COUPLE] = _("YOUNG COUPLE"), + [TRAINER_CLASS_OLD_COUPLE] = _("OLD COUPLE"), + [TRAINER_CLASS_RS_SIS_AND_BRO] = _("SIS AND BRO"), + [TRAINER_CLASS_AQUA_ADMIN] = _("AQUA ADMIN"), + [TRAINER_CLASS_MAGMA_ADMIN] = _("MAGMA ADMIN"), + [TRAINER_CLASS_YOUNGSTER] = _("YOUNGSTER"), + [TRAINER_CLASS_BUG_CATCHER] = _("BUG CATCHER"), + [TRAINER_CLASS_LASS] = _("LASS"), + [TRAINER_CLASS_SAILOR] = _("SAILOR"), + [TRAINER_CLASS_CAMPER] = _("CAMPER"), + [TRAINER_CLASS_PICNICKER] = _("PICNICKER"), + [TRAINER_CLASS_POKEMANIAC] = _("POKéMANIAC"), + [TRAINER_CLASS_SUPER_NERD] = _("SUPER NERD"), + [TRAINER_CLASS_HIKER] = _("HIKER"), + [TRAINER_CLASS_BIKER] = _("BIKER"), + [TRAINER_CLASS_BURGLAR] = _("BURGLAR"), + [TRAINER_CLASS_ENGINEER] = _("ENGINEER"), + [TRAINER_CLASS_FISHERMAN] = _("FISHERMAN"), + [TRAINER_CLASS_SWIMMER_M] = _("SWIMMER♂"), + [TRAINER_CLASS_CUE_BALL] = _("CUE BALL"), + [TRAINER_CLASS_GAMER] = _("GAMER"), + [TRAINER_CLASS_BEAUTY] = _("BEAUTY"), + [TRAINER_CLASS_SWIMMER_F] = _("SWIMMER♀"), + [TRAINER_CLASS_PSYCHIC] = _("PSYCHIC"), + [TRAINER_CLASS_ROCKER] = _("ROCKER"), + [TRAINER_CLASS_JUGGLER] = _("JUGGLER"), + [TRAINER_CLASS_TAMER] = _("TAMER"), + [TRAINER_CLASS_BIRD_KEEPER] = _("BIRD KEEPER"), + [TRAINER_CLASS_BLACK_BELT] = _("BLACK BELT"), + [TRAINER_CLASS_RIVAL_EARLY] = _("RIVAL"), + [TRAINER_CLASS_SCIENTIST] = _("SCIENTIST"), + [TRAINER_CLASS_BOSS] = _("BOSS"), + [TRAINER_CLASS_LEADER] = _("LEADER"), + [TRAINER_CLASS_TEAM_ROCKET] = _("TEAM ROCKET"), + [TRAINER_CLASS_COOLTRAINER] = _("COOLTRAINER"), + [TRAINER_CLASS_ELITE_FOUR] = _("ELITE FOUR"), + [TRAINER_CLASS_GENTLEMAN] = _("GENTLEMAN"), + [TRAINER_CLASS_RIVAL_LATE] = _("RIVAL"), + [TRAINER_CLASS_CHAMPION] = _("CHAMPION"), + [TRAINER_CLASS_CHANNELER] = _("CHANNELER"), + [TRAINER_CLASS_TWINS] = _("TWINS"), + [TRAINER_CLASS_COOL_COUPLE] = _("COOL COUPLE"), + [TRAINER_CLASS_YOUNG_COUPLE] = _("YOUNG COUPLE"), + [TRAINER_CLASS_CRUSH_KIN] = _("CRUSH KIN"), + [TRAINER_CLASS_SIS_AND_BRO] = _("SIS AND BRO"), + [TRAINER_CLASS_PKMN_PROF] = _("{PKMN} PROF."), + [TRAINER_CLASS_PLAYER] = _("PLAYER"), + [TRAINER_CLASS_CRUSH_GIRL] = _("CRUSH GIRL"), + [TRAINER_CLASS_TUBER] = _("TUBER"), + [TRAINER_CLASS_PKMN_BREEDER] = _("{PKMN} BREEDER"), + [TRAINER_CLASS_PKMN_RANGER] = _("{PKMN} RANGER"), + [TRAINER_CLASS_AROMA_LADY] = _("AROMA LADY"), + [TRAINER_CLASS_RUIN_MANIAC] = _("RUIN MANIAC"), + [TRAINER_CLASS_LADY] = _("LADY"), + [TRAINER_CLASS_PAINTER] = _("PAINTER"), }; diff --git a/src/data/trainer_graphics/front_pic_tables.h b/src/data/trainer_graphics/front_pic_tables.h index 9d94103ef..c2ad6ac9e 100644 --- a/src/data/trainer_graphics/front_pic_tables.h +++ b/src/data/trainer_graphics/front_pic_tables.h @@ -159,7 +159,7 @@ const struct CompressedSpriteSheet gTrainerFrontPicTable[] = TRAINER_SPRITE(RS_RUIN_MANIAC, gTrainerFrontPic_RSRuinManiac, 0x800), TRAINER_SPRITE(INTERVIEWER, gTrainerFrontPic_Interviewer, 0x800), TRAINER_SPRITE(RS_TUBER_F, gTrainerFrontPic_RSTuberF, 0x800), - TRAINER_SPRITE(TUBER_M, gTrainerFrontPic_TuberM, 0x800), + TRAINER_SPRITE(RS_TUBER_M, gTrainerFrontPic_TuberM, 0x800), TRAINER_SPRITE(RS_COOLTRAINER_M, gTrainerFrontPic_RSCooltrainerM, 0x800), TRAINER_SPRITE(RS_COOLTRAINER_F, gTrainerFrontPic_RSCooltrainerF, 0x800), TRAINER_SPRITE(HEX_MANIAC, gTrainerFrontPic_HexManiac, 0x800), @@ -210,7 +210,7 @@ const struct CompressedSpriteSheet gTrainerFrontPicTable[] = TRAINER_SPRITE(WALLY, gTrainerFrontPic_Wally, 0x800), TRAINER_SPRITE(RS_BRENDAN_1, gTrainerFrontPic_RSBrendan1, 0x800), TRAINER_SPRITE(RS_MAY_1, gTrainerFrontPic_RSMay1, 0x800), - TRAINER_SPRITE(POKEMON_BREEDER_M, gTrainerFrontPic_PokemonBreederM, 0x800), + TRAINER_SPRITE(RS_POKEMON_BREEDER_M, gTrainerFrontPic_RSPokemonBreederM, 0x800), TRAINER_SPRITE(RS_POKEMON_BREEDER_F, gTrainerFrontPic_RSPokemonBreederF, 0x800), TRAINER_SPRITE(RS_POKEMON_RANGER_M, gTrainerFrontPic_RSPokemonRangerM, 0x800), TRAINER_SPRITE(RS_POKEMON_RANGER_F, gTrainerFrontPic_RSPokemonRangerF, 0x800), @@ -258,7 +258,7 @@ const struct CompressedSpriteSheet gTrainerFrontPicTable[] = TRAINER_SPRITE(TAMER, gTrainerFrontPic_Tamer, 0x800), TRAINER_SPRITE(BIRD_KEEPER, gTrainerFrontPic_BirdKeeper, 0x800), TRAINER_SPRITE(BLACK_BELT, gTrainerFrontPic_BlackBelt, 0x800), - TRAINER_SPRITE(RIVAL_1, gTrainerFrontPic_Rival1, 0x800), + TRAINER_SPRITE(RIVAL_EARLY, gTrainerFrontPic_RivalEarly, 0x800), TRAINER_SPRITE(SCIENTIST, gTrainerFrontPic_Scientist, 0x800), TRAINER_SPRITE(LEADER_GIOVANNI, gTrainerFrontPic_LeaderGiovanni, 0x800), TRAINER_SPRITE(ROCKET_GRUNT_M, gTrainerFrontPic_RocketGruntM, 0x800), @@ -276,7 +276,7 @@ const struct CompressedSpriteSheet gTrainerFrontPicTable[] = TRAINER_SPRITE(LEADER_BLAINE, gTrainerFrontPic_LeaderBlaine, 0x800), TRAINER_SPRITE(LEADER_SABRINA, gTrainerFrontPic_LeaderSabrina, 0x800), TRAINER_SPRITE(GENTLEMAN, gTrainerFrontPic_Gentleman, 0x800), - TRAINER_SPRITE(RIVAL_2, gTrainerFrontPic_Rival2, 0x800), + TRAINER_SPRITE(RIVAL_LATE, gTrainerFrontPic_RivalLate, 0x800), TRAINER_SPRITE(CHAMPION_RIVAL, gTrainerFrontPic_ChampionRival, 0x800), TRAINER_SPRITE(CHANNELER, gTrainerFrontPic_Channeler, 0x800), TRAINER_SPRITE(TWINS, gTrainerFrontPic_Twins, 0x800), @@ -293,7 +293,7 @@ const struct CompressedSpriteSheet gTrainerFrontPicTable[] = TRAINER_SPRITE(PSYCHIC_F, gTrainerFrontPic_PsychicF, 0x800), TRAINER_SPRITE(CRUSH_GIRL, gTrainerFrontPic_CrushGirl, 0x800), TRAINER_SPRITE(TUBER_F, gTrainerFrontPic_TuberF, 0x800), - TRAINER_SPRITE(POKEMON_BREEDER_F, gTrainerFrontPic_PokemonBreederF, 0x800), + TRAINER_SPRITE(POKEMON_BREEDER, gTrainerFrontPic_PokemonBreeder, 0x800), TRAINER_SPRITE(POKEMON_RANGER_M, gTrainerFrontPic_PokemonRangerM, 0x800), TRAINER_SPRITE(POKEMON_RANGER_F, gTrainerFrontPic_PokemonRangerF, 0x800), TRAINER_SPRITE(AROMA_LADY, gTrainerFrontPic_AromaLady, 0x800), @@ -311,7 +311,7 @@ const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] = TRAINER_PAL(RS_RUIN_MANIAC, gTrainerPalette_RSRuinManiac), TRAINER_PAL(INTERVIEWER, gTrainerPalette_Interviewer), TRAINER_PAL(RS_TUBER_F, gTrainerPalette_RSTuberF), - TRAINER_PAL(TUBER_M, gTrainerPalette_TuberM), + TRAINER_PAL(RS_TUBER_M, gTrainerPalette_TuberM), TRAINER_PAL(RS_COOLTRAINER_M, gTrainerPalette_RSCooltrainerM), TRAINER_PAL(RS_COOLTRAINER_F, gTrainerPalette_RSCooltrainerF), TRAINER_PAL(HEX_MANIAC, gTrainerPalette_HexManiac), @@ -362,7 +362,7 @@ const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] = TRAINER_PAL(WALLY, gTrainerPalette_Wally), TRAINER_PAL(RS_BRENDAN_1, gTrainerPalette_RSBrendan1), TRAINER_PAL(RS_MAY_1, gTrainerPalette_RSMay1), - TRAINER_PAL(POKEMON_BREEDER_M, gTrainerPalette_PokemonBreederM), + TRAINER_PAL(RS_POKEMON_BREEDER_M, gTrainerPalette_RSPokemonBreederM), TRAINER_PAL(RS_POKEMON_BREEDER_F, gTrainerPalette_RSPokemonBreederF), TRAINER_PAL(RS_POKEMON_RANGER_M, gTrainerPalette_RSPokemonRangerM), TRAINER_PAL(RS_POKEMON_RANGER_F, gTrainerPalette_RSPokemonRangerF), @@ -410,7 +410,7 @@ const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] = TRAINER_PAL(TAMER, gTrainerPalette_Tamer), TRAINER_PAL(BIRD_KEEPER, gTrainerPalette_BirdKeeper), TRAINER_PAL(BLACK_BELT, gTrainerPalette_BlackBelt), - TRAINER_PAL(RIVAL_1, gTrainerPalette_Rival1), + TRAINER_PAL(RIVAL_EARLY, gTrainerPalette_RivalEarly), TRAINER_PAL(SCIENTIST, gTrainerPalette_Scientist), TRAINER_PAL(LEADER_GIOVANNI, gTrainerPalette_LeaderGiovanni), TRAINER_PAL(ROCKET_GRUNT_M, gTrainerPalette_RocketGruntM), @@ -428,7 +428,7 @@ const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] = TRAINER_PAL(LEADER_BLAINE, gTrainerPalette_LeaderBlaine), TRAINER_PAL(LEADER_SABRINA, gTrainerPalette_LeaderSabrina), TRAINER_PAL(GENTLEMAN, gTrainerPalette_Gentleman), - TRAINER_PAL(RIVAL_2, gTrainerPalette_Rival2), + TRAINER_PAL(RIVAL_LATE, gTrainerPalette_RivalLate), TRAINER_PAL(CHAMPION_RIVAL, gTrainerPalette_ChampionRival), TRAINER_PAL(CHANNELER, gTrainerPalette_Channeler), TRAINER_PAL(TWINS, gTrainerPalette_Twins), @@ -445,7 +445,7 @@ const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] = TRAINER_PAL(PSYCHIC_F, gTrainerPalette_PsychicF), TRAINER_PAL(CRUSH_GIRL, gTrainerPalette_CrushGirl), TRAINER_PAL(TUBER_F, gTrainerPalette_TuberF), - TRAINER_PAL(POKEMON_BREEDER_F, gTrainerPalette_PokemonBreederF), + TRAINER_PAL(POKEMON_BREEDER, gTrainerPalette_PokemonBreeder), TRAINER_PAL(POKEMON_RANGER_M, gTrainerPalette_PokemonRangerM), TRAINER_PAL(POKEMON_RANGER_F, gTrainerPalette_PokemonRangerF), TRAINER_PAL(AROMA_LADY, gTrainerPalette_AromaLady), diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index e89a73d4b..f899fb9d3 100644 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -1,713 +1,117 @@ -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_AquaLeader1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamAqua1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamAqua2[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_AromaLady1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RuinManiac1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Interviewer1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Tuber1[] = { - { - .iv = 0, - .lvl = 38, - .species = SPECIES_STARMIE, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Tuber2[] = { - { - .iv = 0, - .lvl = 38, - .species = SPECIES_STARMIE, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Cooltrainer1[] = { - { - .iv = 100, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Cooltrainer2[] = { - { - .iv = 100, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HexManiac1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Lady1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Beauty1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RichBoy1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Pokemaniac1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMale1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BlackBelt1[] = { - { - .iv = 100, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Guitarist1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Kindler1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Camper1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugManiac1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Psychic1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Psychic2[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Gentleman1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_EliteFourSidney[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_EliteFourPhoebe[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LeaderRoxanne[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LeaderBrawly[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LeaderTateLiza[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SchoolKid1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SchoolKid2[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SrAndJr1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Pokefan1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Pokefan2[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Expert1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Expert2[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Youngster1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Champion1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Fisherman1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Triathlete1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Triathlete2[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Triathlete3[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Triathlete4[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Triathlete5[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Triathlete6[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_DragonTamer1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeper1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_NinjaBoy1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BattleGirl1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ParasolLady1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemale1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Picnicker1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Twins1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Sailor1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Boarder1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Boarder2[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Collector1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnTrainer2[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnTrainer3[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnTrainer4[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnTrainer5[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnTrainer6[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnTrainer7[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnTrainer8[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnBreeder1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnBreeder2[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnRanger1[] = { - { - .iv = 100, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnRanger2[] = { - { - .iv = 100, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_MagmaLeader1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamMagma1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamMagma2[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Lass1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcher1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Hiker1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungCouple1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_OldCouple1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SisAndBro1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_AquaAdminMatt[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_AquaAdminShelly[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_MagmaAdminTabitha[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_MagmaAdminCourtney[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LeaderWattson[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LeaderFlannery[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LeaderNorman[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LeaderWinona[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LeaderWallace[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_EliteFourGlacia[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_EliteFourDrake[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterBen[] = { +// Trainer party data exists for all of the RS trainer classes, but +// are only filled with one of the following placeholder pokemon. +// The actual FRLG trainer party data starts after these. +#define DUMMY_TRAINER_MON \ + { \ + .lvl = 5, \ + .species = SPECIES_EKANS, \ + } + +#define DUMMY_TRAINER_MON_IV \ + { \ + .iv = 100, \ + .lvl = 5, \ + .species = SPECIES_EKANS, \ + } + +// Copy of Swimmer Male Finn's party +#define DUMMY_TRAINER_STARMIE \ + { \ + .lvl = 38, \ + .species = SPECIES_STARMIE, \ + } + +static const struct TrainerMonNoItemDefaultMoves sParty_AquaLeader[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_AquaGruntM[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_AquaGruntF[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSAromaLady[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSRuinManiac[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_Interviewer[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSTuberF[] = {DUMMY_TRAINER_STARMIE}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSTuberM[] = {DUMMY_TRAINER_STARMIE}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSCooltrainerM[] = {DUMMY_TRAINER_MON_IV}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSCooltrainerF[] = {DUMMY_TRAINER_MON_IV}; +static const struct TrainerMonNoItemDefaultMoves sParty_HexManiac[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSLady[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSBeauty[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RichBoy[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSPokemaniac[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSSwimmerM[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSBlackBelt[] = {DUMMY_TRAINER_MON_IV}; +static const struct TrainerMonNoItemDefaultMoves sParty_Guitarist[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_Kindler[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSCamper[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_BugManiac[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSPsychicM[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSPsychicF[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSGentleman[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_EliteFourSidney[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_EliteFourPhoebe[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_LeaderRoxanne[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_LeaderBrawly[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_LeaderTateLiza[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_SchoolKidM[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_SchoolKidF[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_SrAndJr[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_PokefanM[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_PokefanF[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_ExpertM[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_ExpertF[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSYoungster[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSChampion[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSFisherman[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_CyclingTriathleteM[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_CyclingTriathleteF[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RunningTriathleteM[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RunningTriathleteF[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmingTriathleteM[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmingTriathleteF[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_DragonTamer[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSBirdKeeper[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_NinjaBoy[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_BattleGirl[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_ParasolLady[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSSwimmerF[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSPicnicker[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSTwins[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSSailor[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_BoarderM[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_BoarderF[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_Collector[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_Wally[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_Brendan[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_Brendan2[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_Brendan3[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_May[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_May2[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_May3[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSPkmnBreederM[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSPkmnBreederF[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSPkmnRangerM[] = {DUMMY_TRAINER_MON_IV}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSPkmnRangerF[] = {DUMMY_TRAINER_MON_IV}; +static const struct TrainerMonNoItemDefaultMoves sParty_MagmaLeader[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_MagmaGruntM[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_MagmaGruntF[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSLass[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSBugCatcher[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSHiker[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSYoungCouple[] = {DUMMY_TRAINER_MON, DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_OldCouple[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_RSSisAndBro[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_AquaAdminMatt[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_AquaAdminShelly[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_MagmaAdminTabitha[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_MagmaAdminCourtney[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_LeaderWattson[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_LeaderFlannery[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_LeaderNorman[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_LeaderWinona[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_LeaderWallace[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_EliteFourGlacia[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_EliteFourDrake[] = {DUMMY_TRAINER_MON}; + +// Start of actual trainer data +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterBen[] = { { .iv = 0, .lvl = 11, @@ -720,7 +124,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterBen[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterCalvin[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterCalvin[] = { { .iv = 0, .lvl = 14, @@ -728,7 +132,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterCalvin[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterJosh[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterJosh[] = { { .iv = 0, .lvl = 10, @@ -746,7 +150,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterJosh[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterTimmy[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterTimmy[] = { { .iv = 0, .lvl = 14, @@ -759,7 +163,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterTimmy[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterJoey[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterJoey[] = { { .iv = 0, .lvl = 15, @@ -772,7 +176,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterJoey[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterDan[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterDan[] = { { .iv = 0, .lvl = 17, @@ -780,7 +184,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterDan[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterChad[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterChad[] = { { .iv = 0, .lvl = 14, @@ -793,7 +197,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterChad[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterTyler[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterTyler[] = { { .iv = 0, .lvl = 21, @@ -801,7 +205,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterTyler[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterEddie[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterEddie[] = { { .iv = 0, .lvl = 21, @@ -809,7 +213,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterEddie[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterDillon[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterDillon[] = { { .iv = 0, .lvl = 19, @@ -822,7 +226,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterDillon[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterYasu[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterYasu[] = { { .iv = 0, .lvl = 17, @@ -840,7 +244,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterYasu[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterDave[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterDave[] = { { .iv = 0, .lvl = 18, @@ -853,7 +257,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterDave[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterBen2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterBen2[] = { { .iv = 20, .lvl = 17, @@ -866,7 +270,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterBen2[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherRick[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherRick[] = { { .iv = 0, .lvl = 6, @@ -879,7 +283,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherRick[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherDoug[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherDoug[] = { { .iv = 0, .lvl = 7, @@ -897,7 +301,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherDoug[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherSammy[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherSammy[] = { { .iv = 0, .lvl = 9, @@ -905,7 +309,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherSammy[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherColton[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherColton[] = { { .iv = 0, .lvl = 10, @@ -923,7 +327,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherColton[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherGreg[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherGreg[] = { { .iv = 0, .lvl = 9, @@ -946,7 +350,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherGreg[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherJames[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherJames[] = { { .iv = 0, .lvl = 11, @@ -959,7 +363,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherJames[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherKent[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherKent[] = { { .iv = 0, .lvl = 11, @@ -972,7 +376,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherKent[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherRobby[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherRobby[] = { { .iv = 0, .lvl = 10, @@ -990,7 +394,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherRobby[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherCale[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherCale[] = { { .iv = 0, .lvl = 10, @@ -1013,7 +417,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherCale[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherKeigo[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherKeigo[] = { { .iv = 0, .lvl = 16, @@ -1031,7 +435,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherKeigo[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherElijah[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherElijah[] = { { .iv = 0, .lvl = 20, @@ -1039,7 +443,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherElijah[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcher2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcher2[] = { { .iv = 0, .lvl = 18, @@ -1057,7 +461,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcher2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherBrent[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherBrent[] = { { .iv = 0, .lvl = 19, @@ -1070,7 +474,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherBrent[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherConner[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherConner[] = { { .iv = 0, .lvl = 20, @@ -1088,7 +492,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherConner[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassJanice[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassJanice[] = { { .iv = 0, .lvl = 9, @@ -1101,7 +505,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassJanice[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassSally[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassSally[] = { { .iv = 0, .lvl = 10, @@ -1114,7 +518,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassSally[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassRobin[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassRobin[] = { { .iv = 0, .lvl = 14, @@ -1122,7 +526,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassRobin[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassCrissy[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassCrissy[] = { { .iv = 0, .lvl = 31, @@ -1140,7 +544,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassCrissy[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassMiriam[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassMiriam[] = { { .iv = 0, .lvl = 11, @@ -1153,7 +557,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassMiriam[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassIris[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassIris[] = { { .iv = 0, .lvl = 14, @@ -1161,7 +565,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassIris[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassReli[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassReli[] = { { .iv = 0, .lvl = 16, @@ -1174,7 +578,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassReli[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassAli[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassAli[] = { { .iv = 0, .lvl = 12, @@ -1192,7 +596,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassAli[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Lass2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_Lass2[] = { { .iv = 0, .lvl = 15, @@ -1205,7 +609,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Lass2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassHaley[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassHaley[] = { { .iv = 0, .lvl = 13, @@ -1223,7 +627,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassHaley[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassAnn[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassAnn[] = { { .iv = 0, .lvl = 18, @@ -1236,7 +640,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassAnn[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassDawn[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassDawn[] = { { .iv = 0, .lvl = 18, @@ -1249,7 +653,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassDawn[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassPaige[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassPaige[] = { { .iv = 0, .lvl = 23, @@ -1262,7 +666,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassPaige[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassAndrea[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassAndrea[] = { { .iv = 0, .lvl = 24, @@ -1280,7 +684,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassAndrea[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassMegan[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassMegan[] = { { .iv = 0, .lvl = 19, @@ -1308,7 +712,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassMegan[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassJulia[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassJulia[] = { { .iv = 0, .lvl = 22, @@ -1321,7 +725,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassJulia[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassKay[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassKay[] = { { .iv = 0, .lvl = 23, @@ -1334,7 +738,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassKay[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassLisa[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassLisa[] = { { .iv = 0, .lvl = 23, @@ -1347,7 +751,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassLisa[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SailorEdmond[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SailorEdmond[] = { { .iv = 0, .lvl = 18, @@ -1360,7 +764,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SailorEdmond[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SailorTrevor[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SailorTrevor[] = { { .iv = 0, .lvl = 17, @@ -1373,7 +777,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SailorTrevor[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SailorLeonard[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SailorLeonard[] = { { .iv = 0, .lvl = 21, @@ -1381,7 +785,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SailorLeonard[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SailorDuncan[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SailorDuncan[] = { { .iv = 0, .lvl = 17, @@ -1399,7 +803,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SailorDuncan[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SailorHuey[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SailorHuey[] = { { .iv = 0, .lvl = 18, @@ -1412,7 +816,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SailorHuey[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SailorDylan[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SailorDylan[] = { { .iv = 0, .lvl = 17, @@ -1430,7 +834,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SailorDylan[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SailorPhillip[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SailorPhillip[] = { { .iv = 0, .lvl = 20, @@ -1438,7 +842,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SailorPhillip[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SailorDwayne[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SailorDwayne[] = { { .iv = 0, .lvl = 21, @@ -1451,7 +855,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SailorDwayne[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CamperLiam[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CamperLiam[] = { { .iv = 0, .lvl = 10, @@ -1466,7 +870,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CamperLiam[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperShane[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CamperShane[] = { { .iv = 0, .lvl = 14, @@ -1479,7 +883,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperShane[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperEthan[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CamperEthan[] = { { .iv = 0, .lvl = 18, @@ -1487,7 +891,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperEthan[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperRicky[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CamperRicky[] = { { .iv = 0, .lvl = 20, @@ -1495,7 +899,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperRicky[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperJeff[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CamperJeff[] = { { .iv = 0, .lvl = 16, @@ -1508,15 +912,9 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperJeff[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Camper2[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; +static const struct TrainerMonNoItemDefaultMoves sParty_Camper2[] = {DUMMY_TRAINER_MON}; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperChris[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CamperChris[] = { { .iv = 0, .lvl = 21, @@ -1529,7 +927,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperChris[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperDrew[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CamperDrew[] = { { .iv = 0, .lvl = 19, @@ -1552,7 +950,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperDrew[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerDiana[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerDiana[] = { { .iv = 0, .lvl = 19, @@ -1560,7 +958,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerDiana[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerNancy[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerNancy[] = { { .iv = 0, .lvl = 16, @@ -1573,7 +971,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerNancy[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerIsabelle[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerIsabelle[] = { { .iv = 0, .lvl = 16, @@ -1591,7 +989,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerIsabelle[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerKelsey[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerKelsey[] = { { .iv = 0, .lvl = 15, @@ -1604,7 +1002,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerKelsey[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerAlicia[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerAlicia[] = { { .iv = 0, .lvl = 18, @@ -1627,7 +1025,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerAlicia[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerCaitlin[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerCaitlin[] = { { .iv = 0, .lvl = 23, @@ -1635,7 +1033,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerCaitlin[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerHeidi[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerHeidi[] = { { .iv = 0, .lvl = 20, @@ -1648,7 +1046,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerHeidi[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerCarol[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerCarol[] = { { .iv = 0, .lvl = 21, @@ -1661,7 +1059,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerCarol[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerSofia[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerSofia[] = { { .iv = 0, .lvl = 21, @@ -1679,7 +1077,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerSofia[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerMartha[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerMartha[] = { { .iv = 0, .lvl = 22, @@ -1692,7 +1090,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerMartha[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerTina[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerTina[] = { { .iv = 0, .lvl = 24, @@ -1705,7 +1103,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerTina[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerHannah[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerHannah[] = { { .iv = 0, .lvl = 24, @@ -1733,7 +1131,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerHannah[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacMark[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PokemaniacMark[] = { { .iv = 30, .lvl = 29, @@ -1746,7 +1144,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacMark[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacHerman[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PokemaniacHerman[] = { { .iv = 30, .lvl = 20, @@ -1759,7 +1157,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacHerman[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacCooper[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PokemaniacCooper[] = { { .iv = 30, .lvl = 20, @@ -1777,7 +1175,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacCooper[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacSteve[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PokemaniacSteve[] = { { .iv = 30, .lvl = 22, @@ -1790,7 +1188,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacSteve[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacWinston[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PokemaniacWinston[] = { { .iv = 30, .lvl = 25, @@ -1798,7 +1196,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacWinston[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacDawson[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PokemaniacDawson[] = { { .iv = 30, .lvl = 40, @@ -1816,7 +1214,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacDawson[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacAshton[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PokemaniacAshton[] = { { .iv = 30, .lvl = 23, @@ -1829,7 +1227,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacAshton[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerdJovan[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SuperNerdJovan[] = { { .iv = 0, .lvl = 11, @@ -1842,7 +1240,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerdJovan[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerdMiguel[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SuperNerdMiguel[] = { { .iv = 0, .lvl = 12, @@ -1860,7 +1258,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerdMiguel[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_SuperNerdAidan[] = { +static const struct TrainerMonNoItemCustomMoves sParty_SuperNerdAidan[] = { { .iv = 0, .lvl = 20, @@ -1887,7 +1285,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_SuperNerdAidan[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerdGlenn[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SuperNerdGlenn[] = { { .iv = 0, .lvl = 22, @@ -1905,7 +1303,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerdGlenn[] = }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_SuperNerdLeslie[] = { +static const struct TrainerMonNoItemCustomMoves sParty_SuperNerdLeslie[] = { { .iv = 0, .lvl = 26, @@ -1914,7 +1312,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_SuperNerdLeslie[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerd1[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SuperNerd1[] = { { .iv = 0, .lvl = 22, @@ -1932,7 +1330,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerd1[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerd2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SuperNerd2[] = { { .iv = 0, .lvl = 20, @@ -1955,7 +1353,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerd2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerd3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SuperNerd3[] = { { .iv = 0, .lvl = 24, @@ -1968,7 +1366,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerd3[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerdErik[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SuperNerdErik[] = { { .iv = 0, .lvl = 36, @@ -1986,7 +1384,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerdErik[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerdAvery[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SuperNerdAvery[] = { { .iv = 0, .lvl = 34, @@ -2009,7 +1407,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerdAvery[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerdDerek[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SuperNerdDerek[] = { { .iv = 0, .lvl = 41, @@ -2017,7 +1415,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerdDerek[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerdZac[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SuperNerdZac[] = { { .iv = 0, .lvl = 37, @@ -2030,7 +1428,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerdZac[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerMarcos[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_HikerMarcos[] = { { .iv = 0, .lvl = 10, @@ -2048,7 +1446,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerMarcos[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerFranklin[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_HikerFranklin[] = { { .iv = 0, .lvl = 15, @@ -2061,7 +1459,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerFranklin[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerNob[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_HikerNob[] = { { .iv = 0, .lvl = 13, @@ -2084,7 +1482,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerNob[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerWayne[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_HikerWayne[] = { { .iv = 0, .lvl = 17, @@ -2092,7 +1490,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerWayne[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_HikerAlan[] = { +static const struct TrainerMonNoItemCustomMoves sParty_HikerAlan[] = { { .iv = 0, .lvl = 21, @@ -2107,7 +1505,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_HikerAlan[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerBrice[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_HikerBrice[] = { { .iv = 0, .lvl = 20, @@ -2125,7 +1523,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerBrice[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_HikerClark[] = { +static const struct TrainerMonNoItemCustomMoves sParty_HikerClark[] = { { .iv = 0, .lvl = 21, @@ -2140,7 +1538,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_HikerClark[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerTrent[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_HikerTrent[] = { { .iv = 0, .lvl = 19, @@ -2153,7 +1551,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerTrent[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_HikerDudley[] = { +static const struct TrainerMonNoItemCustomMoves sParty_HikerDudley[] = { { .iv = 0, .lvl = 21, @@ -2174,7 +1572,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_HikerDudley[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_HikerAllen[] = { +static const struct TrainerMonNoItemCustomMoves sParty_HikerAllen[] = { { .iv = 0, .lvl = 25, @@ -2183,7 +1581,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_HikerAllen[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerEric[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_HikerEric[] = { { .iv = 0, .lvl = 20, @@ -2196,7 +1594,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerEric[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerLenny[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_HikerLenny[] = { { .iv = 0, .lvl = 19, @@ -2219,7 +1617,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerLenny[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerOliver[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_HikerOliver[] = { { .iv = 0, .lvl = 20, @@ -2237,7 +1635,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerOliver[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_HikerLucas[] = { +static const struct TrainerMonNoItemCustomMoves sParty_HikerLucas[] = { { .iv = 0, .lvl = 21, @@ -2252,7 +1650,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_HikerLucas[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerJared[] = { +static const struct TrainerMonNoItemCustomMoves sParty_BikerJared[] = { { .iv = 0, .lvl = 28, @@ -2273,7 +1671,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerJared[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerMalik[] = { +static const struct TrainerMonNoItemCustomMoves sParty_BikerMalik[] = { { .iv = 0, .lvl = 29, @@ -2288,7 +1686,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerMalik[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerErnest[] = { +static const struct TrainerMonNoItemCustomMoves sParty_BikerErnest[] = { { .iv = 0, .lvl = 25, @@ -2321,7 +1719,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerErnest[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerAlex[] = { +static const struct TrainerMonNoItemCustomMoves sParty_BikerAlex[] = { { .iv = 0, .lvl = 28, @@ -2342,7 +1740,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerAlex[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerLao[] = { +static const struct TrainerMonNoItemCustomMoves sParty_BikerLao[] = { { .iv = 0, .lvl = 29, @@ -2357,15 +1755,9 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerLao[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Biker1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; +static const struct TrainerMonNoItemDefaultMoves sParty_Biker1[] = {DUMMY_TRAINER_MON}; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BikerHideo[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BikerHideo[] = { { .iv = 0, .lvl = 33, @@ -2373,7 +1765,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BikerHideo[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerRuben[] = { +static const struct TrainerMonNoItemCustomMoves sParty_BikerRuben[] = { { .iv = 0, .lvl = 28, @@ -2394,7 +1786,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerRuben[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BikerBilly[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BikerBilly[] = { { .iv = 0, .lvl = 33, @@ -2402,7 +1794,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BikerBilly[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerNikolas[] = { +static const struct TrainerMonNoItemCustomMoves sParty_BikerNikolas[] = { { .iv = 0, .lvl = 29, @@ -2417,7 +1809,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerNikolas[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerJaxon[] = { +static const struct TrainerMonNoItemCustomMoves sParty_BikerJaxon[] = { { .iv = 0, .lvl = 29, @@ -2432,7 +1824,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerJaxon[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerWilliam[] = { +static const struct TrainerMonNoItemCustomMoves sParty_BikerWilliam[] = { { .iv = 0, .lvl = 25, @@ -2465,7 +1857,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerWilliam[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerLukas[] = { +static const struct TrainerMonNoItemCustomMoves sParty_BikerLukas[] = { { .iv = 0, .lvl = 26, @@ -2492,7 +1884,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerLukas[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerIsaac[] = { +static const struct TrainerMonNoItemCustomMoves sParty_BikerIsaac[] = { { .iv = 0, .lvl = 28, @@ -2513,7 +1905,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerIsaac[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerGerald[] = { +static const struct TrainerMonNoItemCustomMoves sParty_BikerGerald[] = { { .iv = 0, .lvl = 29, @@ -2528,7 +1920,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerGerald[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Burglar1[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_Burglar1[] = { { .iv = 0, .lvl = 29, @@ -2541,7 +1933,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Burglar1[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Burglar2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_Burglar2[] = { { .iv = 0, .lvl = 33, @@ -2549,7 +1941,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Burglar2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Burglar3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_Burglar3[] = { { .iv = 0, .lvl = 28, @@ -2567,7 +1959,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Burglar3[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BurglarQuinn[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BurglarQuinn[] = { { .iv = 0, .lvl = 36, @@ -2585,7 +1977,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BurglarQuinn[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BurglarRamon[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BurglarRamon[] = { { .iv = 0, .lvl = 41, @@ -2593,7 +1985,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BurglarRamon[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BurglarDusty[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BurglarDusty[] = { { .iv = 0, .lvl = 37, @@ -2606,7 +1998,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BurglarDusty[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BurglarArnie[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BurglarArnie[] = { { .iv = 0, .lvl = 34, @@ -2619,7 +2011,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BurglarArnie[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Burglar4[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_Burglar4[] = { { .iv = 0, .lvl = 34, @@ -2632,7 +2024,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Burglar4[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BurglarSimon[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BurglarSimon[] = { { .iv = 0, .lvl = 38, @@ -2640,7 +2032,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BurglarSimon[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BurglarLewis[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BurglarLewis[] = { { .iv = 0, .lvl = 34, @@ -2653,7 +2045,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BurglarLewis[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_EngineerBaily[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_EngineerBaily[] = { { .iv = 0, .lvl = 21, @@ -2666,7 +2058,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_EngineerBaily[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_EngineerBraxton[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_EngineerBraxton[] = { { .iv = 0, .lvl = 21, @@ -2674,7 +2066,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_EngineerBraxton[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_EngineerBernie[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_EngineerBernie[] = { { .iv = 0, .lvl = 18, @@ -2692,7 +2084,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_EngineerBernie[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanDale[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_FishermanDale[] = { { .iv = 0, .lvl = 17, @@ -2710,7 +2102,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanDale[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanBarny[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_FishermanBarny[] = { { .iv = 0, .lvl = 17, @@ -2728,7 +2120,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanBarny[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanNed[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_FishermanNed[] = { { .iv = 0, .lvl = 22, @@ -2746,7 +2138,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanNed[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanChip[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_FishermanChip[] = { { .iv = 0, .lvl = 24, @@ -2759,7 +2151,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanChip[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanHank[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_FishermanHank[] = { { .iv = 0, .lvl = 27, @@ -2767,7 +2159,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanHank[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanElliot[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_FishermanElliot[] = { { .iv = 0, .lvl = 21, @@ -2790,7 +2182,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanElliot[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanRonald[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_FishermanRonald[] = { { .iv = 0, .lvl = 28, @@ -2813,7 +2205,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanRonald[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanClaude[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_FishermanClaude[] = { { .iv = 0, .lvl = 31, @@ -2826,7 +2218,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanClaude[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanWade[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_FishermanWade[] = { { .iv = 0, .lvl = 27, @@ -2859,7 +2251,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanWade[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanNolan[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_FishermanNolan[] = { { .iv = 0, .lvl = 33, @@ -2872,7 +2264,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanNolan[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanAndrew[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_FishermanAndrew[] = { { .iv = 0, .lvl = 24, @@ -2885,7 +2277,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanAndrew[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleLuis[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleLuis[] = { { .iv = 0, .lvl = 16, @@ -2898,7 +2290,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleLuis[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleRichard[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleRichard[] = { { .iv = 0, .lvl = 30, @@ -2911,7 +2303,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleRichard }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleReece[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleReece[] = { { .iv = 0, .lvl = 29, @@ -2929,7 +2321,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleReece[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleMatthew[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleMatthew[] = { { .iv = 0, .lvl = 30, @@ -2942,7 +2334,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleMatthew }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleDouglas[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleDouglas[] = { { .iv = 0, .lvl = 27, @@ -2965,7 +2357,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleDouglas }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleDavid[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleDavid[] = { { .iv = 0, .lvl = 29, @@ -2983,7 +2375,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleDavid[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleTony[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleTony[] = { { .iv = 0, .lvl = 30, @@ -2996,7 +2388,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleTony[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleAxle[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleAxle[] = { { .iv = 0, .lvl = 27, @@ -3024,7 +2416,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleAxle[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleBarry[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleBarry[] = { { .iv = 0, .lvl = 31, @@ -3037,7 +2429,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleBarry[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleDean[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleDean[] = { { .iv = 0, .lvl = 35, @@ -3045,7 +2437,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleDean[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleDarrin[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleDarrin[] = { { .iv = 0, .lvl = 28, @@ -3068,7 +2460,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleDarrin[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleSpencer[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleSpencer[] = { { .iv = 0, .lvl = 33, @@ -3081,7 +2473,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleSpencer }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleJack[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleJack[] = { { .iv = 0, .lvl = 37, @@ -3089,7 +2481,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleJack[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleJerome[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleJerome[] = { { .iv = 0, .lvl = 33, @@ -3102,7 +2494,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleJerome[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleRoland[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleRoland[] = { { .iv = 0, .lvl = 32, @@ -3120,7 +2512,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleRoland[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallKoji[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CueBallKoji[] = { { .iv = 0, .lvl = 28, @@ -3138,7 +2530,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallKoji[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallLuke[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CueBallLuke[] = { { .iv = 0, .lvl = 29, @@ -3151,7 +2543,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallLuke[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallCamron[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CueBallCamron[] = { { .iv = 0, .lvl = 29, @@ -3164,7 +2556,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallCamron[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallRaul[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CueBallRaul[] = { { .iv = 0, .lvl = 29, @@ -3177,7 +2569,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallRaul[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallIsaiah[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CueBallIsaiah[] = { { .iv = 0, .lvl = 29, @@ -3190,7 +2582,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallIsaiah[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallZeek[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CueBallZeek[] = { { .iv = 0, .lvl = 33, @@ -3198,7 +2590,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallZeek[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallJamal[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CueBallJamal[] = { { .iv = 0, .lvl = 26, @@ -3221,7 +2613,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallJamal[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallCorey[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CueBallCorey[] = { { .iv = 0, .lvl = 29, @@ -3234,7 +2626,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallCorey[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallChase[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CueBallChase[] = { { .iv = 0, .lvl = 31, @@ -3252,7 +2644,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallChase[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GamerHugo[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_GamerHugo[] = { { .iv = 0, .lvl = 18, @@ -3265,7 +2657,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GamerHugo[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GamerJasper[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_GamerJasper[] = { { .iv = 0, .lvl = 18, @@ -3278,7 +2670,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GamerJasper[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GamerDirk[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_GamerDirk[] = { { .iv = 0, .lvl = 18, @@ -3291,7 +2683,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GamerDirk[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GamerDarian[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_GamerDarian[] = { { .iv = 0, .lvl = 18, @@ -3304,7 +2696,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GamerDarian[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GamerStan[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_GamerStan[] = { { .iv = 0, .lvl = 22, @@ -3322,15 +2714,9 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GamerStan[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Gamer1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; +static const struct TrainerMonNoItemDefaultMoves sParty_Gamer1[] = {DUMMY_TRAINER_MON}; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GamerRich[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_GamerRich[] = { { .iv = 0, .lvl = 24, @@ -3343,7 +2729,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GamerRich[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautyBridget[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BeautyBridget[] = { { .iv = 0, .lvl = 21, @@ -3366,7 +2752,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautyBridget[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautyTamia[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BeautyTamia[] = { { .iv = 0, .lvl = 24, @@ -3379,7 +2765,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautyTamia[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautyLori[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BeautyLori[] = { { .iv = 0, .lvl = 24, @@ -3387,7 +2773,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautyLori[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautyLola[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BeautyLola[] = { { .iv = 0, .lvl = 27, @@ -3405,7 +2791,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautyLola[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautySheila[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BeautySheila[] = { { .iv = 0, .lvl = 29, @@ -3418,7 +2804,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautySheila[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleTiffany[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerFemaleTiffany[] = { { .iv = 0, .lvl = 35, @@ -3426,7 +2812,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleTiffa }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleNora[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerFemaleNora[] = { { .iv = 0, .lvl = 30, @@ -3444,7 +2830,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleNora[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleMelissa[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerFemaleMelissa[] = { { .iv = 0, .lvl = 31, @@ -3457,7 +2843,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleMelis }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautyGrace[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BeautyGrace[] = { { .iv = 0, .lvl = 29, @@ -3470,7 +2856,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautyGrace[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautyOlivia[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BeautyOlivia[] = { { .iv = 0, .lvl = 29, @@ -3483,7 +2869,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautyOlivia[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautyLauren[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BeautyLauren[] = { { .iv = 0, .lvl = 33, @@ -3501,7 +2887,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautyLauren[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleAnya[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerFemaleAnya[] = { { .iv = 0, .lvl = 27, @@ -3529,7 +2915,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleAnya[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleAlice[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerFemaleAlice[] = { { .iv = 0, .lvl = 30, @@ -3542,7 +2928,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleAlice }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleConnie[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerFemaleConnie[] = { { .iv = 0, .lvl = 29, @@ -3560,7 +2946,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleConni }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleShirley[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerFemaleShirley[] = { { .iv = 0, .lvl = 30, @@ -3578,7 +2964,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleShirl }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PsychicJohan[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PsychicJohan[] = { { .iv = 50, .lvl = 31, @@ -3601,7 +2987,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PsychicJohan[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PsychicTyron[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PsychicTyron[] = { { .iv = 50, .lvl = 34, @@ -3614,7 +3000,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PsychicTyron[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PsychicCameron[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PsychicCameron[] = { { .iv = 50, .lvl = 33, @@ -3632,7 +3018,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PsychicCameron[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PsychicPreston[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PsychicPreston[] = { { .iv = 50, .lvl = 38, @@ -3640,7 +3026,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PsychicPreston[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RockerRandall[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RockerRandall[] = { { .iv = 0, .lvl = 20, @@ -3658,7 +3044,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RockerRandall[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RockerLuca[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RockerLuca[] = { { .iv = 0, .lvl = 29, @@ -3671,7 +3057,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RockerLuca[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_JugglerDalton[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_JugglerDalton[] = { { .iv = 0, .lvl = 29, @@ -3684,7 +3070,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_JugglerDalton[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_JugglerNelson[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_JugglerNelson[] = { { .iv = 0, .lvl = 41, @@ -3707,7 +3093,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_JugglerNelson[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_JugglerKirk[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_JugglerKirk[] = { { .iv = 0, .lvl = 31, @@ -3730,7 +3116,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_JugglerKirk[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_JugglerShawn[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_JugglerShawn[] = { { .iv = 0, .lvl = 34, @@ -3743,7 +3129,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_JugglerShawn[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_JugglerGregory[] = { +static const struct TrainerMonNoItemCustomMoves sParty_JugglerGregory[] = { { .iv = 0, .lvl = 48, @@ -3752,7 +3138,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_JugglerGregory[] = }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_JugglerEdward[] = { +static const struct TrainerMonNoItemCustomMoves sParty_JugglerEdward[] = { { .iv = 0, .lvl = 46, @@ -3779,7 +3165,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_JugglerEdward[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_JugglerKayden[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_JugglerKayden[] = { { .iv = 0, .lvl = 38, @@ -3787,7 +3173,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_JugglerKayden[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_JugglerNate[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_JugglerNate[] = { { .iv = 0, .lvl = 34, @@ -3800,7 +3186,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_JugglerNate[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TamerPhil[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TamerPhil[] = { { .iv = 40, .lvl = 34, @@ -3813,7 +3199,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TamerPhil[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TamerEdgar[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TamerEdgar[] = { { .iv = 40, .lvl = 33, @@ -3831,7 +3217,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TamerEdgar[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TamerJason[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TamerJason[] = { { .iv = 40, .lvl = 43, @@ -3839,7 +3225,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TamerJason[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TamerCole[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TamerCole[] = { { .iv = 40, .lvl = 39, @@ -3852,7 +3238,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TamerCole[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TamerVincent[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TamerVincent[] = { { .iv = 40, .lvl = 44, @@ -3865,7 +3251,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TamerVincent[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TamerJohn[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TamerJohn[] = { { .iv = 40, .lvl = 42, @@ -3888,7 +3274,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TamerJohn[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperSebastian[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperSebastian[] = { { .iv = 0, .lvl = 29, @@ -3901,7 +3287,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperSebastia }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperPerry[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperPerry[] = { { .iv = 0, .lvl = 25, @@ -3929,7 +3315,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperPerry[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperRobert[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperRobert[] = { { .iv = 0, .lvl = 26, @@ -3952,7 +3338,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperRobert[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperDonald[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperDonald[] = { { .iv = 0, .lvl = 33, @@ -3960,7 +3346,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperDonald[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperBenny[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperBenny[] = { { .iv = 0, .lvl = 29, @@ -3973,7 +3359,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperBenny[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperEdwin[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperEdwin[] = { { .iv = 0, .lvl = 26, @@ -3996,7 +3382,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperEdwin[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperChester[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperChester[] = { { .iv = 0, .lvl = 28, @@ -4014,7 +3400,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperChester[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperWilton[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperWilton[] = { { .iv = 0, .lvl = 29, @@ -4027,7 +3413,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperWilton[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperRamiro[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperRamiro[] = { { .iv = 0, .lvl = 34, @@ -4035,7 +3421,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperRamiro[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperJacob[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperJacob[] = { { .iv = 0, .lvl = 26, @@ -4058,7 +3444,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperJacob[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperRoger[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperRoger[] = { { .iv = 0, .lvl = 30, @@ -4076,7 +3462,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperRoger[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperReed[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperReed[] = { { .iv = 0, .lvl = 39, @@ -4099,7 +3485,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperReed[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperKeith[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperKeith[] = { { .iv = 0, .lvl = 39, @@ -4112,7 +3498,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperKeith[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperCarter[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperCarter[] = { { .iv = 0, .lvl = 28, @@ -4130,7 +3516,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperCarter[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperMitch[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperMitch[] = { { .iv = 0, .lvl = 26, @@ -4153,7 +3539,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperMitch[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperBeck[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperBeck[] = { { .iv = 0, .lvl = 29, @@ -4166,7 +3552,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperBeck[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperMarlon[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperMarlon[] = { { .iv = 0, .lvl = 28, @@ -4184,7 +3570,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperMarlon[] }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltKoichi[] = { +static const struct TrainerMonItemDefaultMoves sParty_BlackBeltKoichi[] = { { .iv = 100, .lvl = 37, @@ -4199,7 +3585,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltKoichi[] = }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltMike[] = { +static const struct TrainerMonItemDefaultMoves sParty_BlackBeltMike[] = { { .iv = 100, .lvl = 31, @@ -4220,7 +3606,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltMike[] = { }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltHideki[] = { +static const struct TrainerMonItemDefaultMoves sParty_BlackBeltHideki[] = { { .iv = 100, .lvl = 32, @@ -4235,7 +3621,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltHideki[] = }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltAaron[] = { +static const struct TrainerMonItemDefaultMoves sParty_BlackBeltAaron[] = { { .iv = 100, .lvl = 36, @@ -4244,7 +3630,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltAaron[] = { }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltHitoshi[] = { +static const struct TrainerMonItemDefaultMoves sParty_BlackBeltHitoshi[] = { { .iv = 100, .lvl = 31, @@ -4265,7 +3651,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltHitoshi[] = }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltAtsushi[] = { +static const struct TrainerMonItemDefaultMoves sParty_BlackBeltAtsushi[] = { { .iv = 100, .lvl = 40, @@ -4280,7 +3666,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltAtsushi[] = }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltKiyo[] = { +static const struct TrainerMonItemDefaultMoves sParty_BlackBeltKiyo[] = { { .iv = 100, .lvl = 43, @@ -4289,7 +3675,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltKiyo[] = { }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltTakashi[] = { +static const struct TrainerMonItemDefaultMoves sParty_BlackBeltTakashi[] = { { .iv = 100, .lvl = 38, @@ -4310,7 +3696,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltTakashi[] = }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltDaisuke[] = { +static const struct TrainerMonItemDefaultMoves sParty_BlackBeltDaisuke[] = { { .iv = 100, .lvl = 43, @@ -4331,7 +3717,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltDaisuke[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalOaksLabSquirtle[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RivalOaksLabSquirtle[] = { { .iv = 0, .lvl = 5, @@ -4339,7 +3725,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalOaksLabSquirt }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalOaksLabBulbasaur[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RivalOaksLabBulbasaur[] = { { .iv = 0, .lvl = 5, @@ -4347,7 +3733,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalOaksLabBulbas }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalOaksLabCharmander[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RivalOaksLabCharmander[] = { { .iv = 0, .lvl = 5, @@ -4355,7 +3741,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalOaksLabCharma }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_RivalRoute22EarlySquirtle[] = { +static const struct TrainerMonNoItemCustomMoves sParty_RivalRoute22EarlySquirtle[] = { { .iv = 50, .lvl = 9, @@ -4370,7 +3756,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_RivalRoute22EarlySq }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_RivalRoute22EarlyBulbasaur[] = { +static const struct TrainerMonNoItemCustomMoves sParty_RivalRoute22EarlyBulbasaur[] = { { .iv = 50, .lvl = 9, @@ -4385,7 +3771,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_RivalRoute22EarlyBu }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_RivalRoute22EarlyCharmander[] = { +static const struct TrainerMonNoItemCustomMoves sParty_RivalRoute22EarlyCharmander[] = { { .iv = 50, .lvl = 9, @@ -4400,7 +3786,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_RivalRoute22EarlyCh }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_RivalCeruleanSquirtle[] = { +static const struct TrainerMonNoItemCustomMoves sParty_RivalCeruleanSquirtle[] = { { .iv = 50, .lvl = 17, @@ -4427,7 +3813,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_RivalCeruleanSquirt }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_RivalCeruleanBulbasaur[] = { +static const struct TrainerMonNoItemCustomMoves sParty_RivalCeruleanBulbasaur[] = { { .iv = 50, .lvl = 17, @@ -4454,7 +3840,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_RivalCeruleanBulbas }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_RivalCeruleanCharmander[] = { +static const struct TrainerMonNoItemCustomMoves sParty_RivalCeruleanCharmander[] = { { .iv = 50, .lvl = 17, @@ -4481,7 +3867,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_RivalCeruleanCharma }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ScientistTed[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ScientistTed[] = { { .iv = 0, .lvl = 29, @@ -4494,7 +3880,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ScientistTed[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_ScientistConnor[] = { +static const struct TrainerMonNoItemCustomMoves sParty_ScientistConnor[] = { { .iv = 0, .lvl = 26, @@ -4521,7 +3907,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_ScientistConnor[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ScientistJerry[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ScientistJerry[] = { { .iv = 0, .lvl = 28, @@ -4539,7 +3925,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ScientistJerry[] = }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_ScientistJose[] = { +static const struct TrainerMonNoItemCustomMoves sParty_ScientistJose[] = { { .iv = 0, .lvl = 29, @@ -4554,7 +3940,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_ScientistJose[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ScientistRodney[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ScientistRodney[] = { { .iv = 0, .lvl = 33, @@ -4562,7 +3948,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ScientistRodney[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_ScientistBeau[] = { +static const struct TrainerMonNoItemCustomMoves sParty_ScientistBeau[] = { { .iv = 0, .lvl = 26, @@ -4589,7 +3975,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_ScientistBeau[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_ScientistTaylor[] = { +static const struct TrainerMonNoItemCustomMoves sParty_ScientistTaylor[] = { { .iv = 0, .lvl = 25, @@ -4622,7 +4008,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_ScientistTaylor[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ScientistJoshua[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ScientistJoshua[] = { { .iv = 0, .lvl = 29, @@ -4635,7 +4021,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ScientistJoshua[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ScientistParker[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ScientistParker[] = { { .iv = 0, .lvl = 29, @@ -4648,7 +4034,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ScientistParker[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_ScientistEd[] = { +static const struct TrainerMonNoItemCustomMoves sParty_ScientistEd[] = { { .iv = 0, .lvl = 28, @@ -4669,7 +4055,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_ScientistEd[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ScientistTravis[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ScientistTravis[] = { { .iv = 0, .lvl = 29, @@ -4682,7 +4068,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ScientistTravis[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ScientistBraydon[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ScientistBraydon[] = { { .iv = 0, .lvl = 33, @@ -4700,7 +4086,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ScientistBraydon[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ScientistIvan[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ScientistIvan[] = { { .iv = 0, .lvl = 34, @@ -4713,7 +4099,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ScientistIvan[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BossGiovanni[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BossGiovanni[] = { { .iv = 250, .lvl = 25, @@ -4731,7 +4117,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BossGiovanni[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BossGiovanni2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BossGiovanni2[] = { { .iv = 250, .lvl = 37, @@ -4754,7 +4140,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BossGiovanni2[] = }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_LeaderGiovanni[] = { +static const struct TrainerMonNoItemCustomMoves sParty_LeaderGiovanni[] = { { .iv = 0, .lvl = 45, @@ -4787,7 +4173,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_LeaderGiovanni[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt[] = { { .iv = 0, .lvl = 13, @@ -4800,7 +4186,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt2[] = { { .iv = 0, .lvl = 11, @@ -4818,7 +4204,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt3[] = { { .iv = 0, .lvl = 11, @@ -4831,7 +4217,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt3[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt4[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt4[] = { { .iv = 0, .lvl = 13, @@ -4844,7 +4230,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt4[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt5[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt5[] = { { .iv = 0, .lvl = 17, @@ -4857,7 +4243,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt5[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt6[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt6[] = { { .iv = 0, .lvl = 15, @@ -4870,7 +4256,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt6[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt7[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt7[] = { { .iv = 0, .lvl = 20, @@ -4883,7 +4269,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt7[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt8[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt8[] = { { .iv = 0, .lvl = 21, @@ -4896,7 +4282,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt8[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt9[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt9[] = { { .iv = 0, .lvl = 21, @@ -4909,7 +4295,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt9[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_TeamRocketGrunt10[] = { +static const struct TrainerMonNoItemCustomMoves sParty_TeamRocketGrunt10[] = { { .iv = 0, .lvl = 20, @@ -4930,7 +4316,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_TeamRocketGrunt10[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt11[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt11[] = { { .iv = 0, .lvl = 19, @@ -4953,7 +4339,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt11[ }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_TeamRocketGrunt12[] = { +static const struct TrainerMonNoItemCustomMoves sParty_TeamRocketGrunt12[] = { { .iv = 0, .lvl = 22, @@ -4968,7 +4354,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_TeamRocketGrunt12[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_TeamRocketGrunt13[] = { +static const struct TrainerMonNoItemCustomMoves sParty_TeamRocketGrunt13[] = { { .iv = 0, .lvl = 17, @@ -5001,7 +4387,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_TeamRocketGrunt13[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt14[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt14[] = { { .iv = 0, .lvl = 20, @@ -5019,7 +4405,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt14[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt15[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt15[] = { { .iv = 0, .lvl = 21, @@ -5032,7 +4418,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt15[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt16[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt16[] = { { .iv = 0, .lvl = 23, @@ -5050,7 +4436,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt16[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt17[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt17[] = { { .iv = 0, .lvl = 23, @@ -5068,7 +4454,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt17[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt18[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt18[] = { { .iv = 0, .lvl = 21, @@ -5081,7 +4467,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt18[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt19[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt19[] = { { .iv = 0, .lvl = 25, @@ -5099,7 +4485,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt19[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt20[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt20[] = { { .iv = 0, .lvl = 26, @@ -5112,7 +4498,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt20[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt21[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt21[] = { { .iv = 0, .lvl = 23, @@ -5135,7 +4521,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt21[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt22[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt22[] = { { .iv = 0, .lvl = 26, @@ -5148,7 +4534,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt22[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt23[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt23[] = { { .iv = 0, .lvl = 29, @@ -5161,7 +4547,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt23[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt24[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt24[] = { { .iv = 0, .lvl = 25, @@ -5189,7 +4575,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt24[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt25[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt25[] = { { .iv = 0, .lvl = 28, @@ -5207,7 +4593,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt25[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt26[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt26[] = { { .iv = 0, .lvl = 29, @@ -5220,7 +4606,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt26[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt27[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt27[] = { { .iv = 0, .lvl = 28, @@ -5238,7 +4624,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt27[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt28[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt28[] = { { .iv = 0, .lvl = 33, @@ -5246,7 +4632,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt28[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt29[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt29[] = { { .iv = 0, .lvl = 33, @@ -5254,7 +4640,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt29[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt30[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt30[] = { { .iv = 0, .lvl = 29, @@ -5267,7 +4653,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt30[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt31[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt31[] = { { .iv = 0, .lvl = 28, @@ -5285,7 +4671,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt31[ }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_TeamRocketGrunt32[] = { +static const struct TrainerMonNoItemCustomMoves sParty_TeamRocketGrunt32[] = { { .iv = 0, .lvl = 26, @@ -5312,7 +4698,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_TeamRocketGrunt32[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt33[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt33[] = { { .iv = 0, .lvl = 29, @@ -5325,7 +4711,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt33[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt34[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt34[] = { { .iv = 0, .lvl = 29, @@ -5338,7 +4724,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt34[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt35[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt35[] = { { .iv = 0, .lvl = 26, @@ -5361,7 +4747,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt35[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt36[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt36[] = { { .iv = 0, .lvl = 28, @@ -5379,7 +4765,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt36[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt37[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt37[] = { { .iv = 0, .lvl = 28, @@ -5397,7 +4783,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt37[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt38[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt38[] = { { .iv = 0, .lvl = 28, @@ -5415,7 +4801,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt38[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt39[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt39[] = { { .iv = 0, .lvl = 33, @@ -5423,7 +4809,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt39[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt40[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt40[] = { { .iv = 0, .lvl = 25, @@ -5451,7 +4837,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt40[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt41[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt41[] = { { .iv = 0, .lvl = 32, @@ -5469,7 +4855,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt41[ }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerSamuel[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerSamuel[] = { { .iv = 100, .lvl = 37, @@ -5502,7 +4888,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerSamuel[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerGeorge[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerGeorge[] = { { .iv = 100, .lvl = 42, @@ -5535,7 +4921,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerGeorge[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerColby[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerColby[] = { { .iv = 100, .lvl = 41, @@ -5568,7 +4954,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerColby[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerPaul[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerPaul[] = { { .iv = 100, .lvl = 42, @@ -5601,7 +4987,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerPaul[] = }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerRolando[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerRolando[] = { { .iv = 100, .lvl = 42, @@ -5634,7 +5020,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerRolando[ }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerGilbert[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerGilbert[] = { { .iv = 100, .lvl = 42, @@ -5667,7 +5053,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerGilbert[ }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerOwen[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerOwen[] = { { .iv = 100, .lvl = 42, @@ -5700,7 +5086,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerOwen[] = }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerBerke[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerBerke[] = { { .iv = 100, .lvl = 42, @@ -5733,7 +5119,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerBerke[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerYuji[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerYuji[] = { { .iv = 100, .lvl = 38, @@ -5766,7 +5152,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerYuji[] = }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerWarren[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerWarren[] = { { .iv = 100, .lvl = 37, @@ -5799,7 +5185,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerWarren[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerMary[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerMary[] = { { .iv = 100, .lvl = 22, @@ -5832,7 +5218,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerMary[] = }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerCaroline[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerCaroline[] = { { .iv = 100, .lvl = 42, @@ -5865,7 +5251,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerCaroline }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerAlexa[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerAlexa[] = { { .iv = 100, .lvl = 42, @@ -5898,7 +5284,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerAlexa[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerShannon[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerShannon[] = { { .iv = 100, .lvl = 42, @@ -5931,7 +5317,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerShannon[ }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerNaomi[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerNaomi[] = { { .iv = 100, .lvl = 42, @@ -5964,7 +5350,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerNaomi[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerBrooke[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerBrooke[] = { { .iv = 100, .lvl = 42, @@ -5997,7 +5383,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerBrooke[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerAustina[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerAustina[] = { { .iv = 100, .lvl = 42, @@ -6030,7 +5416,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerAustina[ }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerJulie[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerJulie[] = { { .iv = 100, .lvl = 42, @@ -6063,7 +5449,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerJulie[] }, }; -static const struct TrainerMonItemCustomMoves sTrainerMons_EliteFourLorelei[] = { +static const struct TrainerMonItemCustomMoves sParty_EliteFourLorelei[] = { { .iv = 250, .lvl = 52, @@ -6101,7 +5487,7 @@ static const struct TrainerMonItemCustomMoves sTrainerMons_EliteFourLorelei[] = }, }; -static const struct TrainerMonItemCustomMoves sTrainerMons_EliteFourBruno[] = { +static const struct TrainerMonItemCustomMoves sParty_EliteFourBruno[] = { { .iv = 250, .lvl = 51, @@ -6139,7 +5525,7 @@ static const struct TrainerMonItemCustomMoves sTrainerMons_EliteFourBruno[] = { }, }; -static const struct TrainerMonItemCustomMoves sTrainerMons_EliteFourAgatha[] = { +static const struct TrainerMonItemCustomMoves sParty_EliteFourAgatha[] = { { .iv = 250, .lvl = 54, @@ -6177,7 +5563,7 @@ static const struct TrainerMonItemCustomMoves sTrainerMons_EliteFourAgatha[] = { }, }; -static const struct TrainerMonItemCustomMoves sTrainerMons_EliteFourLance[] = { +static const struct TrainerMonItemCustomMoves sParty_EliteFourLance[] = { { .iv = 250, .lvl = 56, @@ -6215,7 +5601,7 @@ static const struct TrainerMonItemCustomMoves sTrainerMons_EliteFourLance[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_LeaderBrock[] = { +static const struct TrainerMonNoItemCustomMoves sParty_LeaderBrock[] = { { .iv = 0, .lvl = 12, @@ -6230,7 +5616,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_LeaderBrock[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_LeaderMisty[] = { +static const struct TrainerMonNoItemCustomMoves sParty_LeaderMisty[] = { { .iv = 0, .lvl = 18, @@ -6245,7 +5631,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_LeaderMisty[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_LeaderLtSurge[] = { +static const struct TrainerMonNoItemCustomMoves sParty_LeaderLtSurge[] = { { .iv = 0, .lvl = 21, @@ -6266,7 +5652,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_LeaderLtSurge[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_LeaderErika[] = { +static const struct TrainerMonNoItemCustomMoves sParty_LeaderErika[] = { { .iv = 0, .lvl = 29, @@ -6287,7 +5673,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_LeaderErika[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_LeaderKoga[] = { +static const struct TrainerMonNoItemCustomMoves sParty_LeaderKoga[] = { { .iv = 0, .lvl = 37, @@ -6314,7 +5700,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_LeaderKoga[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_LeaderBlaine[] = { +static const struct TrainerMonNoItemCustomMoves sParty_LeaderBlaine[] = { { .iv = 0, .lvl = 42, @@ -6341,7 +5727,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_LeaderBlaine[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_LeaderSabrina[] = { +static const struct TrainerMonNoItemCustomMoves sParty_LeaderSabrina[] = { { .iv = 0, .lvl = 38, @@ -6368,7 +5754,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_LeaderSabrina[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GentlemanThomas[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_GentlemanThomas[] = { { .iv = 0, .lvl = 18, @@ -6381,7 +5767,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GentlemanThomas[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GentlemanArthur[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_GentlemanArthur[] = { { .iv = 0, .lvl = 19, @@ -6394,7 +5780,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GentlemanArthur[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GentlemanTucker[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_GentlemanTucker[] = { { .iv = 0, .lvl = 23, @@ -6402,7 +5788,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GentlemanTucker[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GentlemanNorton[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_GentlemanNorton[] = { { .iv = 0, .lvl = 48, @@ -6410,7 +5796,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GentlemanNorton[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GentlemanWalter[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_GentlemanWalter[] = { { .iv = 0, .lvl = 17, @@ -6423,7 +5809,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GentlemanWalter[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalSsAnneSquirtle[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RivalSsAnneSquirtle[] = { { .iv = 50, .lvl = 19, @@ -6446,7 +5832,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalSsAnneSquirtl }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalSsAnneBulbasaur[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RivalSsAnneBulbasaur[] = { { .iv = 50, .lvl = 19, @@ -6469,7 +5855,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalSsAnneBulbasa }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalSsAnneCharmander[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RivalSsAnneCharmander[] = { { .iv = 50, .lvl = 19, @@ -6492,7 +5878,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalSsAnneCharman }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalPokenonTowerSquirtle[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RivalPokenonTowerSquirtle[] = { { .iv = 100, .lvl = 25, @@ -6520,7 +5906,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalPokenonTowerS }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalPokenonTowerBulbasaur[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RivalPokenonTowerBulbasaur[] = { { .iv = 100, .lvl = 25, @@ -6548,7 +5934,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalPokenonTowerB }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalPokenonTowerCharmander[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RivalPokenonTowerCharmander[] = { { .iv = 100, .lvl = 25, @@ -6576,7 +5962,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalPokenonTowerC }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalSilphSquirtle[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RivalSilphSquirtle[] = { { .iv = 100, .lvl = 37, @@ -6604,7 +5990,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalSilphSquirtle }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalSilphBulbasaur[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RivalSilphBulbasaur[] = { { .iv = 100, .lvl = 37, @@ -6632,7 +6018,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalSilphBulbasau }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalSilphCharmander[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RivalSilphCharmander[] = { { .iv = 100, .lvl = 37, @@ -6660,7 +6046,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RivalSilphCharmand }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_RivalRoute22LateSquirtle[] = { +static const struct TrainerMonNoItemCustomMoves sParty_RivalRoute22LateSquirtle[] = { { .iv = 150, .lvl = 47, @@ -6699,7 +6085,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_RivalRoute22LateSqu }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_RivalRoute22LateBulbasaur[] = { +static const struct TrainerMonNoItemCustomMoves sParty_RivalRoute22LateBulbasaur[] = { { .iv = 150, .lvl = 47, @@ -6738,7 +6124,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_RivalRoute22LateBul }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_RivalRoute22LateCharmander[] = { +static const struct TrainerMonNoItemCustomMoves sParty_RivalRoute22LateCharmander[] = { { .iv = 150, .lvl = 47, @@ -6777,7 +6163,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_RivalRoute22LateCha }, }; -static const struct TrainerMonItemCustomMoves sTrainerMons_ChampionFirstSquirtle[] = { +static const struct TrainerMonItemCustomMoves sParty_ChampionFirstSquirtle[] = { { .iv = 255, .lvl = 59, @@ -6822,7 +6208,7 @@ static const struct TrainerMonItemCustomMoves sTrainerMons_ChampionFirstSquirtle }, }; -static const struct TrainerMonItemCustomMoves sTrainerMons_ChampionFirstBulbasaur[] = { +static const struct TrainerMonItemCustomMoves sParty_ChampionFirstBulbasaur[] = { { .iv = 255, .lvl = 59, @@ -6867,7 +6253,7 @@ static const struct TrainerMonItemCustomMoves sTrainerMons_ChampionFirstBulbasau }, }; -static const struct TrainerMonItemCustomMoves sTrainerMons_ChampionFirstCharmander[] = { +static const struct TrainerMonItemCustomMoves sParty_ChampionFirstCharmander[] = { { .iv = 255, .lvl = 59, @@ -6912,7 +6298,7 @@ static const struct TrainerMonItemCustomMoves sTrainerMons_ChampionFirstCharmand }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerPatricia[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ChannelerPatricia[] = { { .iv = 0, .lvl = 22, @@ -6920,7 +6306,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerPatricia[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerCarly[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ChannelerCarly[] = { { .iv = 0, .lvl = 24, @@ -6928,7 +6314,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerCarly[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerHope[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ChannelerHope[] = { { .iv = 0, .lvl = 23, @@ -6936,7 +6322,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerHope[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerPaula[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ChannelerPaula[] = { { .iv = 0, .lvl = 24, @@ -6944,7 +6330,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerPaula[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerLaurel[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ChannelerLaurel[] = { { .iv = 0, .lvl = 23, @@ -6957,7 +6343,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerLaurel[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerJody[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ChannelerJody[] = { { .iv = 0, .lvl = 22, @@ -6965,7 +6351,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerJody[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerTammy[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ChannelerTammy[] = { { .iv = 0, .lvl = 23, @@ -6973,7 +6359,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerTammy[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerRuth[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ChannelerRuth[] = { { .iv = 0, .lvl = 22, @@ -6981,7 +6367,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerRuth[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerKarina[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ChannelerKarina[] = { { .iv = 0, .lvl = 24, @@ -6989,7 +6375,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerKarina[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerJanae[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ChannelerJanae[] = { { .iv = 0, .lvl = 22, @@ -6997,7 +6383,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerJanae[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerAngelica[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ChannelerAngelica[] = { { .iv = 0, .lvl = 22, @@ -7015,7 +6401,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerAngelica[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerEmilia[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ChannelerEmilia[] = { { .iv = 0, .lvl = 24, @@ -7023,7 +6409,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerEmilia[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerJennifer[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ChannelerJennifer[] = { { .iv = 0, .lvl = 24, @@ -7031,7 +6417,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerJennifer[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Channeler1[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_Channeler1[] = { { .iv = 0, .lvl = 23, @@ -7039,7 +6425,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Channeler1[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Channeler2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_Channeler2[] = { { .iv = 0, .lvl = 24, @@ -7047,7 +6433,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Channeler2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Channeler3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_Channeler3[] = { { .iv = 0, .lvl = 22, @@ -7055,7 +6441,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Channeler3[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Channeler4[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_Channeler4[] = { { .iv = 0, .lvl = 24, @@ -7063,7 +6449,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Channeler4[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Channeler5[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_Channeler5[] = { { .iv = 0, .lvl = 22, @@ -7071,7 +6457,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Channeler5[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Channeler6[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_Channeler6[] = { { .iv = 0, .lvl = 22, @@ -7089,7 +6475,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Channeler6[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Channeler7[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_Channeler7[] = { { .iv = 0, .lvl = 24, @@ -7097,7 +6483,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Channeler7[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Channeler8[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_Channeler8[] = { { .iv = 0, .lvl = 24, @@ -7105,7 +6491,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Channeler8[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerAmanda[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ChannelerAmanda[] = { { .iv = 0, .lvl = 34, @@ -7118,7 +6504,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerAmanda[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerStacy[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ChannelerStacy[] = { { .iv = 0, .lvl = 38, @@ -7126,7 +6512,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerStacy[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerTasha[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_ChannelerTasha[] = { { .iv = 0, .lvl = 33, @@ -7144,7 +6530,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_ChannelerTasha[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerJeremy[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_HikerJeremy[] = { { .iv = 0, .lvl = 20, @@ -7157,7 +6543,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerJeremy[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerAlma[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerAlma[] = { { .iv = 0, .lvl = 28, @@ -7175,7 +6561,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerAlma[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerSusie[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerSusie[] = { { .iv = 0, .lvl = 24, @@ -7203,7 +6589,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerSusie[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerValerie[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerValerie[] = { { .iv = 0, .lvl = 30, @@ -7216,7 +6602,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerValerie[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerGwen[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerGwen[] = { { .iv = 0, .lvl = 27, @@ -7239,7 +6625,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerGwen[] = }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerVirgil[] = { +static const struct TrainerMonNoItemCustomMoves sParty_BikerVirgil[] = { { .iv = 0, .lvl = 28, @@ -7260,7 +6646,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerVirgil[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperFlint[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CamperFlint[] = { { .iv = 0, .lvl = 14, @@ -7273,7 +6659,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperFlint[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerMissy[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerMissy[] = { { .iv = 0, .lvl = 31, @@ -7286,7 +6672,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerMissy[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerIrene[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerIrene[] = { { .iv = 0, .lvl = 30, @@ -7304,7 +6690,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerIrene[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerDana[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerDana[] = { { .iv = 0, .lvl = 20, @@ -7322,7 +6708,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerDana[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerAriana[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerAriana[] = { { .iv = 0, .lvl = 19, @@ -7345,7 +6731,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerAriana[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerLeah[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerLeah[] = { { .iv = 0, .lvl = 22, @@ -7358,7 +6744,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerLeah[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperJustin[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CamperJustin[] = { { .iv = 0, .lvl = 29, @@ -7371,7 +6757,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperJustin[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerYazmin[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerYazmin[] = { { .iv = 0, .lvl = 29, @@ -7389,7 +6775,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerYazmin[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerKindra[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerKindra[] = { { .iv = 0, .lvl = 28, @@ -7407,7 +6793,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerKindra[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerBecky[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerBecky[] = { { .iv = 0, .lvl = 29, @@ -7420,7 +6806,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerBecky[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerCelia[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerCelia[] = { { .iv = 0, .lvl = 33, @@ -7428,7 +6814,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerCelia[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GentlemanBrooks[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_GentlemanBrooks[] = { { .iv = 0, .lvl = 23, @@ -7436,7 +6822,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GentlemanBrooks[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GentlemanLamar[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_GentlemanLamar[] = { { .iv = 0, .lvl = 17, @@ -7449,7 +6835,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GentlemanLamar[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TwinsEliAnne[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TwinsEliAnne[] = { { .iv = 0, .lvl = 22, @@ -7462,7 +6848,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TwinsEliAnne[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CoolCoupleRayTyra[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CoolCoupleRayTyra[] = { { .iv = 100, .lvl = 45, @@ -7477,7 +6863,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CoolCoupleRayTyra[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungCoupleGiaJes[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungCoupleGiaJes[] = { { .iv = 0, .lvl = 24, @@ -7490,7 +6876,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungCoupleGiaJes[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TwinsKiriJan[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TwinsKiriJan[] = { { .iv = 0, .lvl = 29, @@ -7503,7 +6889,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TwinsKiriJan[] = { }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushKinRonMya[] = { +static const struct TrainerMonItemDefaultMoves sParty_CrushKinRonMya[] = { { .iv = 50, .lvl = 29, @@ -7518,7 +6904,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushKinRonMya[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungCoupleLeaJed[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungCoupleLeaJed[] = { { .iv = 0, .lvl = 29, @@ -7531,7 +6917,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungCoupleLeaJed[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SisAndBroLiaLuc[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SisAndBroLiaLuc[] = { { .iv = 0, .lvl = 30, @@ -7544,7 +6930,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SisAndBroLiaLuc[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SisAndBroLilIan[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SisAndBroLilIan[] = { { .iv = 0, .lvl = 33, @@ -7557,55 +6943,14 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SisAndBroLilIan[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcher3[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcher4[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcher5[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcher6[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcher7[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcher8[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcher3[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcher4[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcher5[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcher6[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcher7[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcher8[] = {DUMMY_TRAINER_MON}; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterBen3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterBen3[] = { { .iv = 60, .lvl = 28, @@ -7618,7 +6963,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterBen3[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterBen4[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterBen4[] = { { .iv = 120, .lvl = 48, @@ -7631,7 +6976,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterBen4[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterChad2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterChad2[] = { { .iv = 20, .lvl = 20, @@ -7644,7 +6989,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterChad2[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassReli2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassReli2[] = { { .iv = 20, .lvl = 20, @@ -7657,7 +7002,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassReli2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassReli3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassReli3[] = { { .iv = 60, .lvl = 28, @@ -7670,7 +7015,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassReli3[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterTimmy2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterTimmy2[] = { { .iv = 20, .lvl = 19, @@ -7688,7 +7033,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterTimmy2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterTimmy3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterTimmy3[] = { { .iv = 60, .lvl = 27, @@ -7706,7 +7051,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterTimmy3[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterTimmy4[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterTimmy4[] = { { .iv = 120, .lvl = 52, @@ -7724,7 +7069,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterTimmy4[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterChad3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterChad3[] = { { .iv = 60, .lvl = 28, @@ -7737,7 +7082,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterChad3[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassJanice2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassJanice2[] = { { .iv = 20, .lvl = 20, @@ -7750,7 +7095,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassJanice2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassJanice3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassJanice3[] = { { .iv = 60, .lvl = 28, @@ -7763,7 +7108,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassJanice3[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterChad4[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterChad4[] = { { .iv = 80, .lvl = 48, @@ -7776,7 +7121,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterChad4[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerFranklin2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_HikerFranklin2[] = { { .iv = 40, .lvl = 25, @@ -7789,47 +7134,13 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerFranklin2[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnProfProfOak[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; +static const struct TrainerMonNoItemDefaultMoves sParty_PkmnProfProfOak[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_PlayerBrendan[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_PlayerMay[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_PlayerRed[] = {DUMMY_TRAINER_MON}; +static const struct TrainerMonNoItemDefaultMoves sParty_PlayerLeaf[] = {DUMMY_TRAINER_MON}; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PlayerBrendan[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PlayerMay[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PlayerRed[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PlayerLeaf[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; - -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt42[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt42[] = { { .iv = 0, .lvl = 49, @@ -7842,7 +7153,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt42[ }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PsychicJaclyn[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PsychicJaclyn[] = { { .iv = 100, .lvl = 48, @@ -7863,7 +7174,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PsychicJaclyn[] = { }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushGirlSharon[] = { +static const struct TrainerMonItemDefaultMoves sParty_CrushGirlSharon[] = { { .iv = 50, .lvl = 37, @@ -7878,7 +7189,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushGirlSharon[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TuberAmira[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TuberAmira[] = { { .iv = 0, .lvl = 34, @@ -7896,7 +7207,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TuberAmira[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnBreederAlize[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PkmnBreederAlize[] = { { .iv = 30, .lvl = 48, @@ -7914,7 +7225,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnBreederAlize[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PkmnRangerNicolas[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PkmnRangerNicolas[] = { { .iv = 100, .lvl = 51, @@ -7929,7 +7240,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PkmnRangerNicolas[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PkmnRangerMadeline[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PkmnRangerMadeline[] = { { .iv = 100, .lvl = 51, @@ -7944,7 +7255,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PkmnRangerMadeline[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_AromaLadyNikki[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_AromaLadyNikki[] = { { .iv = 0, .lvl = 37, @@ -7957,7 +7268,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_AromaLadyNikki[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RuinManiacStanly[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RuinManiacStanly[] = { { .iv = 0, .lvl = 48, @@ -7975,7 +7286,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RuinManiacStanly[] }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_LadyJacki[] = { +static const struct TrainerMonItemDefaultMoves sParty_LadyJacki[] = { { .iv = 0, .lvl = 48, @@ -7990,7 +7301,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_LadyJacki[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PainterDaisy[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PainterDaisy[] = { { .iv = 50, .lvl = 50, @@ -7999,7 +7310,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PainterDaisy[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerGoon[] = { +static const struct TrainerMonNoItemCustomMoves sParty_BikerGoon[] = { { .iv = 0, .lvl = 37, @@ -8014,7 +7325,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerGoon[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerGoon2[] = { +static const struct TrainerMonNoItemCustomMoves sParty_BikerGoon2[] = { { .iv = 0, .lvl = 38, @@ -8023,7 +7334,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerGoon2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BikerGoon3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BikerGoon3[] = { { .iv = 0, .lvl = 38, @@ -8031,15 +7342,9 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BikerGoon3[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_Biker2[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_EKANS, - }, -}; +static const struct TrainerMonNoItemDefaultMoves sParty_Biker2[] = {DUMMY_TRAINER_MON}; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherAnthony[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherAnthony[] = { { .iv = 0, .lvl = 7, @@ -8052,7 +7357,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherAnthony[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherCharlie[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherCharlie[] = { { .iv = 0, .lvl = 7, @@ -8070,7 +7375,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherCharlie[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TwinsEliAnne2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TwinsEliAnne2[] = { { .iv = 60, .lvl = 28, @@ -8083,7 +7388,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TwinsEliAnne2[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterJohnson[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterJohnson[] = { { .iv = 0, .lvl = 33, @@ -8101,7 +7406,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterJohnson[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerRicardo[] = { +static const struct TrainerMonNoItemCustomMoves sParty_BikerRicardo[] = { { .iv = 0, .lvl = 22, @@ -8122,7 +7427,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_BikerRicardo[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BikerJaren[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BikerJaren[] = { { .iv = 0, .lvl = 24, @@ -8135,7 +7440,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BikerJaren[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt43[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt43[] = { { .iv = 0, .lvl = 37, @@ -8148,7 +7453,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt43[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt44[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt44[] = { { .iv = 0, .lvl = 35, @@ -8171,7 +7476,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt44[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt45[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt45[] = { { .iv = 0, .lvl = 38, @@ -8189,7 +7494,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt45[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt46[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt46[] = { { .iv = 0, .lvl = 48, @@ -8207,7 +7512,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt46[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt47[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt47[] = { { .iv = 0, .lvl = 48, @@ -8225,7 +7530,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt47[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt48[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt48[] = { { .iv = 0, .lvl = 49, @@ -8238,7 +7543,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt48[ }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_TeamRocketAdmin[] = { +static const struct TrainerMonNoItemCustomMoves sParty_TeamRocketAdmin[] = { { .iv = 150, .lvl = 52, @@ -8259,7 +7564,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_TeamRocketAdmin[] = }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_TeamRocketAdmin2[] = { +static const struct TrainerMonNoItemCustomMoves sParty_TeamRocketAdmin2[] = { { .iv = 200, .lvl = 53, @@ -8280,7 +7585,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_TeamRocketAdmin2[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_ScientistGideon[] = { +static const struct TrainerMonNoItemCustomMoves sParty_ScientistGideon[] = { { .iv = 0, .lvl = 46, @@ -8313,7 +7618,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_ScientistGideon[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleAmara[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerFemaleAmara[] = { { .iv = 0, .lvl = 36, @@ -8331,7 +7636,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleAmara }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleMaria[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerFemaleMaria[] = { { .iv = 0, .lvl = 37, @@ -8344,7 +7649,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleMaria }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleAbigail[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerFemaleAbigail[] = { { .iv = 0, .lvl = 35, @@ -8362,7 +7667,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleAbiga }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleFinn[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleFinn[] = { { .iv = 0, .lvl = 38, @@ -8370,7 +7675,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleFinn[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleGarrett[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleGarrett[] = { { .iv = 0, .lvl = 35, @@ -8388,7 +7693,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleGarrett }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanTommy[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_FishermanTommy[] = { { .iv = 0, .lvl = 33, @@ -8416,7 +7721,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanTommy[] = }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushGirlTanya[] = { +static const struct TrainerMonItemDefaultMoves sParty_CrushGirlTanya[] = { { .iv = 50, .lvl = 38, @@ -8431,7 +7736,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushGirlTanya[] = { }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltShea[] = { +static const struct TrainerMonItemDefaultMoves sParty_BlackBeltShea[] = { { .iv = 100, .lvl = 38, @@ -8446,7 +7751,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltShea[] = { }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltHugh[] = { +static const struct TrainerMonItemDefaultMoves sParty_BlackBeltHugh[] = { { .iv = 100, .lvl = 37, @@ -8461,7 +7766,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltHugh[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperBryce[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CamperBryce[] = { { .iv = 0, .lvl = 36, @@ -8479,7 +7784,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperBryce[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerClaire[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerClaire[] = { { .iv = 0, .lvl = 35, @@ -8502,7 +7807,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerClaire[] }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushKinMikKia[] = { +static const struct TrainerMonItemDefaultMoves sParty_CrushKinMikKia[] = { { .iv = 50, .lvl = 39, @@ -8517,7 +7822,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushKinMikKia[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_AromaLadyViolet[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_AromaLadyViolet[] = { { .iv = 0, .lvl = 36, @@ -8535,7 +7840,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_AromaLadyViolet[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TuberAlexis[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TuberAlexis[] = { { .iv = 0, .lvl = 34, @@ -8558,7 +7863,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TuberAlexis[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TwinsJoyMeg[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TwinsJoyMeg[] = { { .iv = 0, .lvl = 37, @@ -8571,7 +7876,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TwinsJoyMeg[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleTisha[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerFemaleTisha[] = { { .iv = 0, .lvl = 38, @@ -8579,7 +7884,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleTisha }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PainterCelina[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PainterCelina[] = { { .iv = 50, .lvl = 50, @@ -8588,7 +7893,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PainterCelina[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PainterRayna[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PainterRayna[] = { { .iv = 50, .lvl = 50, @@ -8597,7 +7902,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PainterRayna[] = { }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_LadyGillian[] = { +static const struct TrainerMonItemDefaultMoves sParty_LadyGillian[] = { { .iv = 0, .lvl = 47, @@ -8618,7 +7923,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_LadyGillian[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterDestin[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterDestin[] = { { .iv = 0, .lvl = 48, @@ -8631,7 +7936,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterDestin[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleToby[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleToby[] = { { .iv = 0, .lvl = 48, @@ -8649,7 +7954,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleToby[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt49[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt49[] = { { .iv = 0, .lvl = 48, @@ -8667,7 +7972,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt49[ }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_TeamRocketGrunt50[] = { +static const struct TrainerMonNoItemCustomMoves sParty_TeamRocketGrunt50[] = { { .iv = 0, .lvl = 49, @@ -8682,7 +7987,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_TeamRocketGrunt50[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt51[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TeamRocketGrunt51[] = { { .iv = 50, .lvl = 48, @@ -8700,7 +8005,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TeamRocketGrunt51[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperMilo[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperMilo[] = { { .iv = 0, .lvl = 47, @@ -8713,7 +8018,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperMilo[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperChaz[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperChaz[] = { { .iv = 0, .lvl = 47, @@ -8726,7 +8031,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperChaz[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperHarold[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperHarold[] = { { .iv = 0, .lvl = 47, @@ -8739,7 +8044,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperHarold[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanTylor[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_FishermanTylor[] = { { .iv = 0, .lvl = 49, @@ -8752,7 +8057,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanTylor[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleMymo[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleMymo[] = { { .iv = 0, .lvl = 49, @@ -8765,7 +8070,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleMymo[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleNicole[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerFemaleNicole[] = { { .iv = 0, .lvl = 50, @@ -8773,7 +8078,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleNicol }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SisAndBroAvaGeb[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SisAndBroAvaGeb[] = { { .iv = 0, .lvl = 50, @@ -8786,7 +8091,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SisAndBroAvaGeb[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_AromaLadyRose[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_AromaLadyRose[] = { { .iv = 0, .lvl = 49, @@ -8799,7 +8104,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_AromaLadyRose[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleSamir[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleSamir[] = { { .iv = 0, .lvl = 50, @@ -8807,7 +8112,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleSamir[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleDenise[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerFemaleDenise[] = { { .iv = 0, .lvl = 49, @@ -8820,7 +8125,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleDenis }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TwinsMiuMia[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TwinsMiuMia[] = { { .iv = 0, .lvl = 50, @@ -8833,7 +8138,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TwinsMiuMia[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerEarl[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_HikerEarl[] = { { .iv = 0, .lvl = 49, @@ -8846,7 +8151,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerEarl[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RuinManiacFoster[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RuinManiacFoster[] = { { .iv = 0, .lvl = 50, @@ -8854,7 +8159,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RuinManiacFoster[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RuinManiacLarry[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RuinManiacLarry[] = { { .iv = 0, .lvl = 49, @@ -8867,7 +8172,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RuinManiacLarry[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerDaryl[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_HikerDaryl[] = { { .iv = 0, .lvl = 50, @@ -8875,7 +8180,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerDaryl[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacHector[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PokemaniacHector[] = { { .iv = 30, .lvl = 49, @@ -8888,7 +8193,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacHector[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PsychicDario[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PsychicDario[] = { { .iv = 100, .lvl = 52, @@ -8897,7 +8202,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PsychicDario[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PsychicRodette[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PsychicRodette[] = { { .iv = 100, .lvl = 48, @@ -8918,7 +8223,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PsychicRodette[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_AromaLadyMiah[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_AromaLadyMiah[] = { { .iv = 0, .lvl = 50, @@ -8931,7 +8236,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_AromaLadyMiah[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungCoupleEveJon[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungCoupleEveJon[] = { { .iv = 0, .lvl = 50, @@ -8944,7 +8249,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungCoupleEveJon[ }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_JugglerMason[] = { +static const struct TrainerMonNoItemCustomMoves sParty_JugglerMason[] = { { .iv = 0, .lvl = 47, @@ -8971,7 +8276,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_JugglerMason[] = { }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushGirlCyndy[] = { +static const struct TrainerMonItemDefaultMoves sParty_CrushGirlCyndy[] = { { .iv = 50, .lvl = 48, @@ -8992,7 +8297,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushGirlCyndy[] = { }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushGirlJocelyn[] = { +static const struct TrainerMonItemDefaultMoves sParty_CrushGirlJocelyn[] = { { .iv = 50, .lvl = 38, @@ -9007,7 +8312,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushGirlJocelyn[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TamerEvan[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TamerEvan[] = { { .iv = 40, .lvl = 48, @@ -9025,7 +8330,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TamerEvan[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacMark2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PokemaniacMark2[] = { { .iv = 90, .lvl = 33, @@ -9038,7 +8343,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacMark2[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PkmnRangerLogan[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PkmnRangerLogan[] = { { .iv = 100, .lvl = 37, @@ -9053,7 +8358,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PkmnRangerLogan[] = }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PkmnRangerJackson[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PkmnRangerJackson[] = { { .iv = 100, .lvl = 49, @@ -9074,7 +8379,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PkmnRangerJackson[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnRangerBeth[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PkmnRangerBeth[] = { { .iv = 100, .lvl = 38, @@ -9092,7 +8397,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnRangerBeth[] = }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PkmnRangerKatelyn[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PkmnRangerKatelyn[] = { { .iv = 100, .lvl = 52, @@ -9101,7 +8406,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PkmnRangerKatelyn[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerLeroy[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerLeroy[] = { { .iv = 100, .lvl = 47, @@ -9134,7 +8439,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerLeroy[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerMichelle[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerMichelle[] = { { .iv = 100, .lvl = 47, @@ -9167,7 +8472,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerMichelle }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CoolCoupleLexNya[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CoolCoupleLexNya[] = { { .iv = 100, .lvl = 52, @@ -9182,7 +8487,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CoolCoupleLexNya[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RuinManiacBrandon[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RuinManiacBrandon[] = { { .iv = 0, .lvl = 50, @@ -9190,7 +8495,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RuinManiacBrandon[ }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_RuinManiacBenjamin[] = { +static const struct TrainerMonNoItemCustomMoves sParty_RuinManiacBenjamin[] = { { .iv = 0, .lvl = 48, @@ -9211,7 +8516,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_RuinManiacBenjamin[ }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PainterEdna[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PainterEdna[] = { { .iv = 50, .lvl = 50, @@ -9220,7 +8525,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PainterEdna[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GentlemanClifford[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_GentlemanClifford[] = { { .iv = 0, .lvl = 49, @@ -9233,7 +8538,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GentlemanClifford[ }, }; -static const struct TrainerMonItemCustomMoves sTrainerMons_LadySelphy[] = { +static const struct TrainerMonItemCustomMoves sParty_LadySelphy[] = { { .iv = 0, .lvl = 49, @@ -9250,7 +8555,7 @@ static const struct TrainerMonItemCustomMoves sTrainerMons_LadySelphy[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RuinManiacLawson[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RuinManiacLawson[] = { { .iv = 0, .lvl = 47, @@ -9268,7 +8573,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RuinManiacLawson[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PsychicLaura[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PsychicLaura[] = { { .iv = 100, .lvl = 48, @@ -9286,7 +8591,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PsychicLaura[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnBreederBethany[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PkmnBreederBethany[] = { { .iv = 30, .lvl = 50, @@ -9294,7 +8599,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnBreederBethany }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnBreederAllison[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PkmnBreederAllison[] = { { .iv = 30, .lvl = 48, @@ -9312,7 +8617,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnBreederAllison }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherGarret[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherGarret[] = { { .iv = 0, .lvl = 49, @@ -9320,7 +8625,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherGarret[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherJonah[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherJonah[] = { { .iv = 0, .lvl = 45, @@ -9343,7 +8648,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherJonah[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherVance[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherVance[] = { { .iv = 0, .lvl = 48, @@ -9356,7 +8661,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherVance[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterNash[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterNash[] = { { .iv = 0, .lvl = 47, @@ -9374,7 +8679,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterNash[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterCordell[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterCordell[] = { { .iv = 0, .lvl = 48, @@ -9387,7 +8692,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterCordell[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassDalia[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassDalia[] = { { .iv = 0, .lvl = 46, @@ -9410,7 +8715,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassDalia[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassJoana[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassJoana[] = { { .iv = 0, .lvl = 49, @@ -9418,7 +8723,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassJoana[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperRiley[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CamperRiley[] = { { .iv = 0, .lvl = 49, @@ -9431,7 +8736,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperRiley[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerMarcy[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerMarcy[] = { { .iv = 0, .lvl = 48, @@ -9449,7 +8754,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerMarcy[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RuinManiacLayton[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RuinManiacLayton[] = { { .iv = 0, .lvl = 48, @@ -9467,7 +8772,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RuinManiacLayton[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerKelsey2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerKelsey2[] = { { .iv = 20, .lvl = 21, @@ -9480,7 +8785,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerKelsey2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerKelsey3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerKelsey3[] = { { .iv = 60, .lvl = 29, @@ -9493,7 +8798,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerKelsey3[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerKelsey4[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerKelsey4[] = { { .iv = 80, .lvl = 49, @@ -9506,7 +8811,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerKelsey4[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperRicky2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CamperRicky2[] = { { .iv = 20, .lvl = 22, @@ -9514,7 +8819,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperRicky2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperRicky3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CamperRicky3[] = { { .iv = 60, .lvl = 30, @@ -9522,7 +8827,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperRicky3[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperRicky4[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CamperRicky4[] = { { .iv = 120, .lvl = 55, @@ -9530,7 +8835,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperRicky4[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperJeff2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CamperJeff2[] = { { .iv = 20, .lvl = 21, @@ -9543,7 +8848,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperJeff2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperJeff3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CamperJeff3[] = { { .iv = 60, .lvl = 29, @@ -9556,7 +8861,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperJeff3[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperJeff4[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CamperJeff4[] = { { .iv = 120, .lvl = 54, @@ -9569,7 +8874,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperJeff4[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerIsabelle2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerIsabelle2[] = { { .iv = 20, .lvl = 21, @@ -9587,7 +8892,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerIsabelle2 }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerIsabelle3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerIsabelle3[] = { { .iv = 60, .lvl = 29, @@ -9605,7 +8910,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerIsabelle3 }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerIsabelle4[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerIsabelle4[] = { { .iv = 80, .lvl = 47, @@ -9623,7 +8928,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerIsabelle4 }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterYasu2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterYasu2[] = { { .iv = 40, .lvl = 22, @@ -9641,7 +8946,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterYasu2[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterYasu3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterYasu3[] = { { .iv = 80, .lvl = 47, @@ -9659,7 +8964,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterYasu3[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_EngineerBernie2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_EngineerBernie2[] = { { .iv = 60, .lvl = 28, @@ -9677,7 +8982,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_EngineerBernie2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GamerDarian2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_GamerDarian2[] = { { .iv = 60, .lvl = 29, @@ -9690,7 +8995,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GamerDarian2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperChris2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CamperChris2[] = { { .iv = 40, .lvl = 24, @@ -9703,7 +9008,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperChris2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperChris3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CamperChris3[] = { { .iv = 60, .lvl = 29, @@ -9716,7 +9021,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperChris3[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperChris4[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CamperChris4[] = { { .iv = 120, .lvl = 54, @@ -9729,7 +9034,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CamperChris4[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerAlicia2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerAlicia2[] = { { .iv = 40, .lvl = 25, @@ -9737,7 +9042,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerAlicia2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerAlicia3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerAlicia3[] = { { .iv = 60, .lvl = 30, @@ -9745,7 +9050,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerAlicia3[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerAlicia4[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerAlicia4[] = { { .iv = 120, .lvl = 55, @@ -9753,7 +9058,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerAlicia4[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerJeremy2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_HikerJeremy2[] = { { .iv = 60, .lvl = 30, @@ -9766,7 +9071,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerJeremy2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacMark3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PokemaniacMark3[] = { { .iv = 150, .lvl = 54, @@ -9779,7 +9084,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacMark3[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacHerman2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PokemaniacHerman2[] = { { .iv = 90, .lvl = 29, @@ -9792,7 +9097,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacHerman2[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacHerman3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PokemaniacHerman3[] = { { .iv = 150, .lvl = 54, @@ -9805,7 +9110,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacHerman3[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerTrent2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_HikerTrent2[] = { { .iv = 60, .lvl = 31, @@ -9818,7 +9123,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerTrent2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassMegan2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassMegan2[] = { { .iv = 40, .lvl = 22, @@ -9846,7 +9151,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassMegan2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassMegan3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_LassMegan3[] = { { .iv = 80, .lvl = 46, @@ -9874,7 +9179,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_LassMegan3[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerdGlenn2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SuperNerdGlenn2[] = { { .iv = 60, .lvl = 28, @@ -9892,7 +9197,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SuperNerdGlenn2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GamerRich2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_GamerRich2[] = { { .iv = 60, .lvl = 30, @@ -9905,7 +9210,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_GamerRich2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BikerJaren2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BikerJaren2[] = { { .iv = 60, .lvl = 28, @@ -9918,7 +9223,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BikerJaren2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanElliot2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_FishermanElliot2[] = { { .iv = 60, .lvl = 28, @@ -9941,7 +9246,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanElliot2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RockerLuca2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RockerLuca2[] = { { .iv = 60, .lvl = 33, @@ -9954,7 +9259,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RockerLuca2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautySheila2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BeautySheila2[] = { { .iv = 80, .lvl = 49, @@ -9967,7 +9272,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautySheila2[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperRobert2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperRobert2[] = { { .iv = 60, .lvl = 28, @@ -9990,7 +9295,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperRobert2[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperRobert3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperRobert3[] = { { .iv = 80, .lvl = 47, @@ -10013,7 +9318,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperRobert3[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerSusie2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerSusie2[] = { { .iv = 60, .lvl = 27, @@ -10041,7 +9346,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerSusie2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerSusie3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerSusie3[] = { { .iv = 80, .lvl = 47, @@ -10069,7 +9374,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerSusie3[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerSusie4[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerSusie4[] = { { .iv = 120, .lvl = 52, @@ -10097,7 +9402,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerSusie4[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BikerLukas2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BikerLukas2[] = { { .iv = 80, .lvl = 47, @@ -10120,7 +9425,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BikerLukas2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperBenny2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperBenny2[] = { { .iv = 60, .lvl = 32, @@ -10133,7 +9438,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperBenny2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperBenny3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperBenny3[] = { { .iv = 80, .lvl = 49, @@ -10146,7 +9451,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperBenny3[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperMarlon2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperMarlon2[] = { { .iv = 60, .lvl = 30, @@ -10164,7 +9469,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperMarlon2[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperMarlon3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperMarlon3[] = { { .iv = 80, .lvl = 48, @@ -10182,7 +9487,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperMarlon3[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautyGrace2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BeautyGrace2[] = { { .iv = 80, .lvl = 49, @@ -10195,7 +9500,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BeautyGrace2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperChester2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperChester2[] = { { .iv = 60, .lvl = 30, @@ -10213,7 +9518,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperChester2 }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperChester3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperChester3[] = { { .iv = 80, .lvl = 48, @@ -10231,7 +9536,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperChester3 }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerBecky2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerBecky2[] = { { .iv = 60, .lvl = 32, @@ -10244,7 +9549,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerBecky2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerBecky3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerBecky3[] = { { .iv = 80, .lvl = 49, @@ -10257,7 +9562,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerBecky3[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerBecky4[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerBecky4[] = { { .iv = 120, .lvl = 54, @@ -10270,7 +9575,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerBecky4[] }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushKinRonMya2[] = { +static const struct TrainerMonItemDefaultMoves sParty_CrushKinRonMya2[] = { { .iv = 110, .lvl = 33, @@ -10285,7 +9590,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushKinRonMya2[] = }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushKinRonMya3[] = { +static const struct TrainerMonItemDefaultMoves sParty_CrushKinRonMya3[] = { { .iv = 130, .lvl = 51, @@ -10300,7 +9605,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushKinRonMya3[] = }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushKinRonMya4[] = { +static const struct TrainerMonItemDefaultMoves sParty_CrushKinRonMya4[] = { { .iv = 170, .lvl = 56, @@ -10315,7 +9620,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushKinRonMya4[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BikerRuben2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BikerRuben2[] = { { .iv = 80, .lvl = 48, @@ -10333,7 +9638,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BikerRuben2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallCamron2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CueBallCamron2[] = { { .iv = 80, .lvl = 49, @@ -10346,7 +9651,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallCamron2[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BikerJaxon2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BikerJaxon2[] = { { .iv = 80, .lvl = 49, @@ -10359,7 +9664,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BikerJaxon2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallIsaiah2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CueBallIsaiah2[] = { { .iv = 80, .lvl = 49, @@ -10372,7 +9677,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallIsaiah2[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallCorey2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CueBallCorey2[] = { { .iv = 80, .lvl = 49, @@ -10385,7 +9690,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallCorey2[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperJacob2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperJacob2[] = { { .iv = 60, .lvl = 28, @@ -10408,7 +9713,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperJacob2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperJacob3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperJacob3[] = { { .iv = 80, .lvl = 47, @@ -10431,7 +9736,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperJacob3[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleAlice2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerFemaleAlice2[] = { { .iv = 80, .lvl = 49, @@ -10444,7 +9749,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleAlice }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleDarrin2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleDarrin2[] = { { .iv = 120, .lvl = 52, @@ -10467,7 +9772,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleDarrin2 }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerMissy2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerMissy2[] = { { .iv = 80, .lvl = 49, @@ -10480,7 +9785,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerMissy2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerMissy3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PicnickerMissy3[] = { { .iv = 120, .lvl = 54, @@ -10493,7 +9798,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PicnickerMissy3[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanWade2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_FishermanWade2[] = { { .iv = 80, .lvl = 47, @@ -10526,7 +9831,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_FishermanWade2[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleJack2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleJack2[] = { { .iv = 80, .lvl = 50, @@ -10534,7 +9839,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleJack2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SisAndBroLilIan2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SisAndBroLilIan2[] = { { .iv = 80, .lvl = 50, @@ -10547,7 +9852,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SisAndBroLilIan2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SisAndBroLilIan3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SisAndBroLilIan3[] = { { .iv = 120, .lvl = 55, @@ -10560,7 +9865,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SisAndBroLilIan3[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleFinn2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleFinn2[] = { { .iv = 80, .lvl = 50, @@ -10568,7 +9873,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleFinn2[] }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushGirlSharon2[] = { +static const struct TrainerMonItemDefaultMoves sParty_CrushGirlSharon2[] = { { .iv = 130, .lvl = 50, @@ -10583,7 +9888,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushGirlSharon2[] = }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushGirlSharon3[] = { +static const struct TrainerMonItemDefaultMoves sParty_CrushGirlSharon3[] = { { .iv = 170, .lvl = 55, @@ -10598,7 +9903,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushGirlSharon3[] = }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushGirlTanya2[] = { +static const struct TrainerMonItemDefaultMoves sParty_CrushGirlTanya2[] = { { .iv = 130, .lvl = 50, @@ -10613,7 +9918,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushGirlTanya2[] = }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushGirlTanya3[] = { +static const struct TrainerMonItemDefaultMoves sParty_CrushGirlTanya3[] = { { .iv = 170, .lvl = 55, @@ -10628,7 +9933,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushGirlTanya3[] = }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltShea2[] = { +static const struct TrainerMonItemDefaultMoves sParty_BlackBeltShea2[] = { { .iv = 180, .lvl = 50, @@ -10643,7 +9948,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltShea2[] = { }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltShea3[] = { +static const struct TrainerMonItemDefaultMoves sParty_BlackBeltShea3[] = { { .iv = 220, .lvl = 55, @@ -10658,7 +9963,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltShea3[] = { }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltHugh2[] = { +static const struct TrainerMonItemDefaultMoves sParty_BlackBeltHugh2[] = { { .iv = 180, .lvl = 50, @@ -10673,7 +9978,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltHugh2[] = { }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltHugh3[] = { +static const struct TrainerMonItemDefaultMoves sParty_BlackBeltHugh3[] = { { .iv = 220, .lvl = 55, @@ -10688,7 +9993,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_BlackBeltHugh3[] = { }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushKinMikKia2[] = { +static const struct TrainerMonItemDefaultMoves sParty_CrushKinMikKia2[] = { { .iv = 130, .lvl = 51, @@ -10703,7 +10008,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushKinMikKia2[] = }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushKinMikKia3[] = { +static const struct TrainerMonItemDefaultMoves sParty_CrushKinMikKia3[] = { { .iv = 170, .lvl = 56, @@ -10718,7 +10023,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushKinMikKia3[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TuberAmira2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TuberAmira2[] = { { .iv = 80, .lvl = 47, @@ -10736,7 +10041,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TuberAmira2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TwinsJoyMeg2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TwinsJoyMeg2[] = { { .iv = 80, .lvl = 49, @@ -10749,7 +10054,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TwinsJoyMeg2[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PainterRayna2[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PainterRayna2[] = { { .iv = 120, .lvl = 54, @@ -10758,7 +10063,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PainterRayna2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterDestin2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterDestin2[] = { { .iv = 120, .lvl = 53, @@ -10771,7 +10076,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungsterDestin2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnBreederAlize2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PkmnBreederAlize2[] = { { .iv = 150, .lvl = 53, @@ -10789,7 +10094,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PkmnBreederAlize2[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungCoupleGiaJes2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungCoupleGiaJes2[] = { { .iv = 60, .lvl = 30, @@ -10802,7 +10107,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungCoupleGiaJes2 }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungCoupleGiaJes3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_YoungCoupleGiaJes3[] = { { .iv = 120, .lvl = 55, @@ -10815,7 +10120,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_YoungCoupleGiaJes3 }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperMilo2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperMilo2[] = { { .iv = 120, .lvl = 53, @@ -10828,7 +10133,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperMilo2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperChaz2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperChaz2[] = { { .iv = 120, .lvl = 53, @@ -10841,7 +10146,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperChaz2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperHarold2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BirdKeeperHarold2[] = { { .iv = 120, .lvl = 53, @@ -10854,7 +10159,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BirdKeeperHarold2[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleNicole2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerFemaleNicole2[] = { { .iv = 120, .lvl = 54, @@ -10862,7 +10167,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleNicol }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PsychicJaclyn2[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PsychicJaclyn2[] = { { .iv = 220, .lvl = 52, @@ -10883,7 +10188,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PsychicJaclyn2[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleSamir2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleSamir2[] = { { .iv = 120, .lvl = 55, @@ -10891,7 +10196,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleSamir2[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerEarl2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_HikerEarl2[] = { { .iv = 120, .lvl = 54, @@ -10904,7 +10209,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_HikerEarl2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RuinManiacLarry2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_RuinManiacLarry2[] = { { .iv = 120, .lvl = 54, @@ -10917,7 +10222,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_RuinManiacLarry2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacHector2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_PokemaniacHector2[] = { { .iv = 150, .lvl = 55, @@ -10930,7 +10235,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_PokemaniacHector2[ }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PsychicDario2[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PsychicDario2[] = { { .iv = 220, .lvl = 56, @@ -10939,7 +10244,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PsychicDario2[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PsychicRodette2[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PsychicRodette2[] = { { .iv = 220, .lvl = 53, @@ -10960,7 +10265,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PsychicRodette2[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_JugglerMason2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_JugglerMason2[] = { { .iv = 120, .lvl = 52, @@ -10983,7 +10288,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_JugglerMason2[] = }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PkmnRangerNicolas2[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PkmnRangerNicolas2[] = { { .iv = 220, .lvl = 55, @@ -10998,7 +10303,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PkmnRangerNicolas2[ }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PkmnRangerMadeline2[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PkmnRangerMadeline2[] = { { .iv = 220, .lvl = 55, @@ -11013,7 +10318,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PkmnRangerMadeline2 }, }; -static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushGirlCyndy2[] = { +static const struct TrainerMonItemDefaultMoves sParty_CrushGirlCyndy2[] = { { .iv = 170, .lvl = 54, @@ -11034,7 +10339,7 @@ static const struct TrainerMonItemDefaultMoves sTrainerMons_CrushGirlCyndy2[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TamerEvan2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_TamerEvan2[] = { { .iv = 160, .lvl = 52, @@ -11052,7 +10357,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_TamerEvan2[] = { }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PkmnRangerJackson2[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PkmnRangerJackson2[] = { { .iv = 220, .lvl = 53, @@ -11073,7 +10378,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PkmnRangerJackson2[ }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_PkmnRangerKatelyn2[] = { +static const struct TrainerMonNoItemCustomMoves sParty_PkmnRangerKatelyn2[] = { { .iv = 220, .lvl = 56, @@ -11082,7 +10387,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_PkmnRangerKatelyn2[ }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerLeroy2[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerLeroy2[] = { { .iv = 220, .lvl = 52, @@ -11115,7 +10420,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerLeroy2[] }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerMichelle2[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CooltrainerMichelle2[] = { { .iv = 220, .lvl = 53, @@ -11148,7 +10453,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CooltrainerMichelle }, }; -static const struct TrainerMonNoItemCustomMoves sTrainerMons_CoolCoupleLexNya2[] = { +static const struct TrainerMonNoItemCustomMoves sParty_CoolCoupleLexNya2[] = { { .iv = 220, .lvl = 57, @@ -11163,7 +10468,7 @@ static const struct TrainerMonNoItemCustomMoves sTrainerMons_CoolCoupleLexNya2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherColton2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherColton2[] = { { .iv = 20, .lvl = 19, @@ -11181,7 +10486,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherColton2[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherColton3[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherColton3[] = { { .iv = 60, .lvl = 27, @@ -11199,7 +10504,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherColton3[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherColton4[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherColton4[] = { { .iv = 120, .lvl = 51, @@ -11217,7 +10522,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_BugCatcherColton4[ }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleMatthew2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleMatthew2[] = { { .iv = 80, .lvl = 49, @@ -11230,7 +10535,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleMatthew }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleTony2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerMaleTony2[] = { { .iv = 80, .lvl = 49, @@ -11243,7 +10548,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerMaleTony2[] }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleMelissa2[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_SwimmerFemaleMelissa2[] = { { .iv = 80, .lvl = 49, @@ -11256,7 +10561,7 @@ static const struct TrainerMonNoItemDefaultMoves sTrainerMons_SwimmerFemaleMelis }, }; -static const struct TrainerMonItemCustomMoves sTrainerMons_EliteFourLorelei2[] = { +static const struct TrainerMonItemCustomMoves sParty_EliteFourLorelei2[] = { { .iv = 255, .lvl = 64, @@ -11294,7 +10599,7 @@ static const struct TrainerMonItemCustomMoves sTrainerMons_EliteFourLorelei2[] = }, }; -static const struct TrainerMonItemCustomMoves sTrainerMons_EliteFourBruno2[] = { +static const struct TrainerMonItemCustomMoves sParty_EliteFourBruno2[] = { { .iv = 255, .lvl = 65, @@ -11332,7 +10637,7 @@ static const struct TrainerMonItemCustomMoves sTrainerMons_EliteFourBruno2[] = { }, }; -static const struct TrainerMonItemCustomMoves sTrainerMons_EliteFourAgatha2[] = { +static const struct TrainerMonItemCustomMoves sParty_EliteFourAgatha2[] = { { .iv = 255, .lvl = 66, @@ -11370,7 +10675,7 @@ static const struct TrainerMonItemCustomMoves sTrainerMons_EliteFourAgatha2[] = }, }; -static const struct TrainerMonItemCustomMoves sTrainerMons_EliteFourLance2[] = { +static const struct TrainerMonItemCustomMoves sParty_EliteFourLance2[] = { { .iv = 255, .lvl = 68, @@ -11408,7 +10713,7 @@ static const struct TrainerMonItemCustomMoves sTrainerMons_EliteFourLance2[] = { }, }; -static const struct TrainerMonItemCustomMoves sTrainerMons_ChampionRematchSquirtle[] = { +static const struct TrainerMonItemCustomMoves sParty_ChampionRematchSquirtle[] = { { .iv = 255, .lvl = 72, @@ -11453,7 +10758,7 @@ static const struct TrainerMonItemCustomMoves sTrainerMons_ChampionRematchSquirt }, }; -static const struct TrainerMonItemCustomMoves sTrainerMons_ChampionRematchBulbasaur[] = { +static const struct TrainerMonItemCustomMoves sParty_ChampionRematchBulbasaur[] = { { .iv = 255, .lvl = 72, @@ -11498,7 +10803,7 @@ static const struct TrainerMonItemCustomMoves sTrainerMons_ChampionRematchBulbas }, }; -static const struct TrainerMonItemCustomMoves sTrainerMons_ChampionRematchCharmander[] = { +static const struct TrainerMonItemCustomMoves sParty_ChampionRematchCharmander[] = { { .iv = 255, .lvl = 72, @@ -11543,7 +10848,7 @@ static const struct TrainerMonItemCustomMoves sTrainerMons_ChampionRematchCharma }, }; -static const struct TrainerMonNoItemDefaultMoves sTrainerMons_CueBallPaxton[] = { +static const struct TrainerMonNoItemDefaultMoves sParty_CueBallPaxton[] = { { .iv = 50, .lvl = 39, diff --git a/src/data/trainers.h b/src/data/trainers.h index 95e1c5412..49bb15eab 100644 --- a/src/data/trainers.h +++ b/src/data/trainers.h @@ -1,8918 +1,8909 @@ const struct Trainer gTrainers[] = { [TRAINER_NONE] = { - .partyFlags = 0, - .trainerClass = CLASS_PKMN_TRAINER, - .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_AQUA_LEADER_ARCHIE, .trainerName = _(""), - .items = {}, - .doubleBattle = FALSE, - .aiFlags = 0, - .partySize = 0, - .party = {}, }, - [TRAINER_AQUA_LEADER_1] = { + [TRAINER_AQUA_LEADER] = { .partyFlags = 0, - .trainerClass = CLASS_AQUA_LEADER, + .trainerClass = TRAINER_CLASS_AQUA_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_AQUA_LEADER_ARCHIE, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_AquaLeader1), - .party = {.NoItemDefaultMoves = sTrainerMons_AquaLeader1} + .partySize = NELEMS(sParty_AquaLeader), + .party = {.NoItemDefaultMoves = sParty_AquaLeader} }, - [TRAINER_TEAM_AQUA_1] = { + [TRAINER_AQUA_GRUNT_M] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_AQUA, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamAqua1), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamAqua1} + .partySize = NELEMS(sParty_AquaGruntM), + .party = {.NoItemDefaultMoves = sParty_AquaGruntM} }, - [TRAINER_TEAM_AQUA_2] = { + [TRAINER_AQUA_GRUNT_F] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_AQUA, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_AQUA_GRUNT_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamAqua2), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamAqua2} + .partySize = NELEMS(sParty_AquaGruntF), + .party = {.NoItemDefaultMoves = sParty_AquaGruntF} }, - [TRAINER_AROMA_LADY_1] = { + [TRAINER_RS_AROMA_LADY] = { .partyFlags = 0, - .trainerClass = CLASS_AROMA_LADY, + .trainerClass = TRAINER_CLASS_RS_AROMA_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_AROMA_LADY, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_AromaLady1), - .party = {.NoItemDefaultMoves = sTrainerMons_AromaLady1} + .partySize = NELEMS(sParty_RSAromaLady), + .party = {.NoItemDefaultMoves = sParty_RSAromaLady} }, - [TRAINER_RUIN_MANIAC_1] = { + [TRAINER_RS_RUIN_MANIAC] = { .partyFlags = 0, - .trainerClass = CLASS_RUIN_MANIAC, + .trainerClass = TRAINER_CLASS_RS_RUIN_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RS_RUIN_MANIAC, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RuinManiac1), - .party = {.NoItemDefaultMoves = sTrainerMons_RuinManiac1} + .partySize = NELEMS(sParty_RSRuinManiac), + .party = {.NoItemDefaultMoves = sParty_RSRuinManiac} }, - [TRAINER_INTERVIEWER_1] = { + [TRAINER_INTERVIEWER] = { .partyFlags = 0, - .trainerClass = CLASS_INTERVIEWER, + .trainerClass = TRAINER_CLASS_INTERVIEWER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER, .trainerPic = TRAINER_PIC_INTERVIEWER, .trainerName = _(""), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Interviewer1), - .party = {.NoItemDefaultMoves = sTrainerMons_Interviewer1} + .partySize = NELEMS(sParty_Interviewer), + .party = {.NoItemDefaultMoves = sParty_Interviewer} }, - [TRAINER_TUBER_1] = { + [TRAINER_RS_TUBER_F] = { .partyFlags = 0, - .trainerClass = CLASS_TUBER, + .trainerClass = TRAINER_CLASS_RS_TUBER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_RS_TUBER_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Tuber1), - .party = {.NoItemDefaultMoves = sTrainerMons_Tuber1} + .partySize = NELEMS(sParty_RSTuberF), + .party = {.NoItemDefaultMoves = sParty_RSTuberF} }, - [TRAINER_TUBER_2] = { + [TRAINER_RS_TUBER_M] = { .partyFlags = 0, - .trainerClass = CLASS_TUBER_2, + .trainerClass = TRAINER_CLASS_RS_TUBER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_TUBER_M, + .trainerPic = TRAINER_PIC_RS_TUBER_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Tuber2), - .party = {.NoItemDefaultMoves = sTrainerMons_Tuber2} + .partySize = NELEMS(sParty_RSTuberM), + .party = {.NoItemDefaultMoves = sParty_RSTuberM} }, - [TRAINER_COOLTRAINER_1] = { + [TRAINER_RS_COOLTRAINER_M] = { .partyFlags = 0, - .trainerClass = CLASS_COOLTRAINER, + .trainerClass = TRAINER_CLASS_RS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_RS_COOLTRAINER_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_Cooltrainer1), - .party = {.NoItemDefaultMoves = sTrainerMons_Cooltrainer1} + .partySize = NELEMS(sParty_RSCooltrainerM), + .party = {.NoItemDefaultMoves = sParty_RSCooltrainerM} }, - [TRAINER_COOLTRAINER_2] = { + [TRAINER_RS_COOLTRAINER_F] = { .partyFlags = 0, - .trainerClass = CLASS_COOLTRAINER, + .trainerClass = TRAINER_CLASS_RS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_RS_COOLTRAINER_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_Cooltrainer2), - .party = {.NoItemDefaultMoves = sTrainerMons_Cooltrainer2} + .partySize = NELEMS(sParty_RSCooltrainerF), + .party = {.NoItemDefaultMoves = sParty_RSCooltrainerF} }, - [TRAINER_HEX_MANIAC_1] = { + [TRAINER_HEX_MANIAC] = { .partyFlags = 0, - .trainerClass = CLASS_HEX_MANIAC, + .trainerClass = TRAINER_CLASS_HEX_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_HEX_MANIAC, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HexManiac1), - .party = {.NoItemDefaultMoves = sTrainerMons_HexManiac1} + .partySize = NELEMS(sParty_HexManiac), + .party = {.NoItemDefaultMoves = sParty_HexManiac} }, - [TRAINER_LADY_1] = { + [TRAINER_RS_LADY] = { .partyFlags = 0, - .trainerClass = CLASS_LADY, + .trainerClass = TRAINER_CLASS_RS_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_LADY, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Lady1), - .party = {.NoItemDefaultMoves = sTrainerMons_Lady1} + .partySize = NELEMS(sParty_RSLady), + .party = {.NoItemDefaultMoves = sParty_RSLady} }, - [TRAINER_BEAUTY_1] = { + [TRAINER_RS_BEAUTY] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY, + .trainerClass = TRAINER_CLASS_RS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_BEAUTY, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Beauty1), - .party = {.NoItemDefaultMoves = sTrainerMons_Beauty1} + .partySize = NELEMS(sParty_RSBeauty), + .party = {.NoItemDefaultMoves = sParty_RSBeauty} }, - [TRAINER_RICH_BOY_1] = { + [TRAINER_RICH_BOY] = { .partyFlags = 0, - .trainerClass = CLASS_RICH_BOY, + .trainerClass = TRAINER_CLASS_RICH_BOY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_RICH_BOY, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RichBoy1), - .party = {.NoItemDefaultMoves = sTrainerMons_RichBoy1} + .partySize = NELEMS(sParty_RichBoy), + .party = {.NoItemDefaultMoves = sParty_RichBoy} }, - [TRAINER_POKEMANIAC_1] = { + [TRAINER_RS_POKEMANIAC] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC, + .trainerClass = TRAINER_CLASS_RS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_RS_POKEMANIAC, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Pokemaniac1), - .party = {.NoItemDefaultMoves = sTrainerMons_Pokemaniac1} + .partySize = NELEMS(sParty_RSPokemaniac), + .party = {.NoItemDefaultMoves = sParty_RSPokemaniac} }, - [TRAINER_SWIMMER_MALE_1] = { + [TRAINER_RS_SWIMMER_M] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE, + .trainerClass = TRAINER_CLASS_RS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_SWIMMER_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMale1), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMale1} + .partySize = NELEMS(sParty_RSSwimmerM), + .party = {.NoItemDefaultMoves = sParty_RSSwimmerM} }, - [TRAINER_BLACK_BELT_1] = { + [TRAINER_RS_BLACK_BELT] = { .partyFlags = 0, - .trainerClass = CLASS_BLACK_BELT, + .trainerClass = TRAINER_CLASS_RS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_RS_BLACK_BELT, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBelt1), - .party = {.NoItemDefaultMoves = sTrainerMons_BlackBelt1} + .partySize = NELEMS(sParty_RSBlackBelt), + .party = {.NoItemDefaultMoves = sParty_RSBlackBelt} }, - [TRAINER_GUITARIST_1] = { + [TRAINER_GUITARIST] = { .partyFlags = 0, - .trainerClass = CLASS_GUITARIST, + .trainerClass = TRAINER_CLASS_GUITARIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_GUITARIST, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Guitarist1), - .party = {.NoItemDefaultMoves = sTrainerMons_Guitarist1} + .partySize = NELEMS(sParty_Guitarist), + .party = {.NoItemDefaultMoves = sParty_Guitarist} }, - [TRAINER_KINDLER_1] = { + [TRAINER_KINDLER] = { .partyFlags = 0, - .trainerClass = CLASS_KINDLER, + .trainerClass = TRAINER_CLASS_KINDLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_KINDLER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Kindler1), - .party = {.NoItemDefaultMoves = sTrainerMons_Kindler1} + .partySize = NELEMS(sParty_Kindler), + .party = {.NoItemDefaultMoves = sParty_Kindler} }, - [TRAINER_CAMPER_1] = { + [TRAINER_RS_CAMPER] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER, + .trainerClass = TRAINER_CLASS_RS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_CAMPER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Camper1), - .party = {.NoItemDefaultMoves = sTrainerMons_Camper1} + .partySize = NELEMS(sParty_RSCamper), + .party = {.NoItemDefaultMoves = sParty_RSCamper} }, - [TRAINER_BUG_MANIAC_1] = { + [TRAINER_BUG_MANIAC] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_MANIAC, + .trainerClass = TRAINER_CLASS_BUG_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BUG_MANIAC, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugManiac1), - .party = {.NoItemDefaultMoves = sTrainerMons_BugManiac1} + .partySize = NELEMS(sParty_BugManiac), + .party = {.NoItemDefaultMoves = sParty_BugManiac} }, - [TRAINER_PSYCHIC_1] = { + [TRAINER_RS_PSYCHIC_M] = { .partyFlags = 0, - .trainerClass = CLASS_PSYCHIC, + .trainerClass = TRAINER_CLASS_RS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_RS_PSYCHIC_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Psychic1), - .party = {.NoItemDefaultMoves = sTrainerMons_Psychic1} + .partySize = NELEMS(sParty_RSPsychicM), + .party = {.NoItemDefaultMoves = sParty_RSPsychicM} }, - [TRAINER_PSYCHIC_2] = { + [TRAINER_RS_PSYCHIC_F] = { .partyFlags = 0, - .trainerClass = CLASS_PSYCHIC, + .trainerClass = TRAINER_CLASS_RS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_RS_PSYCHIC_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Psychic2), - .party = {.NoItemDefaultMoves = sTrainerMons_Psychic2} + .partySize = NELEMS(sParty_RSPsychicF), + .party = {.NoItemDefaultMoves = sParty_RSPsychicF} }, - [TRAINER_GENTLEMAN_1] = { + [TRAINER_RS_GENTLEMAN] = { .partyFlags = 0, - .trainerClass = CLASS_GENTLEMAN, + .trainerClass = TRAINER_CLASS_RS_GENTLEMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_RS_GENTLEMAN, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Gentleman1), - .party = {.NoItemDefaultMoves = sTrainerMons_Gentleman1} + .partySize = NELEMS(sParty_RSGentleman), + .party = {.NoItemDefaultMoves = sParty_RSGentleman} }, [TRAINER_ELITE_FOUR_SIDNEY] = { .partyFlags = 0, - .trainerClass = CLASS_ELITE_FOUR, + .trainerClass = TRAINER_CLASS_RS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_SIDNEY, .trainerName = _("SIDNEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_EliteFourSidney), - .party = {.NoItemDefaultMoves = sTrainerMons_EliteFourSidney} + .partySize = NELEMS(sParty_EliteFourSidney), + .party = {.NoItemDefaultMoves = sParty_EliteFourSidney} }, [TRAINER_ELITE_FOUR_PHOEBE] = { .partyFlags = 0, - .trainerClass = CLASS_ELITE_FOUR, + .trainerClass = TRAINER_CLASS_RS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_PHOEBE, .trainerName = _("PHOEBE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_EliteFourPhoebe), - .party = {.NoItemDefaultMoves = sTrainerMons_EliteFourPhoebe} + .partySize = NELEMS(sParty_EliteFourPhoebe), + .party = {.NoItemDefaultMoves = sParty_EliteFourPhoebe} }, [TRAINER_LEADER_ROXANNE] = { .partyFlags = 0, - .trainerClass = CLASS_LEADER, + .trainerClass = TRAINER_CLASS_RS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_LEADER_ROXANNE, .trainerName = _("ROXANNE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LeaderRoxanne), - .party = {.NoItemDefaultMoves = sTrainerMons_LeaderRoxanne} + .partySize = NELEMS(sParty_LeaderRoxanne), + .party = {.NoItemDefaultMoves = sParty_LeaderRoxanne} }, [TRAINER_LEADER_BRAWLY] = { .partyFlags = 0, - .trainerClass = CLASS_LEADER, + .trainerClass = TRAINER_CLASS_RS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_LEADER_BRAWLY, .trainerName = _("BRAWLY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LeaderBrawly), - .party = {.NoItemDefaultMoves = sTrainerMons_LeaderBrawly} + .partySize = NELEMS(sParty_LeaderBrawly), + .party = {.NoItemDefaultMoves = sParty_LeaderBrawly} }, [TRAINER_LEADER_TATE_LIZA] = { .partyFlags = 0, - .trainerClass = CLASS_LEADER, + .trainerClass = TRAINER_CLASS_RS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA, .trainerName = _("TATE&LIZA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LeaderTateLiza), - .party = {.NoItemDefaultMoves = sTrainerMons_LeaderTateLiza} + .partySize = NELEMS(sParty_LeaderTateLiza), + .party = {.NoItemDefaultMoves = sParty_LeaderTateLiza} }, - [TRAINER_SCHOOL_KID_1] = { + [TRAINER_SCHOOL_KID_M] = { .partyFlags = 0, - .trainerClass = CLASS_SCHOOL_KID, + .trainerClass = TRAINER_CLASS_SCHOOL_KID, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SCHOOL_KID_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SchoolKid1), - .party = {.NoItemDefaultMoves = sTrainerMons_SchoolKid1} + .partySize = NELEMS(sParty_SchoolKidM), + .party = {.NoItemDefaultMoves = sParty_SchoolKidM} }, - [TRAINER_SCHOOL_KID_2] = { + [TRAINER_SCHOOL_KID_F] = { .partyFlags = 0, - .trainerClass = CLASS_SCHOOL_KID, + .trainerClass = TRAINER_CLASS_SCHOOL_KID, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SCHOOL_KID_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SchoolKid2), - .party = {.NoItemDefaultMoves = sTrainerMons_SchoolKid2} + .partySize = NELEMS(sParty_SchoolKidF), + .party = {.NoItemDefaultMoves = sParty_SchoolKidF} }, - [TRAINER_SR_AND_JR_1] = { + [TRAINER_SR_AND_JR] = { .partyFlags = 0, - .trainerClass = CLASS_SR_AND_JR, + .trainerClass = TRAINER_CLASS_SR_AND_JR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_SR_AND_JR, .trainerName = _(""), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SrAndJr1), - .party = {.NoItemDefaultMoves = sTrainerMons_SrAndJr1} + .partySize = NELEMS(sParty_SrAndJr), + .party = {.NoItemDefaultMoves = sParty_SrAndJr} }, - [TRAINER_POKEFAN_1] = { + [TRAINER_POKEFAN_M] = { .partyFlags = 0, - .trainerClass = CLASS_POKEFAN, + .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_POKEFAN_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Pokefan1), - .party = {.NoItemDefaultMoves = sTrainerMons_Pokefan1} + .partySize = NELEMS(sParty_PokefanM), + .party = {.NoItemDefaultMoves = sParty_PokefanM} }, - [TRAINER_POKEFAN_2] = { + [TRAINER_POKEFAN_F] = { .partyFlags = 0, - .trainerClass = CLASS_POKEFAN, + .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Pokefan2), - .party = {.NoItemDefaultMoves = sTrainerMons_Pokefan2} + .partySize = NELEMS(sParty_PokefanF), + .party = {.NoItemDefaultMoves = sParty_PokefanF} }, - [TRAINER_EXPERT_1] = { + [TRAINER_EXPERT_M] = { .partyFlags = 0, - .trainerClass = CLASS_EXPERT, + .trainerClass = TRAINER_CLASS_EXPERT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_EXPERT_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Expert1), - .party = {.NoItemDefaultMoves = sTrainerMons_Expert1} + .partySize = NELEMS(sParty_ExpertM), + .party = {.NoItemDefaultMoves = sParty_ExpertM} }, - [TRAINER_EXPERT_2] = { + [TRAINER_EXPERT_F] = { .partyFlags = 0, - .trainerClass = CLASS_EXPERT, + .trainerClass = TRAINER_CLASS_EXPERT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_EXPERT_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Expert2), - .party = {.NoItemDefaultMoves = sTrainerMons_Expert2} + .partySize = NELEMS(sParty_ExpertF), + .party = {.NoItemDefaultMoves = sParty_ExpertF} }, - [TRAINER_YOUNGSTER_1] = { + [TRAINER_RS_YOUNGSTER] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER, + .trainerClass = TRAINER_CLASS_RS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_YOUNGSTER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Youngster1), - .party = {.NoItemDefaultMoves = sTrainerMons_Youngster1} + .partySize = NELEMS(sParty_RSYoungster), + .party = {.NoItemDefaultMoves = sParty_RSYoungster} }, - [TRAINER_CHAMPION_1] = { + [TRAINER_RS_CHAMPION] = { .partyFlags = 0, - .trainerClass = CLASS_CHAMPION, + .trainerClass = TRAINER_CLASS_RS_CHAMPION, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CHAMPION_STEVEN, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_Champion1), - .party = {.NoItemDefaultMoves = sTrainerMons_Champion1} + .partySize = NELEMS(sParty_RSChampion), + .party = {.NoItemDefaultMoves = sParty_RSChampion} }, - [TRAINER_FISHERMAN_1] = { + [TRAINER_RS_FISHERMAN] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN, + .trainerClass = TRAINER_CLASS_RS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RS_FISHERMAN, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Fisherman1), - .party = {.NoItemDefaultMoves = sTrainerMons_Fisherman1} + .partySize = NELEMS(sParty_RSFisherman), + .party = {.NoItemDefaultMoves = sParty_RSFisherman} }, - [TRAINER_TRIATHLETE_1] = { + [TRAINER_CYCLING_TRIATHLETE_M] = { .partyFlags = 0, - .trainerClass = CLASS_TRIATHLETE, + .trainerClass = TRAINER_CLASS_TRIATHLETE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Triathlete1), - .party = {.NoItemDefaultMoves = sTrainerMons_Triathlete1} + .partySize = NELEMS(sParty_CyclingTriathleteM), + .party = {.NoItemDefaultMoves = sParty_CyclingTriathleteM} }, - [TRAINER_TRIATHLETE_2] = { + [TRAINER_CYCLING_TRIATHLETE_F] = { .partyFlags = 0, - .trainerClass = CLASS_TRIATHLETE, + .trainerClass = TRAINER_CLASS_TRIATHLETE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Triathlete2), - .party = {.NoItemDefaultMoves = sTrainerMons_Triathlete2} + .partySize = NELEMS(sParty_CyclingTriathleteF), + .party = {.NoItemDefaultMoves = sParty_CyclingTriathleteF} }, - [TRAINER_TRIATHLETE_3] = { + [TRAINER_RUNNING_TRIATHLETE_M] = { .partyFlags = 0, - .trainerClass = CLASS_TRIATHLETE, + .trainerClass = TRAINER_CLASS_TRIATHLETE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Triathlete3), - .party = {.NoItemDefaultMoves = sTrainerMons_Triathlete3} + .partySize = NELEMS(sParty_RunningTriathleteM), + .party = {.NoItemDefaultMoves = sParty_RunningTriathleteM} }, - [TRAINER_TRIATHLETE_4] = { + [TRAINER_RUNNING_TRIATHLETE_F] = { .partyFlags = 0, - .trainerClass = CLASS_TRIATHLETE, + .trainerClass = TRAINER_CLASS_TRIATHLETE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Triathlete4), - .party = {.NoItemDefaultMoves = sTrainerMons_Triathlete4} + .partySize = NELEMS(sParty_RunningTriathleteF), + .party = {.NoItemDefaultMoves = sParty_RunningTriathleteF} }, - [TRAINER_TRIATHLETE_5] = { + [TRAINER_SWIMMING_TRIATHLETE_M] = { .partyFlags = 0, - .trainerClass = CLASS_TRIATHLETE, + .trainerClass = TRAINER_CLASS_TRIATHLETE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Triathlete5), - .party = {.NoItemDefaultMoves = sTrainerMons_Triathlete5} + .partySize = NELEMS(sParty_SwimmingTriathleteM), + .party = {.NoItemDefaultMoves = sParty_SwimmingTriathleteM} }, - [TRAINER_TRIATHLETE_6] = { + [TRAINER_SWIMMING_TRIATHLETE_F] = { .partyFlags = 0, - .trainerClass = CLASS_TRIATHLETE, + .trainerClass = TRAINER_CLASS_TRIATHLETE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Triathlete6), - .party = {.NoItemDefaultMoves = sTrainerMons_Triathlete6} + .partySize = NELEMS(sParty_SwimmingTriathleteF), + .party = {.NoItemDefaultMoves = sParty_SwimmingTriathleteF} }, - [TRAINER_DRAGON_TAMER_1] = { + [TRAINER_DRAGON_TAMER] = { .partyFlags = 0, - .trainerClass = CLASS_DRAGON_TAMER, + .trainerClass = TRAINER_CLASS_DRAGON_TAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_DRAGON_TAMER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_DragonTamer1), - .party = {.NoItemDefaultMoves = sTrainerMons_DragonTamer1} + .partySize = NELEMS(sParty_DragonTamer), + .party = {.NoItemDefaultMoves = sParty_DragonTamer} }, - [TRAINER_BIRD_KEEPER_1] = { + [TRAINER_RS_BIRD_KEEPER] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER, + .trainerClass = TRAINER_CLASS_RS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_RS_BIRD_KEEPER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeper1), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeper1} + .partySize = NELEMS(sParty_RSBirdKeeper), + .party = {.NoItemDefaultMoves = sParty_RSBirdKeeper} }, - [TRAINER_NINJA_BOY_1] = { + [TRAINER_NINJA_BOY] = { .partyFlags = 0, - .trainerClass = CLASS_NINJA_BOY, + .trainerClass = TRAINER_CLASS_NINJA_BOY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_NINJA_BOY, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_NinjaBoy1), - .party = {.NoItemDefaultMoves = sTrainerMons_NinjaBoy1} + .partySize = NELEMS(sParty_NinjaBoy), + .party = {.NoItemDefaultMoves = sParty_NinjaBoy} }, - [TRAINER_BATTLE_GIRL_1] = { + [TRAINER_BATTLE_GIRL] = { .partyFlags = 0, - .trainerClass = CLASS_BATTLE_GIRL, + .trainerClass = TRAINER_CLASS_BATTLE_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BATTLE_GIRL, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BattleGirl1), - .party = {.NoItemDefaultMoves = sTrainerMons_BattleGirl1} + .partySize = NELEMS(sParty_BattleGirl), + .party = {.NoItemDefaultMoves = sParty_BattleGirl} }, - [TRAINER_PARASOL_LADY_1] = { + [TRAINER_PARASOL_LADY] = { .partyFlags = 0, - .trainerClass = CLASS_PARASOL_LADY, + .trainerClass = TRAINER_CLASS_PARASOL_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_PARASOL_LADY, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ParasolLady1), - .party = {.NoItemDefaultMoves = sTrainerMons_ParasolLady1} + .partySize = NELEMS(sParty_ParasolLady), + .party = {.NoItemDefaultMoves = sParty_ParasolLady} }, - [TRAINER_SWIMMER_FEMALE_1] = { + [TRAINER_RS_SWIMMER_F] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE, + .trainerClass = TRAINER_CLASS_RS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_SWIMMER_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemale1), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemale1} + .partySize = NELEMS(sParty_RSSwimmerF), + .party = {.NoItemDefaultMoves = sParty_RSSwimmerF} }, - [TRAINER_PICNICKER_1] = { + [TRAINER_RS_PICNICKER] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER, + .trainerClass = TRAINER_CLASS_RS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_RS_PICNICKER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Picnicker1), - .party = {.NoItemDefaultMoves = sTrainerMons_Picnicker1} + .partySize = NELEMS(sParty_RSPicnicker), + .party = {.NoItemDefaultMoves = sParty_RSPicnicker} }, - [TRAINER_TWINS_1] = { + [TRAINER_RS_TWINS] = { .partyFlags = 0, - .trainerClass = CLASS_TWINS, + .trainerClass = TRAINER_CLASS_RS_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_RS_TWINS, .trainerName = _(""), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Twins1), - .party = {.NoItemDefaultMoves = sTrainerMons_Twins1} + .partySize = NELEMS(sParty_RSTwins), + .party = {.NoItemDefaultMoves = sParty_RSTwins} }, - [TRAINER_SAILOR_1] = { + [TRAINER_RS_SAILOR] = { .partyFlags = 0, - .trainerClass = CLASS_SAILOR, + .trainerClass = TRAINER_CLASS_RS_SAILOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_SAILOR, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Sailor1), - .party = {.NoItemDefaultMoves = sTrainerMons_Sailor1} + .partySize = NELEMS(sParty_RSSailor), + .party = {.NoItemDefaultMoves = sParty_RSSailor} }, - [TRAINER_BOARDER_1] = { + [TRAINER_BOARDER_M] = { .partyFlags = 0, - .trainerClass = CLASS_BOARDER, + .trainerClass = TRAINER_CLASS_BOARDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_YOUNGSTER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Boarder1), - .party = {.NoItemDefaultMoves = sTrainerMons_Boarder1} + .partySize = NELEMS(sParty_BoarderM), + .party = {.NoItemDefaultMoves = sParty_BoarderM} }, - [TRAINER_BOARDER_2] = { + [TRAINER_BOARDER_F] = { .partyFlags = 0, - .trainerClass = CLASS_BOARDER, + .trainerClass = TRAINER_CLASS_BOARDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_YOUNGSTER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Boarder2), - .party = {.NoItemDefaultMoves = sTrainerMons_Boarder2} + .partySize = NELEMS(sParty_BoarderF), + .party = {.NoItemDefaultMoves = sParty_BoarderF} }, - [TRAINER_COLLECTOR_1] = { + [TRAINER_COLLECTOR] = { .partyFlags = 0, - .trainerClass = CLASS_COLLECTOR, + .trainerClass = TRAINER_CLASS_COLLECTOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_COLLECTOR, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Collector1), - .party = {.NoItemDefaultMoves = sTrainerMons_Collector1} + .partySize = NELEMS(sParty_Collector), + .party = {.NoItemDefaultMoves = sParty_Collector} }, - [TRAINER_PKMN_TRAINER_2] = { + [TRAINER_WALLY] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_TRAINER_3, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_WALLY, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnTrainer2), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnTrainer2} + .partySize = NELEMS(sParty_Wally), + .party = {.NoItemDefaultMoves = sParty_Wally} }, - [TRAINER_PKMN_TRAINER_3] = { + [TRAINER_BRENDAN] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_TRAINER_3, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_BRENDAN_1, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnTrainer3), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnTrainer3} + .partySize = NELEMS(sParty_Brendan), + .party = {.NoItemDefaultMoves = sParty_Brendan} }, - [TRAINER_PKMN_TRAINER_4] = { + [TRAINER_BRENDAN_2] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_TRAINER_3, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_BRENDAN_1, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnTrainer4), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnTrainer4} + .partySize = NELEMS(sParty_Brendan2), + .party = {.NoItemDefaultMoves = sParty_Brendan2} }, - [TRAINER_PKMN_TRAINER_5] = { + [TRAINER_BRENDAN_3] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_TRAINER_3, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_BRENDAN_1, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnTrainer5), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnTrainer5} + .partySize = NELEMS(sParty_Brendan3), + .party = {.NoItemDefaultMoves = sParty_Brendan3} }, - [TRAINER_PKMN_TRAINER_6] = { + [TRAINER_MAY] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_TRAINER_3, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_MAY_1, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnTrainer6), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnTrainer6} + .partySize = NELEMS(sParty_May), + .party = {.NoItemDefaultMoves = sParty_May} }, - [TRAINER_PKMN_TRAINER_7] = { + [TRAINER_MAY_2] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_TRAINER_3, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_MAY_1, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnTrainer7), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnTrainer7} + .partySize = NELEMS(sParty_May2), + .party = {.NoItemDefaultMoves = sParty_May2} }, - [TRAINER_PKMN_TRAINER_8] = { + [TRAINER_MAY_3] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_TRAINER_3, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_MAY_1, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnTrainer8), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnTrainer8} + .partySize = NELEMS(sParty_May3), + .party = {.NoItemDefaultMoves = sParty_May3} }, - [TRAINER_PKMN_BREEDER_1] = { + [TRAINER_RS_PKMN_BREEDER_M] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_BREEDER, + .trainerClass = TRAINER_CLASS_RS_PKMN_BREEDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M, + .trainerPic = TRAINER_PIC_RS_POKEMON_BREEDER_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnBreeder1), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnBreeder1} + .partySize = NELEMS(sParty_RSPkmnBreederM), + .party = {.NoItemDefaultMoves = sParty_RSPkmnBreederM} }, - [TRAINER_PKMN_BREEDER_2] = { + [TRAINER_RS_PKMN_BREEDER_F] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_BREEDER, + .trainerClass = TRAINER_CLASS_RS_PKMN_BREEDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_POKEMON_BREEDER_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnBreeder2), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnBreeder2} + .partySize = NELEMS(sParty_RSPkmnBreederF), + .party = {.NoItemDefaultMoves = sParty_RSPkmnBreederF} }, - [TRAINER_PKMN_RANGER_1] = { + [TRAINER_RS_PKMN_RANGER_M] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_RANGER, + .trainerClass = TRAINER_CLASS_RS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_RS_POKEMON_RANGER_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRanger1), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnRanger1} + .partySize = NELEMS(sParty_RSPkmnRangerM), + .party = {.NoItemDefaultMoves = sParty_RSPkmnRangerM} }, - [TRAINER_PKMN_RANGER_2] = { + [TRAINER_RS_PKMN_RANGER_F] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_RANGER, + .trainerClass = TRAINER_CLASS_RS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_RS_POKEMON_RANGER_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRanger2), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnRanger2} + .partySize = NELEMS(sParty_RSPkmnRangerF), + .party = {.NoItemDefaultMoves = sParty_RSPkmnRangerF} }, - [TRAINER_MAGMA_LEADER_1] = { + [TRAINER_MAGMA_LEADER] = { .partyFlags = 0, - .trainerClass = CLASS_MAGMA_LEADER, + .trainerClass = TRAINER_CLASS_MAGMA_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, .trainerPic = TRAINER_PIC_MAGMA_LEADER_MAXIE, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_MagmaLeader1), - .party = {.NoItemDefaultMoves = sTrainerMons_MagmaLeader1} + .partySize = NELEMS(sParty_MagmaLeader), + .party = {.NoItemDefaultMoves = sParty_MagmaLeader} }, - [TRAINER_TEAM_MAGMA_1] = { + [TRAINER_MAGMA_GRUNT_M] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_MAGMA, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamMagma1), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamMagma1} + .partySize = NELEMS(sParty_MagmaGruntM), + .party = {.NoItemDefaultMoves = sParty_MagmaGruntM} }, - [TRAINER_TEAM_MAGMA_2] = { + [TRAINER_MAMGA_GRUNT_F] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_MAGMA, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, .trainerPic = TRAINER_PIC_MAGMA_GRUNT_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamMagma2), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamMagma2} + .partySize = NELEMS(sParty_MagmaGruntF), + .party = {.NoItemDefaultMoves = sParty_MagmaGruntF} }, - [TRAINER_LASS_1] = { + [TRAINER_RS_LASS] = { .partyFlags = 0, - .trainerClass = CLASS_LASS, + .trainerClass = TRAINER_CLASS_RS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_LASS, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Lass1), - .party = {.NoItemDefaultMoves = sTrainerMons_Lass1} + .partySize = NELEMS(sParty_RSLass), + .party = {.NoItemDefaultMoves = sParty_RSLass} }, - [TRAINER_BUG_CATCHER_1] = { + [TRAINER_RS_BUG_CATCHER] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER, + .trainerClass = TRAINER_CLASS_RS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcher1), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcher1} + .partySize = NELEMS(sParty_RSBugCatcher), + .party = {.NoItemDefaultMoves = sParty_RSBugCatcher} }, - [TRAINER_HIKER_1] = { + [TRAINER_RS_HIKER] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER, + .trainerClass = TRAINER_CLASS_RS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RS_HIKER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Hiker1), - .party = {.NoItemDefaultMoves = sTrainerMons_Hiker1} + .partySize = NELEMS(sParty_RSHiker), + .party = {.NoItemDefaultMoves = sParty_RSHiker} }, - [TRAINER_YOUNG_COUPLE_1] = { + [TRAINER_RS_YOUNG_COUPLE] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNG_COUPLE, + .trainerClass = TRAINER_CLASS_RS_YOUNG_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_RS_YOUNG_COUPLE, .trainerName = _(""), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungCouple1), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungCouple1} + .partySize = NELEMS(sParty_RSYoungCouple), + .party = {.NoItemDefaultMoves = sParty_RSYoungCouple} }, - [TRAINER_OLD_COUPLE_1] = { + [TRAINER_OLD_COUPLE] = { .partyFlags = 0, - .trainerClass = CLASS_OLD_COUPLE, + .trainerClass = TRAINER_CLASS_OLD_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_OLD_COUPLE, .trainerName = _(""), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_OldCouple1), - .party = {.NoItemDefaultMoves = sTrainerMons_OldCouple1} + .partySize = NELEMS(sParty_OldCouple), + .party = {.NoItemDefaultMoves = sParty_OldCouple} }, - [TRAINER_SIS_AND_BRO_1] = { + [TRAINER_RS_SIS_AND_BRO] = { .partyFlags = 0, - .trainerClass = CLASS_SIS_AND_BRO, + .trainerClass = TRAINER_CLASS_RS_SIS_AND_BRO, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_RS_SIS_AND_BRO, .trainerName = _(""), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SisAndBro1), - .party = {.NoItemDefaultMoves = sTrainerMons_SisAndBro1} + .partySize = NELEMS(sParty_RSSisAndBro), + .party = {.NoItemDefaultMoves = sParty_RSSisAndBro} }, [TRAINER_AQUA_ADMIN_MATT] = { .partyFlags = 0, - .trainerClass = CLASS_AQUA_ADMIN, + .trainerClass = TRAINER_CLASS_AQUA_ADMIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_AQUA_ADMIN_M, .trainerName = _("MATT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_AquaAdminMatt), - .party = {.NoItemDefaultMoves = sTrainerMons_AquaAdminMatt} + .partySize = NELEMS(sParty_AquaAdminMatt), + .party = {.NoItemDefaultMoves = sParty_AquaAdminMatt} }, [TRAINER_AQUA_ADMIN_SHELLY] = { .partyFlags = 0, - .trainerClass = CLASS_AQUA_ADMIN, + .trainerClass = TRAINER_CLASS_AQUA_ADMIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_AQUA_ADMIN_F, .trainerName = _("SHELLY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_AquaAdminShelly), - .party = {.NoItemDefaultMoves = sTrainerMons_AquaAdminShelly} + .partySize = NELEMS(sParty_AquaAdminShelly), + .party = {.NoItemDefaultMoves = sParty_AquaAdminShelly} }, [TRAINER_MAGMA_ADMIN_TABITHA] = { .partyFlags = 0, - .trainerClass = CLASS_MAGMA_ADMIN, + .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, .trainerPic = TRAINER_PIC_MAGMA_ADMIN_M, .trainerName = _("TABITHA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_MagmaAdminTabitha), - .party = {.NoItemDefaultMoves = sTrainerMons_MagmaAdminTabitha} + .partySize = NELEMS(sParty_MagmaAdminTabitha), + .party = {.NoItemDefaultMoves = sParty_MagmaAdminTabitha} }, [TRAINER_MAGMA_ADMIN_COURTNEY] = { .partyFlags = 0, - .trainerClass = CLASS_MAGMA_ADMIN, + .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, .trainerPic = TRAINER_PIC_MAGMA_ADMIN_F, .trainerName = _("COURTNEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_MagmaAdminCourtney), - .party = {.NoItemDefaultMoves = sTrainerMons_MagmaAdminCourtney} + .partySize = NELEMS(sParty_MagmaAdminCourtney), + .party = {.NoItemDefaultMoves = sParty_MagmaAdminCourtney} }, [TRAINER_LEADER_WATTSON] = { .partyFlags = 0, - .trainerClass = CLASS_LEADER, + .trainerClass = TRAINER_CLASS_RS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_LEADER_WATTSON, .trainerName = _("WATTSON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LeaderWattson), - .party = {.NoItemDefaultMoves = sTrainerMons_LeaderWattson} + .partySize = NELEMS(sParty_LeaderWattson), + .party = {.NoItemDefaultMoves = sParty_LeaderWattson} }, [TRAINER_LEADER_FLANNERY] = { .partyFlags = 0, - .trainerClass = CLASS_LEADER, + .trainerClass = TRAINER_CLASS_RS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_LEADER_FLANNERY, .trainerName = _("FLANNERY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LeaderFlannery), - .party = {.NoItemDefaultMoves = sTrainerMons_LeaderFlannery} + .partySize = NELEMS(sParty_LeaderFlannery), + .party = {.NoItemDefaultMoves = sParty_LeaderFlannery} }, [TRAINER_LEADER_NORMAN] = { .partyFlags = 0, - .trainerClass = CLASS_LEADER, + .trainerClass = TRAINER_CLASS_RS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_LEADER_NORMAN, .trainerName = _("NORMAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LeaderNorman), - .party = {.NoItemDefaultMoves = sTrainerMons_LeaderNorman} + .partySize = NELEMS(sParty_LeaderNorman), + .party = {.NoItemDefaultMoves = sParty_LeaderNorman} }, [TRAINER_LEADER_WINONA] = { .partyFlags = 0, - .trainerClass = CLASS_LEADER, + .trainerClass = TRAINER_CLASS_RS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_LEADER_WINONA, .trainerName = _("WINONA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LeaderWinona), - .party = {.NoItemDefaultMoves = sTrainerMons_LeaderWinona} + .partySize = NELEMS(sParty_LeaderWinona), + .party = {.NoItemDefaultMoves = sParty_LeaderWinona} }, [TRAINER_LEADER_WALLACE] = { .partyFlags = 0, - .trainerClass = CLASS_LEADER, + .trainerClass = TRAINER_CLASS_RS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_LEADER_WALLACE, .trainerName = _("WALLACE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LeaderWallace), - .party = {.NoItemDefaultMoves = sTrainerMons_LeaderWallace} + .partySize = NELEMS(sParty_LeaderWallace), + .party = {.NoItemDefaultMoves = sParty_LeaderWallace} }, [TRAINER_ELITE_FOUR_GLACIA] = { .partyFlags = 0, - .trainerClass = CLASS_ELITE_FOUR, + .trainerClass = TRAINER_CLASS_RS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_GLACIA, .trainerName = _("GLACIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_EliteFourGlacia), - .party = {.NoItemDefaultMoves = sTrainerMons_EliteFourGlacia} + .partySize = NELEMS(sParty_EliteFourGlacia), + .party = {.NoItemDefaultMoves = sParty_EliteFourGlacia} }, [TRAINER_ELITE_FOUR_DRAKE] = { .partyFlags = 0, - .trainerClass = CLASS_ELITE_FOUR, + .trainerClass = TRAINER_CLASS_RS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_DRAKE, .trainerName = _("DRAKE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_EliteFourDrake), - .party = {.NoItemDefaultMoves = sTrainerMons_EliteFourDrake} + .partySize = NELEMS(sParty_EliteFourDrake), + .party = {.NoItemDefaultMoves = sParty_EliteFourDrake} }, [TRAINER_YOUNGSTER_BEN] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("BEN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterBen), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterBen} + .partySize = NELEMS(sParty_YoungsterBen), + .party = {.NoItemDefaultMoves = sParty_YoungsterBen} }, [TRAINER_YOUNGSTER_CALVIN] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("CALVIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterCalvin), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterCalvin} + .partySize = NELEMS(sParty_YoungsterCalvin), + .party = {.NoItemDefaultMoves = sParty_YoungsterCalvin} }, [TRAINER_YOUNGSTER_JOSH] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("JOSH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterJosh), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterJosh} + .partySize = NELEMS(sParty_YoungsterJosh), + .party = {.NoItemDefaultMoves = sParty_YoungsterJosh} }, [TRAINER_YOUNGSTER_TIMMY] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("TIMMY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterTimmy), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterTimmy} + .partySize = NELEMS(sParty_YoungsterTimmy), + .party = {.NoItemDefaultMoves = sParty_YoungsterTimmy} }, [TRAINER_YOUNGSTER_JOEY] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("JOEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterJoey), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterJoey} + .partySize = NELEMS(sParty_YoungsterJoey), + .party = {.NoItemDefaultMoves = sParty_YoungsterJoey} }, [TRAINER_YOUNGSTER_DAN] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("DAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterDan), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterDan} + .partySize = NELEMS(sParty_YoungsterDan), + .party = {.NoItemDefaultMoves = sParty_YoungsterDan} }, [TRAINER_YOUNGSTER_CHAD] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("CHAD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterChad), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterChad} + .partySize = NELEMS(sParty_YoungsterChad), + .party = {.NoItemDefaultMoves = sParty_YoungsterChad} }, [TRAINER_YOUNGSTER_TYLER] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("TYLER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterTyler), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterTyler} + .partySize = NELEMS(sParty_YoungsterTyler), + .party = {.NoItemDefaultMoves = sParty_YoungsterTyler} }, [TRAINER_YOUNGSTER_EDDIE] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("EDDIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterEddie), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterEddie} + .partySize = NELEMS(sParty_YoungsterEddie), + .party = {.NoItemDefaultMoves = sParty_YoungsterEddie} }, [TRAINER_YOUNGSTER_DILLON] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("DILLON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterDillon), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterDillon} + .partySize = NELEMS(sParty_YoungsterDillon), + .party = {.NoItemDefaultMoves = sParty_YoungsterDillon} }, [TRAINER_YOUNGSTER_YASU] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("YASU"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterYasu), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterYasu} + .partySize = NELEMS(sParty_YoungsterYasu), + .party = {.NoItemDefaultMoves = sParty_YoungsterYasu} }, [TRAINER_YOUNGSTER_DAVE] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("DAVE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterDave), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterDave} + .partySize = NELEMS(sParty_YoungsterDave), + .party = {.NoItemDefaultMoves = sParty_YoungsterDave} }, [TRAINER_YOUNGSTER_BEN_2] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("BEN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterBen2), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterBen2} + .partySize = NELEMS(sParty_YoungsterBen2), + .party = {.NoItemDefaultMoves = sParty_YoungsterBen2} }, [TRAINER_BUG_CATCHER_RICK] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("RICK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherRick), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherRick} + .partySize = NELEMS(sParty_BugCatcherRick), + .party = {.NoItemDefaultMoves = sParty_BugCatcherRick} }, [TRAINER_BUG_CATCHER_DOUG] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("DOUG"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherDoug), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherDoug} + .partySize = NELEMS(sParty_BugCatcherDoug), + .party = {.NoItemDefaultMoves = sParty_BugCatcherDoug} }, [TRAINER_BUG_CATCHER_SAMMY] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("SAMMY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherSammy), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherSammy} + .partySize = NELEMS(sParty_BugCatcherSammy), + .party = {.NoItemDefaultMoves = sParty_BugCatcherSammy} }, [TRAINER_BUG_CATCHER_COLTON] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("COLTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherColton), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherColton} + .partySize = NELEMS(sParty_BugCatcherColton), + .party = {.NoItemDefaultMoves = sParty_BugCatcherColton} }, [TRAINER_BUG_CATCHER_GREG] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("GREG"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherGreg), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherGreg} + .partySize = NELEMS(sParty_BugCatcherGreg), + .party = {.NoItemDefaultMoves = sParty_BugCatcherGreg} }, [TRAINER_BUG_CATCHER_JAMES] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("JAMES"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherJames), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherJames} + .partySize = NELEMS(sParty_BugCatcherJames), + .party = {.NoItemDefaultMoves = sParty_BugCatcherJames} }, [TRAINER_BUG_CATCHER_KENT] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("KENT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherKent), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherKent} + .partySize = NELEMS(sParty_BugCatcherKent), + .party = {.NoItemDefaultMoves = sParty_BugCatcherKent} }, [TRAINER_BUG_CATCHER_ROBBY] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("ROBBY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherRobby), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherRobby} + .partySize = NELEMS(sParty_BugCatcherRobby), + .party = {.NoItemDefaultMoves = sParty_BugCatcherRobby} }, [TRAINER_BUG_CATCHER_CALE] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("CALE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherCale), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherCale} + .partySize = NELEMS(sParty_BugCatcherCale), + .party = {.NoItemDefaultMoves = sParty_BugCatcherCale} }, [TRAINER_BUG_CATCHER_KEIGO] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("KEIGO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherKeigo), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherKeigo} + .partySize = NELEMS(sParty_BugCatcherKeigo), + .party = {.NoItemDefaultMoves = sParty_BugCatcherKeigo} }, [TRAINER_BUG_CATCHER_ELIJAH] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("ELIJAH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherElijah), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherElijah} + .partySize = NELEMS(sParty_BugCatcherElijah), + .party = {.NoItemDefaultMoves = sParty_BugCatcherElijah} }, [TRAINER_BUG_CATCHER_2] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcher2), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcher2} + .partySize = NELEMS(sParty_BugCatcher2), + .party = {.NoItemDefaultMoves = sParty_BugCatcher2} }, [TRAINER_BUG_CATCHER_BRENT] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("BRENT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherBrent), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherBrent} + .partySize = NELEMS(sParty_BugCatcherBrent), + .party = {.NoItemDefaultMoves = sParty_BugCatcherBrent} }, [TRAINER_BUG_CATCHER_CONNER] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("CONNER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherConner), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherConner} + .partySize = NELEMS(sParty_BugCatcherConner), + .party = {.NoItemDefaultMoves = sParty_BugCatcherConner} }, [TRAINER_LASS_JANICE] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("JANICE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassJanice), - .party = {.NoItemDefaultMoves = sTrainerMons_LassJanice} + .partySize = NELEMS(sParty_LassJanice), + .party = {.NoItemDefaultMoves = sParty_LassJanice} }, [TRAINER_LASS_SALLY] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("SALLY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassSally), - .party = {.NoItemDefaultMoves = sTrainerMons_LassSally} + .partySize = NELEMS(sParty_LassSally), + .party = {.NoItemDefaultMoves = sParty_LassSally} }, [TRAINER_LASS_ROBIN] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("ROBIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassRobin), - .party = {.NoItemDefaultMoves = sTrainerMons_LassRobin} + .partySize = NELEMS(sParty_LassRobin), + .party = {.NoItemDefaultMoves = sParty_LassRobin} }, [TRAINER_LASS_CRISSY] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("CRISSY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassCrissy), - .party = {.NoItemDefaultMoves = sTrainerMons_LassCrissy} + .partySize = NELEMS(sParty_LassCrissy), + .party = {.NoItemDefaultMoves = sParty_LassCrissy} }, [TRAINER_LASS_MIRIAM] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("MIRIAM"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassMiriam), - .party = {.NoItemDefaultMoves = sTrainerMons_LassMiriam} + .partySize = NELEMS(sParty_LassMiriam), + .party = {.NoItemDefaultMoves = sParty_LassMiriam} }, [TRAINER_LASS_IRIS] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("IRIS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassIris), - .party = {.NoItemDefaultMoves = sTrainerMons_LassIris} + .partySize = NELEMS(sParty_LassIris), + .party = {.NoItemDefaultMoves = sParty_LassIris} }, [TRAINER_LASS_RELI] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("RELI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassReli), - .party = {.NoItemDefaultMoves = sTrainerMons_LassReli} + .partySize = NELEMS(sParty_LassReli), + .party = {.NoItemDefaultMoves = sParty_LassReli} }, [TRAINER_LASS_ALI] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("ALI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassAli), - .party = {.NoItemDefaultMoves = sTrainerMons_LassAli} + .partySize = NELEMS(sParty_LassAli), + .party = {.NoItemDefaultMoves = sParty_LassAli} }, [TRAINER_LASS_2] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Lass2), - .party = {.NoItemDefaultMoves = sTrainerMons_Lass2} + .partySize = NELEMS(sParty_Lass2), + .party = {.NoItemDefaultMoves = sParty_Lass2} }, [TRAINER_LASS_HALEY] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("HALEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassHaley), - .party = {.NoItemDefaultMoves = sTrainerMons_LassHaley} + .partySize = NELEMS(sParty_LassHaley), + .party = {.NoItemDefaultMoves = sParty_LassHaley} }, [TRAINER_LASS_ANN] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("ANN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassAnn), - .party = {.NoItemDefaultMoves = sTrainerMons_LassAnn} + .partySize = NELEMS(sParty_LassAnn), + .party = {.NoItemDefaultMoves = sParty_LassAnn} }, [TRAINER_LASS_DAWN] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("DAWN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassDawn), - .party = {.NoItemDefaultMoves = sTrainerMons_LassDawn} + .partySize = NELEMS(sParty_LassDawn), + .party = {.NoItemDefaultMoves = sParty_LassDawn} }, [TRAINER_LASS_PAIGE] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("PAIGE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassPaige), - .party = {.NoItemDefaultMoves = sTrainerMons_LassPaige} + .partySize = NELEMS(sParty_LassPaige), + .party = {.NoItemDefaultMoves = sParty_LassPaige} }, [TRAINER_LASS_ANDREA] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("ANDREA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassAndrea), - .party = {.NoItemDefaultMoves = sTrainerMons_LassAndrea} + .partySize = NELEMS(sParty_LassAndrea), + .party = {.NoItemDefaultMoves = sParty_LassAndrea} }, [TRAINER_LASS_MEGAN] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("MEGAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassMegan), - .party = {.NoItemDefaultMoves = sTrainerMons_LassMegan} + .partySize = NELEMS(sParty_LassMegan), + .party = {.NoItemDefaultMoves = sParty_LassMegan} }, [TRAINER_LASS_JULIA] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("JULIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassJulia), - .party = {.NoItemDefaultMoves = sTrainerMons_LassJulia} + .partySize = NELEMS(sParty_LassJulia), + .party = {.NoItemDefaultMoves = sParty_LassJulia} }, [TRAINER_LASS_KAY] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("KAY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassKay), - .party = {.NoItemDefaultMoves = sTrainerMons_LassKay} + .partySize = NELEMS(sParty_LassKay), + .party = {.NoItemDefaultMoves = sParty_LassKay} }, [TRAINER_LASS_LISA] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("LISA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassLisa), - .party = {.NoItemDefaultMoves = sTrainerMons_LassLisa} + .partySize = NELEMS(sParty_LassLisa), + .party = {.NoItemDefaultMoves = sParty_LassLisa} }, [TRAINER_SAILOR_EDMOND] = { .partyFlags = 0, - .trainerClass = CLASS_SAILOR_2, + .trainerClass = TRAINER_CLASS_SAILOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("EDMOND"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SailorEdmond), - .party = {.NoItemDefaultMoves = sTrainerMons_SailorEdmond} + .partySize = NELEMS(sParty_SailorEdmond), + .party = {.NoItemDefaultMoves = sParty_SailorEdmond} }, [TRAINER_SAILOR_TREVOR] = { .partyFlags = 0, - .trainerClass = CLASS_SAILOR_2, + .trainerClass = TRAINER_CLASS_SAILOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("TREVOR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SailorTrevor), - .party = {.NoItemDefaultMoves = sTrainerMons_SailorTrevor} + .partySize = NELEMS(sParty_SailorTrevor), + .party = {.NoItemDefaultMoves = sParty_SailorTrevor} }, [TRAINER_SAILOR_LEONARD] = { .partyFlags = 0, - .trainerClass = CLASS_SAILOR_2, + .trainerClass = TRAINER_CLASS_SAILOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("LEONARD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SailorLeonard), - .party = {.NoItemDefaultMoves = sTrainerMons_SailorLeonard} + .partySize = NELEMS(sParty_SailorLeonard), + .party = {.NoItemDefaultMoves = sParty_SailorLeonard} }, [TRAINER_SAILOR_DUNCAN] = { .partyFlags = 0, - .trainerClass = CLASS_SAILOR_2, + .trainerClass = TRAINER_CLASS_SAILOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("DUNCAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SailorDuncan), - .party = {.NoItemDefaultMoves = sTrainerMons_SailorDuncan} + .partySize = NELEMS(sParty_SailorDuncan), + .party = {.NoItemDefaultMoves = sParty_SailorDuncan} }, [TRAINER_SAILOR_HUEY] = { .partyFlags = 0, - .trainerClass = CLASS_SAILOR_2, + .trainerClass = TRAINER_CLASS_SAILOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("HUEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SailorHuey), - .party = {.NoItemDefaultMoves = sTrainerMons_SailorHuey} + .partySize = NELEMS(sParty_SailorHuey), + .party = {.NoItemDefaultMoves = sParty_SailorHuey} }, [TRAINER_SAILOR_DYLAN] = { .partyFlags = 0, - .trainerClass = CLASS_SAILOR_2, + .trainerClass = TRAINER_CLASS_SAILOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("DYLAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SailorDylan), - .party = {.NoItemDefaultMoves = sTrainerMons_SailorDylan} + .partySize = NELEMS(sParty_SailorDylan), + .party = {.NoItemDefaultMoves = sParty_SailorDylan} }, [TRAINER_SAILOR_PHILLIP] = { .partyFlags = 0, - .trainerClass = CLASS_SAILOR_2, + .trainerClass = TRAINER_CLASS_SAILOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("PHILLIP"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SailorPhillip), - .party = {.NoItemDefaultMoves = sTrainerMons_SailorPhillip} + .partySize = NELEMS(sParty_SailorPhillip), + .party = {.NoItemDefaultMoves = sParty_SailorPhillip} }, [TRAINER_SAILOR_DWAYNE] = { .partyFlags = 0, - .trainerClass = CLASS_SAILOR_2, + .trainerClass = TRAINER_CLASS_SAILOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("DWAYNE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SailorDwayne), - .party = {.NoItemDefaultMoves = sTrainerMons_SailorDwayne} + .partySize = NELEMS(sParty_SailorDwayne), + .party = {.NoItemDefaultMoves = sParty_SailorDwayne} }, [TRAINER_CAMPER_LIAM] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("LIAM"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperLiam), - .party = {.NoItemCustomMoves = sTrainerMons_CamperLiam} + .partySize = NELEMS(sParty_CamperLiam), + .party = {.NoItemCustomMoves = sParty_CamperLiam} }, [TRAINER_CAMPER_SHANE] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("SHANE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperShane), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperShane} + .partySize = NELEMS(sParty_CamperShane), + .party = {.NoItemDefaultMoves = sParty_CamperShane} }, [TRAINER_CAMPER_ETHAN] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("ETHAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperEthan), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperEthan} + .partySize = NELEMS(sParty_CamperEthan), + .party = {.NoItemDefaultMoves = sParty_CamperEthan} }, [TRAINER_CAMPER_RICKY] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("RICKY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperRicky), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperRicky} + .partySize = NELEMS(sParty_CamperRicky), + .party = {.NoItemDefaultMoves = sParty_CamperRicky} }, [TRAINER_CAMPER_JEFF] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("JEFF"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperJeff), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperJeff} + .partySize = NELEMS(sParty_CamperJeff), + .party = {.NoItemDefaultMoves = sParty_CamperJeff} }, [TRAINER_CAMPER_2] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Camper2), - .party = {.NoItemDefaultMoves = sTrainerMons_Camper2} + .partySize = NELEMS(sParty_Camper2), + .party = {.NoItemDefaultMoves = sParty_Camper2} }, [TRAINER_CAMPER_CHRIS] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("CHRIS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperChris), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperChris} + .partySize = NELEMS(sParty_CamperChris), + .party = {.NoItemDefaultMoves = sParty_CamperChris} }, [TRAINER_CAMPER_DREW] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("DREW"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperDrew), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperDrew} + .partySize = NELEMS(sParty_CamperDrew), + .party = {.NoItemDefaultMoves = sParty_CamperDrew} }, [TRAINER_PICNICKER_DIANA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("DIANA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerDiana), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerDiana} + .partySize = NELEMS(sParty_PicnickerDiana), + .party = {.NoItemDefaultMoves = sParty_PicnickerDiana} }, [TRAINER_PICNICKER_NANCY] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("NANCY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerNancy), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerNancy} + .partySize = NELEMS(sParty_PicnickerNancy), + .party = {.NoItemDefaultMoves = sParty_PicnickerNancy} }, [TRAINER_PICNICKER_ISABELLE] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ISABELLE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerIsabelle), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerIsabelle} + .partySize = NELEMS(sParty_PicnickerIsabelle), + .party = {.NoItemDefaultMoves = sParty_PicnickerIsabelle} }, [TRAINER_PICNICKER_KELSEY] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("KELSEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerKelsey), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerKelsey} + .partySize = NELEMS(sParty_PicnickerKelsey), + .party = {.NoItemDefaultMoves = sParty_PicnickerKelsey} }, [TRAINER_PICNICKER_ALICIA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ALICIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerAlicia), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerAlicia} + .partySize = NELEMS(sParty_PicnickerAlicia), + .party = {.NoItemDefaultMoves = sParty_PicnickerAlicia} }, [TRAINER_PICNICKER_CAITLIN] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("CAITLIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerCaitlin), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerCaitlin} + .partySize = NELEMS(sParty_PicnickerCaitlin), + .party = {.NoItemDefaultMoves = sParty_PicnickerCaitlin} }, [TRAINER_PICNICKER_HEIDI] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("HEIDI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerHeidi), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerHeidi} + .partySize = NELEMS(sParty_PicnickerHeidi), + .party = {.NoItemDefaultMoves = sParty_PicnickerHeidi} }, [TRAINER_PICNICKER_CAROL] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("CAROL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerCarol), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerCarol} + .partySize = NELEMS(sParty_PicnickerCarol), + .party = {.NoItemDefaultMoves = sParty_PicnickerCarol} }, [TRAINER_PICNICKER_SOFIA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("SOFIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerSofia), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerSofia} + .partySize = NELEMS(sParty_PicnickerSofia), + .party = {.NoItemDefaultMoves = sParty_PicnickerSofia} }, [TRAINER_PICNICKER_MARTHA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("MARTHA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerMartha), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerMartha} + .partySize = NELEMS(sParty_PicnickerMartha), + .party = {.NoItemDefaultMoves = sParty_PicnickerMartha} }, [TRAINER_PICNICKER_TINA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("TINA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerTina), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerTina} + .partySize = NELEMS(sParty_PicnickerTina), + .party = {.NoItemDefaultMoves = sParty_PicnickerTina} }, [TRAINER_PICNICKER_HANNAH] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("HANNAH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerHannah), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerHannah} + .partySize = NELEMS(sParty_PicnickerHannah), + .party = {.NoItemDefaultMoves = sParty_PicnickerHannah} }, [TRAINER_POKEMANIAC_MARK] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("MARK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacMark), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacMark} + .partySize = NELEMS(sParty_PokemaniacMark), + .party = {.NoItemDefaultMoves = sParty_PokemaniacMark} }, [TRAINER_POKEMANIAC_HERMAN] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("HERMAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacHerman), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacHerman} + .partySize = NELEMS(sParty_PokemaniacHerman), + .party = {.NoItemDefaultMoves = sParty_PokemaniacHerman} }, [TRAINER_POKEMANIAC_COOPER] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("COOPER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacCooper), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacCooper} + .partySize = NELEMS(sParty_PokemaniacCooper), + .party = {.NoItemDefaultMoves = sParty_PokemaniacCooper} }, [TRAINER_POKEMANIAC_STEVE] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("STEVE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacSteve), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacSteve} + .partySize = NELEMS(sParty_PokemaniacSteve), + .party = {.NoItemDefaultMoves = sParty_PokemaniacSteve} }, [TRAINER_POKEMANIAC_WINSTON] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("WINSTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacWinston), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacWinston} + .partySize = NELEMS(sParty_PokemaniacWinston), + .party = {.NoItemDefaultMoves = sParty_PokemaniacWinston} }, [TRAINER_POKEMANIAC_DAWSON] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("DAWSON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacDawson), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacDawson} + .partySize = NELEMS(sParty_PokemaniacDawson), + .party = {.NoItemDefaultMoves = sParty_PokemaniacDawson} }, [TRAINER_POKEMANIAC_ASHTON] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("ASHTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacAshton), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacAshton} + .partySize = NELEMS(sParty_PokemaniacAshton), + .party = {.NoItemDefaultMoves = sParty_PokemaniacAshton} }, [TRAINER_SUPER_NERD_JOVAN] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("JOVAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdJovan), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerdJovan} + .partySize = NELEMS(sParty_SuperNerdJovan), + .party = {.NoItemDefaultMoves = sParty_SuperNerdJovan} }, [TRAINER_SUPER_NERD_MIGUEL] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("MIGUEL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdMiguel), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerdMiguel} + .partySize = NELEMS(sParty_SuperNerdMiguel), + .party = {.NoItemDefaultMoves = sParty_SuperNerdMiguel} }, [TRAINER_SUPER_NERD_AIDAN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("AIDAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdAidan), - .party = {.NoItemCustomMoves = sTrainerMons_SuperNerdAidan} + .partySize = NELEMS(sParty_SuperNerdAidan), + .party = {.NoItemCustomMoves = sParty_SuperNerdAidan} }, [TRAINER_SUPER_NERD_GLENN] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("GLENN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdGlenn), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerdGlenn} + .partySize = NELEMS(sParty_SuperNerdGlenn), + .party = {.NoItemDefaultMoves = sParty_SuperNerdGlenn} }, [TRAINER_SUPER_NERD_LESLIE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("LESLIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdLeslie), - .party = {.NoItemCustomMoves = sTrainerMons_SuperNerdLeslie} + .partySize = NELEMS(sParty_SuperNerdLeslie), + .party = {.NoItemCustomMoves = sParty_SuperNerdLeslie} }, [TRAINER_SUPER_NERD_1] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerd1), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerd1} + .partySize = NELEMS(sParty_SuperNerd1), + .party = {.NoItemDefaultMoves = sParty_SuperNerd1} }, [TRAINER_SUPER_NERD_2] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerd2), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerd2} + .partySize = NELEMS(sParty_SuperNerd2), + .party = {.NoItemDefaultMoves = sParty_SuperNerd2} }, [TRAINER_SUPER_NERD_3] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerd3), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerd3} + .partySize = NELEMS(sParty_SuperNerd3), + .party = {.NoItemDefaultMoves = sParty_SuperNerd3} }, [TRAINER_SUPER_NERD_ERIK] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("ERIK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdErik), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerdErik} + .partySize = NELEMS(sParty_SuperNerdErik), + .party = {.NoItemDefaultMoves = sParty_SuperNerdErik} }, [TRAINER_SUPER_NERD_AVERY] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("AVERY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdAvery), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerdAvery} + .partySize = NELEMS(sParty_SuperNerdAvery), + .party = {.NoItemDefaultMoves = sParty_SuperNerdAvery} }, [TRAINER_SUPER_NERD_DEREK] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("DEREK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdDerek), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerdDerek} + .partySize = NELEMS(sParty_SuperNerdDerek), + .party = {.NoItemDefaultMoves = sParty_SuperNerdDerek} }, [TRAINER_SUPER_NERD_ZAC] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("ZAC"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdZac), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerdZac} + .partySize = NELEMS(sParty_SuperNerdZac), + .party = {.NoItemDefaultMoves = sParty_SuperNerdZac} }, [TRAINER_HIKER_MARCOS] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("MARCOS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerMarcos), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerMarcos} + .partySize = NELEMS(sParty_HikerMarcos), + .party = {.NoItemDefaultMoves = sParty_HikerMarcos} }, [TRAINER_HIKER_FRANKLIN] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("FRANKLIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerFranklin), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerFranklin} + .partySize = NELEMS(sParty_HikerFranklin), + .party = {.NoItemDefaultMoves = sParty_HikerFranklin} }, [TRAINER_HIKER_NOB] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("NOB"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerNob), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerNob} + .partySize = NELEMS(sParty_HikerNob), + .party = {.NoItemDefaultMoves = sParty_HikerNob} }, [TRAINER_HIKER_WAYNE] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("WAYNE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerWayne), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerWayne} + .partySize = NELEMS(sParty_HikerWayne), + .party = {.NoItemDefaultMoves = sParty_HikerWayne} }, [TRAINER_HIKER_ALAN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("ALAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerAlan), - .party = {.NoItemCustomMoves = sTrainerMons_HikerAlan} + .partySize = NELEMS(sParty_HikerAlan), + .party = {.NoItemCustomMoves = sParty_HikerAlan} }, [TRAINER_HIKER_BRICE] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("BRICE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerBrice), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerBrice} + .partySize = NELEMS(sParty_HikerBrice), + .party = {.NoItemDefaultMoves = sParty_HikerBrice} }, [TRAINER_HIKER_CLARK] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("CLARK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerClark), - .party = {.NoItemCustomMoves = sTrainerMons_HikerClark} + .partySize = NELEMS(sParty_HikerClark), + .party = {.NoItemCustomMoves = sParty_HikerClark} }, [TRAINER_HIKER_TRENT] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("TRENT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerTrent), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerTrent} + .partySize = NELEMS(sParty_HikerTrent), + .party = {.NoItemDefaultMoves = sParty_HikerTrent} }, [TRAINER_HIKER_DUDLEY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("DUDLEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerDudley), - .party = {.NoItemCustomMoves = sTrainerMons_HikerDudley} + .partySize = NELEMS(sParty_HikerDudley), + .party = {.NoItemCustomMoves = sParty_HikerDudley} }, [TRAINER_HIKER_ALLEN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("ALLEN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerAllen), - .party = {.NoItemCustomMoves = sTrainerMons_HikerAllen} + .partySize = NELEMS(sParty_HikerAllen), + .party = {.NoItemCustomMoves = sParty_HikerAllen} }, [TRAINER_HIKER_ERIC] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("ERIC"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerEric), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerEric} + .partySize = NELEMS(sParty_HikerEric), + .party = {.NoItemDefaultMoves = sParty_HikerEric} }, [TRAINER_HIKER_LENNY] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("LENNY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerLenny), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerLenny} + .partySize = NELEMS(sParty_HikerLenny), + .party = {.NoItemDefaultMoves = sParty_HikerLenny} }, [TRAINER_HIKER_OLIVER] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("OLIVER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerOliver), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerOliver} + .partySize = NELEMS(sParty_HikerOliver), + .party = {.NoItemDefaultMoves = sParty_HikerOliver} }, [TRAINER_HIKER_LUCAS] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("LUCAS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerLucas), - .party = {.NoItemCustomMoves = sTrainerMons_HikerLucas} + .partySize = NELEMS(sParty_HikerLucas), + .party = {.NoItemCustomMoves = sParty_HikerLucas} }, [TRAINER_BIKER_JARED] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("JARED"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerJared), - .party = {.NoItemCustomMoves = sTrainerMons_BikerJared} + .partySize = NELEMS(sParty_BikerJared), + .party = {.NoItemCustomMoves = sParty_BikerJared} }, [TRAINER_BIKER_MALIK] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("MALIK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerMalik), - .party = {.NoItemCustomMoves = sTrainerMons_BikerMalik} + .partySize = NELEMS(sParty_BikerMalik), + .party = {.NoItemCustomMoves = sParty_BikerMalik} }, [TRAINER_BIKER_ERNEST] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("ERNEST"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerErnest), - .party = {.NoItemCustomMoves = sTrainerMons_BikerErnest} + .partySize = NELEMS(sParty_BikerErnest), + .party = {.NoItemCustomMoves = sParty_BikerErnest} }, [TRAINER_BIKER_ALEX] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("ALEX"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerAlex), - .party = {.NoItemCustomMoves = sTrainerMons_BikerAlex} + .partySize = NELEMS(sParty_BikerAlex), + .party = {.NoItemCustomMoves = sParty_BikerAlex} }, [TRAINER_BIKER_LAO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("LAO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerLao), - .party = {.NoItemCustomMoves = sTrainerMons_BikerLao} + .partySize = NELEMS(sParty_BikerLao), + .party = {.NoItemCustomMoves = sParty_BikerLao} }, [TRAINER_BIKER_1] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Biker1), - .party = {.NoItemDefaultMoves = sTrainerMons_Biker1} + .partySize = NELEMS(sParty_Biker1), + .party = {.NoItemDefaultMoves = sParty_Biker1} }, [TRAINER_BIKER_HIDEO] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("HIDEO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerHideo), - .party = {.NoItemDefaultMoves = sTrainerMons_BikerHideo} + .partySize = NELEMS(sParty_BikerHideo), + .party = {.NoItemDefaultMoves = sParty_BikerHideo} }, [TRAINER_BIKER_RUBEN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("RUBEN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerRuben), - .party = {.NoItemCustomMoves = sTrainerMons_BikerRuben} + .partySize = NELEMS(sParty_BikerRuben), + .party = {.NoItemCustomMoves = sParty_BikerRuben} }, [TRAINER_BIKER_BILLY] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("BILLY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerBilly), - .party = {.NoItemDefaultMoves = sTrainerMons_BikerBilly} + .partySize = NELEMS(sParty_BikerBilly), + .party = {.NoItemDefaultMoves = sParty_BikerBilly} }, [TRAINER_BIKER_NIKOLAS] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("NIKOLAS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerNikolas), - .party = {.NoItemCustomMoves = sTrainerMons_BikerNikolas} + .partySize = NELEMS(sParty_BikerNikolas), + .party = {.NoItemCustomMoves = sParty_BikerNikolas} }, [TRAINER_BIKER_JAXON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("JAXON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerJaxon), - .party = {.NoItemCustomMoves = sTrainerMons_BikerJaxon} + .partySize = NELEMS(sParty_BikerJaxon), + .party = {.NoItemCustomMoves = sParty_BikerJaxon} }, [TRAINER_BIKER_WILLIAM] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("WILLIAM"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerWilliam), - .party = {.NoItemCustomMoves = sTrainerMons_BikerWilliam} + .partySize = NELEMS(sParty_BikerWilliam), + .party = {.NoItemCustomMoves = sParty_BikerWilliam} }, [TRAINER_BIKER_LUKAS] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("LUKAS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerLukas), - .party = {.NoItemCustomMoves = sTrainerMons_BikerLukas} + .partySize = NELEMS(sParty_BikerLukas), + .party = {.NoItemCustomMoves = sParty_BikerLukas} }, [TRAINER_BIKER_ISAAC] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("ISAAC"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerIsaac), - .party = {.NoItemCustomMoves = sTrainerMons_BikerIsaac} + .partySize = NELEMS(sParty_BikerIsaac), + .party = {.NoItemCustomMoves = sParty_BikerIsaac} }, [TRAINER_BIKER_GERALD] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("GERALD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerGerald), - .party = {.NoItemCustomMoves = sTrainerMons_BikerGerald} + .partySize = NELEMS(sParty_BikerGerald), + .party = {.NoItemCustomMoves = sParty_BikerGerald} }, [TRAINER_BURGLAR_1] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Burglar1), - .party = {.NoItemDefaultMoves = sTrainerMons_Burglar1} + .partySize = NELEMS(sParty_Burglar1), + .party = {.NoItemDefaultMoves = sParty_Burglar1} }, [TRAINER_BURGLAR_2] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Burglar2), - .party = {.NoItemDefaultMoves = sTrainerMons_Burglar2} + .partySize = NELEMS(sParty_Burglar2), + .party = {.NoItemDefaultMoves = sParty_Burglar2} }, [TRAINER_BURGLAR_3] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Burglar3), - .party = {.NoItemDefaultMoves = sTrainerMons_Burglar3} + .partySize = NELEMS(sParty_Burglar3), + .party = {.NoItemDefaultMoves = sParty_Burglar3} }, [TRAINER_BURGLAR_QUINN] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _("QUINN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BurglarQuinn), - .party = {.NoItemDefaultMoves = sTrainerMons_BurglarQuinn} + .partySize = NELEMS(sParty_BurglarQuinn), + .party = {.NoItemDefaultMoves = sParty_BurglarQuinn} }, [TRAINER_BURGLAR_RAMON] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _("RAMON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BurglarRamon), - .party = {.NoItemDefaultMoves = sTrainerMons_BurglarRamon} + .partySize = NELEMS(sParty_BurglarRamon), + .party = {.NoItemDefaultMoves = sParty_BurglarRamon} }, [TRAINER_BURGLAR_DUSTY] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _("DUSTY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BurglarDusty), - .party = {.NoItemDefaultMoves = sTrainerMons_BurglarDusty} + .partySize = NELEMS(sParty_BurglarDusty), + .party = {.NoItemDefaultMoves = sParty_BurglarDusty} }, [TRAINER_BURGLAR_ARNIE] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _("ARNIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BurglarArnie), - .party = {.NoItemDefaultMoves = sTrainerMons_BurglarArnie} + .partySize = NELEMS(sParty_BurglarArnie), + .party = {.NoItemDefaultMoves = sParty_BurglarArnie} }, [TRAINER_BURGLAR_4] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Burglar4), - .party = {.NoItemDefaultMoves = sTrainerMons_Burglar4} + .partySize = NELEMS(sParty_Burglar4), + .party = {.NoItemDefaultMoves = sParty_Burglar4} }, [TRAINER_BURGLAR_SIMON] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _("SIMON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BurglarSimon), - .party = {.NoItemDefaultMoves = sTrainerMons_BurglarSimon} + .partySize = NELEMS(sParty_BurglarSimon), + .party = {.NoItemDefaultMoves = sParty_BurglarSimon} }, [TRAINER_BURGLAR_LEWIS] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _("LEWIS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BurglarLewis), - .party = {.NoItemDefaultMoves = sTrainerMons_BurglarLewis} + .partySize = NELEMS(sParty_BurglarLewis), + .party = {.NoItemDefaultMoves = sParty_BurglarLewis} }, [TRAINER_ENGINEER_BAILY] = { .partyFlags = 0, - .trainerClass = CLASS_ENGINEER, + .trainerClass = TRAINER_CLASS_ENGINEER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_ENGINEER, .trainerName = _("BAILY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_EngineerBaily), - .party = {.NoItemDefaultMoves = sTrainerMons_EngineerBaily} + .partySize = NELEMS(sParty_EngineerBaily), + .party = {.NoItemDefaultMoves = sParty_EngineerBaily} }, [TRAINER_ENGINEER_BRAXTON] = { .partyFlags = 0, - .trainerClass = CLASS_ENGINEER, + .trainerClass = TRAINER_CLASS_ENGINEER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_ENGINEER, .trainerName = _("BRAXTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_EngineerBraxton), - .party = {.NoItemDefaultMoves = sTrainerMons_EngineerBraxton} + .partySize = NELEMS(sParty_EngineerBraxton), + .party = {.NoItemDefaultMoves = sParty_EngineerBraxton} }, [TRAINER_ENGINEER_BERNIE] = { .partyFlags = 0, - .trainerClass = CLASS_ENGINEER, + .trainerClass = TRAINER_CLASS_ENGINEER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_ENGINEER, .trainerName = _("BERNIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_EngineerBernie), - .party = {.NoItemDefaultMoves = sTrainerMons_EngineerBernie} + .partySize = NELEMS(sParty_EngineerBernie), + .party = {.NoItemDefaultMoves = sParty_EngineerBernie} }, [TRAINER_FISHERMAN_DALE] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("DALE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanDale), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanDale} + .partySize = NELEMS(sParty_FishermanDale), + .party = {.NoItemDefaultMoves = sParty_FishermanDale} }, [TRAINER_FISHERMAN_BARNY] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("BARNY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanBarny), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanBarny} + .partySize = NELEMS(sParty_FishermanBarny), + .party = {.NoItemDefaultMoves = sParty_FishermanBarny} }, [TRAINER_FISHERMAN_NED] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("NED"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanNed), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanNed} + .partySize = NELEMS(sParty_FishermanNed), + .party = {.NoItemDefaultMoves = sParty_FishermanNed} }, [TRAINER_FISHERMAN_CHIP] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("CHIP"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanChip), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanChip} + .partySize = NELEMS(sParty_FishermanChip), + .party = {.NoItemDefaultMoves = sParty_FishermanChip} }, [TRAINER_FISHERMAN_HANK] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("HANK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanHank), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanHank} + .partySize = NELEMS(sParty_FishermanHank), + .party = {.NoItemDefaultMoves = sParty_FishermanHank} }, [TRAINER_FISHERMAN_ELLIOT] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("ELLIOT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanElliot), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanElliot} + .partySize = NELEMS(sParty_FishermanElliot), + .party = {.NoItemDefaultMoves = sParty_FishermanElliot} }, [TRAINER_FISHERMAN_RONALD] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("RONALD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanRonald), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanRonald} + .partySize = NELEMS(sParty_FishermanRonald), + .party = {.NoItemDefaultMoves = sParty_FishermanRonald} }, [TRAINER_FISHERMAN_CLAUDE] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("CLAUDE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanClaude), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanClaude} + .partySize = NELEMS(sParty_FishermanClaude), + .party = {.NoItemDefaultMoves = sParty_FishermanClaude} }, [TRAINER_FISHERMAN_WADE] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("WADE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanWade), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanWade} + .partySize = NELEMS(sParty_FishermanWade), + .party = {.NoItemDefaultMoves = sParty_FishermanWade} }, [TRAINER_FISHERMAN_NOLAN] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("NOLAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanNolan), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanNolan} + .partySize = NELEMS(sParty_FishermanNolan), + .party = {.NoItemDefaultMoves = sParty_FishermanNolan} }, [TRAINER_FISHERMAN_ANDREW] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("ANDREW"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanAndrew), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanAndrew} + .partySize = NELEMS(sParty_FishermanAndrew), + .party = {.NoItemDefaultMoves = sParty_FishermanAndrew} }, [TRAINER_SWIMMER_MALE_LUIS] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("LUIS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleLuis), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleLuis} + .partySize = NELEMS(sParty_SwimmerMaleLuis), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleLuis} }, [TRAINER_SWIMMER_MALE_RICHARD] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("RICHARD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleRichard), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleRichard} + .partySize = NELEMS(sParty_SwimmerMaleRichard), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleRichard} }, [TRAINER_SWIMMER_MALE_REECE] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("REECE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleReece), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleReece} + .partySize = NELEMS(sParty_SwimmerMaleReece), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleReece} }, [TRAINER_SWIMMER_MALE_MATTHEW] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("MATTHEW"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleMatthew), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleMatthew} + .partySize = NELEMS(sParty_SwimmerMaleMatthew), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleMatthew} }, [TRAINER_SWIMMER_MALE_DOUGLAS] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("DOUGLAS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleDouglas), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleDouglas} + .partySize = NELEMS(sParty_SwimmerMaleDouglas), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleDouglas} }, [TRAINER_SWIMMER_MALE_DAVID] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("DAVID"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleDavid), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleDavid} + .partySize = NELEMS(sParty_SwimmerMaleDavid), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleDavid} }, [TRAINER_SWIMMER_MALE_TONY] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("TONY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleTony), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleTony} + .partySize = NELEMS(sParty_SwimmerMaleTony), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleTony} }, [TRAINER_SWIMMER_MALE_AXLE] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("AXLE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleAxle), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleAxle} + .partySize = NELEMS(sParty_SwimmerMaleAxle), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleAxle} }, [TRAINER_SWIMMER_MALE_BARRY] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("BARRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleBarry), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleBarry} + .partySize = NELEMS(sParty_SwimmerMaleBarry), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleBarry} }, [TRAINER_SWIMMER_MALE_DEAN] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("DEAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleDean), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleDean} + .partySize = NELEMS(sParty_SwimmerMaleDean), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleDean} }, [TRAINER_SWIMMER_MALE_DARRIN] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("DARRIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleDarrin), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleDarrin} + .partySize = NELEMS(sParty_SwimmerMaleDarrin), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleDarrin} }, [TRAINER_SWIMMER_MALE_SPENCER] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("SPENCER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleSpencer), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleSpencer} + .partySize = NELEMS(sParty_SwimmerMaleSpencer), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleSpencer} }, [TRAINER_SWIMMER_MALE_JACK] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("JACK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleJack), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleJack} + .partySize = NELEMS(sParty_SwimmerMaleJack), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleJack} }, [TRAINER_SWIMMER_MALE_JEROME] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("JEROME"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleJerome), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleJerome} + .partySize = NELEMS(sParty_SwimmerMaleJerome), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleJerome} }, [TRAINER_SWIMMER_MALE_ROLAND] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("ROLAND"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleRoland), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleRoland} + .partySize = NELEMS(sParty_SwimmerMaleRoland), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleRoland} }, [TRAINER_CUE_BALL_KOJI] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("KOJI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallKoji), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallKoji} + .partySize = NELEMS(sParty_CueBallKoji), + .party = {.NoItemDefaultMoves = sParty_CueBallKoji} }, [TRAINER_CUE_BALL_LUKE] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("LUKE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallLuke), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallLuke} + .partySize = NELEMS(sParty_CueBallLuke), + .party = {.NoItemDefaultMoves = sParty_CueBallLuke} }, [TRAINER_CUE_BALL_CAMRON] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("CAMRON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallCamron), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallCamron} + .partySize = NELEMS(sParty_CueBallCamron), + .party = {.NoItemDefaultMoves = sParty_CueBallCamron} }, [TRAINER_CUE_BALL_RAUL] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("RAUL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallRaul), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallRaul} + .partySize = NELEMS(sParty_CueBallRaul), + .party = {.NoItemDefaultMoves = sParty_CueBallRaul} }, [TRAINER_CUE_BALL_ISAIAH] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("ISAIAH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallIsaiah), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallIsaiah} + .partySize = NELEMS(sParty_CueBallIsaiah), + .party = {.NoItemDefaultMoves = sParty_CueBallIsaiah} }, [TRAINER_CUE_BALL_ZEEK] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("ZEEK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallZeek), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallZeek} + .partySize = NELEMS(sParty_CueBallZeek), + .party = {.NoItemDefaultMoves = sParty_CueBallZeek} }, [TRAINER_CUE_BALL_JAMAL] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("JAMAL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallJamal), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallJamal} + .partySize = NELEMS(sParty_CueBallJamal), + .party = {.NoItemDefaultMoves = sParty_CueBallJamal} }, [TRAINER_CUE_BALL_COREY] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("COREY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallCorey), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallCorey} + .partySize = NELEMS(sParty_CueBallCorey), + .party = {.NoItemDefaultMoves = sParty_CueBallCorey} }, [TRAINER_CUE_BALL_CHASE] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("CHASE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallChase), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallChase} + .partySize = NELEMS(sParty_CueBallChase), + .party = {.NoItemDefaultMoves = sParty_CueBallChase} }, [TRAINER_GAMER_HUGO] = { .partyFlags = 0, - .trainerClass = CLASS_GAMER, + .trainerClass = TRAINER_CLASS_GAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_GAMER, .trainerName = _("HUGO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GamerHugo), - .party = {.NoItemDefaultMoves = sTrainerMons_GamerHugo} + .partySize = NELEMS(sParty_GamerHugo), + .party = {.NoItemDefaultMoves = sParty_GamerHugo} }, [TRAINER_GAMER_JASPER] = { .partyFlags = 0, - .trainerClass = CLASS_GAMER, + .trainerClass = TRAINER_CLASS_GAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_GAMER, .trainerName = _("JASPER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GamerJasper), - .party = {.NoItemDefaultMoves = sTrainerMons_GamerJasper} + .partySize = NELEMS(sParty_GamerJasper), + .party = {.NoItemDefaultMoves = sParty_GamerJasper} }, [TRAINER_GAMER_DIRK] = { .partyFlags = 0, - .trainerClass = CLASS_GAMER, + .trainerClass = TRAINER_CLASS_GAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_GAMER, .trainerName = _("DIRK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GamerDirk), - .party = {.NoItemDefaultMoves = sTrainerMons_GamerDirk} + .partySize = NELEMS(sParty_GamerDirk), + .party = {.NoItemDefaultMoves = sParty_GamerDirk} }, [TRAINER_GAMER_DARIAN] = { .partyFlags = 0, - .trainerClass = CLASS_GAMER, + .trainerClass = TRAINER_CLASS_GAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_GAMER, .trainerName = _("DARIAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GamerDarian), - .party = {.NoItemDefaultMoves = sTrainerMons_GamerDarian} + .partySize = NELEMS(sParty_GamerDarian), + .party = {.NoItemDefaultMoves = sParty_GamerDarian} }, [TRAINER_GAMER_STAN] = { .partyFlags = 0, - .trainerClass = CLASS_GAMER, + .trainerClass = TRAINER_CLASS_GAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_GAMER, .trainerName = _("STAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GamerStan), - .party = {.NoItemDefaultMoves = sTrainerMons_GamerStan} + .partySize = NELEMS(sParty_GamerStan), + .party = {.NoItemDefaultMoves = sParty_GamerStan} }, [TRAINER_GAMER_1] = { .partyFlags = 0, - .trainerClass = CLASS_GAMER, + .trainerClass = TRAINER_CLASS_GAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_GAMER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Gamer1), - .party = {.NoItemDefaultMoves = sTrainerMons_Gamer1} + .partySize = NELEMS(sParty_Gamer1), + .party = {.NoItemDefaultMoves = sParty_Gamer1} }, [TRAINER_GAMER_RICH] = { .partyFlags = 0, - .trainerClass = CLASS_GAMER, + .trainerClass = TRAINER_CLASS_GAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_GAMER, .trainerName = _("RICH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GamerRich), - .party = {.NoItemDefaultMoves = sTrainerMons_GamerRich} + .partySize = NELEMS(sParty_GamerRich), + .party = {.NoItemDefaultMoves = sParty_GamerRich} }, [TRAINER_BEAUTY_BRIDGET] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("BRIDGET"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautyBridget), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautyBridget} + .partySize = NELEMS(sParty_BeautyBridget), + .party = {.NoItemDefaultMoves = sParty_BeautyBridget} }, [TRAINER_BEAUTY_TAMIA] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("TAMIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautyTamia), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautyTamia} + .partySize = NELEMS(sParty_BeautyTamia), + .party = {.NoItemDefaultMoves = sParty_BeautyTamia} }, [TRAINER_BEAUTY_LORI] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("LORI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautyLori), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautyLori} + .partySize = NELEMS(sParty_BeautyLori), + .party = {.NoItemDefaultMoves = sParty_BeautyLori} }, [TRAINER_BEAUTY_LOLA] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("LOLA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautyLola), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautyLola} + .partySize = NELEMS(sParty_BeautyLola), + .party = {.NoItemDefaultMoves = sParty_BeautyLola} }, [TRAINER_BEAUTY_SHEILA] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("SHEILA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautySheila), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautySheila} + .partySize = NELEMS(sParty_BeautySheila), + .party = {.NoItemDefaultMoves = sParty_BeautySheila} }, [TRAINER_SWIMMER_FEMALE_TIFFANY] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("TIFFANY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleTiffany), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleTiffany} + .partySize = NELEMS(sParty_SwimmerFemaleTiffany), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleTiffany} }, [TRAINER_SWIMMER_FEMALE_NORA] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("NORA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleNora), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleNora} + .partySize = NELEMS(sParty_SwimmerFemaleNora), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleNora} }, [TRAINER_SWIMMER_FEMALE_MELISSA] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("MELISSA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleMelissa), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleMelissa} + .partySize = NELEMS(sParty_SwimmerFemaleMelissa), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleMelissa} }, [TRAINER_BEAUTY_GRACE] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("GRACE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautyGrace), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautyGrace} + .partySize = NELEMS(sParty_BeautyGrace), + .party = {.NoItemDefaultMoves = sParty_BeautyGrace} }, [TRAINER_BEAUTY_OLIVIA] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("OLIVIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautyOlivia), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautyOlivia} + .partySize = NELEMS(sParty_BeautyOlivia), + .party = {.NoItemDefaultMoves = sParty_BeautyOlivia} }, [TRAINER_BEAUTY_LAUREN] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("LAUREN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautyLauren), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautyLauren} + .partySize = NELEMS(sParty_BeautyLauren), + .party = {.NoItemDefaultMoves = sParty_BeautyLauren} }, [TRAINER_SWIMMER_FEMALE_ANYA] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("ANYA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleAnya), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleAnya} + .partySize = NELEMS(sParty_SwimmerFemaleAnya), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleAnya} }, [TRAINER_SWIMMER_FEMALE_ALICE] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("ALICE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleAlice), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleAlice} + .partySize = NELEMS(sParty_SwimmerFemaleAlice), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleAlice} }, [TRAINER_SWIMMER_FEMALE_CONNIE] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("CONNIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleConnie), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleConnie} + .partySize = NELEMS(sParty_SwimmerFemaleConnie), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleConnie} }, [TRAINER_SWIMMER_FEMALE_SHIRLEY] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("SHIRLEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleShirley), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleShirley} + .partySize = NELEMS(sParty_SwimmerFemaleShirley), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleShirley} }, [TRAINER_PSYCHIC_JOHAN] = { .partyFlags = 0, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_PSYCHIC_M, .trainerName = _("JOHAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicJohan), - .party = {.NoItemDefaultMoves = sTrainerMons_PsychicJohan} + .partySize = NELEMS(sParty_PsychicJohan), + .party = {.NoItemDefaultMoves = sParty_PsychicJohan} }, [TRAINER_PSYCHIC_TYRON] = { .partyFlags = 0, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_PSYCHIC_M, .trainerName = _("TYRON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicTyron), - .party = {.NoItemDefaultMoves = sTrainerMons_PsychicTyron} + .partySize = NELEMS(sParty_PsychicTyron), + .party = {.NoItemDefaultMoves = sParty_PsychicTyron} }, [TRAINER_PSYCHIC_CAMERON] = { .partyFlags = 0, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_PSYCHIC_M, .trainerName = _("CAMERON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicCameron), - .party = {.NoItemDefaultMoves = sTrainerMons_PsychicCameron} + .partySize = NELEMS(sParty_PsychicCameron), + .party = {.NoItemDefaultMoves = sParty_PsychicCameron} }, [TRAINER_PSYCHIC_PRESTON] = { .partyFlags = 0, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_PSYCHIC_M, .trainerName = _("PRESTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicPreston), - .party = {.NoItemDefaultMoves = sTrainerMons_PsychicPreston} + .partySize = NELEMS(sParty_PsychicPreston), + .party = {.NoItemDefaultMoves = sParty_PsychicPreston} }, [TRAINER_ROCKER_RANDALL] = { .partyFlags = 0, - .trainerClass = CLASS_ROCKER, + .trainerClass = TRAINER_CLASS_ROCKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_ROCKER, .trainerName = _("RANDALL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RockerRandall), - .party = {.NoItemDefaultMoves = sTrainerMons_RockerRandall} + .partySize = NELEMS(sParty_RockerRandall), + .party = {.NoItemDefaultMoves = sParty_RockerRandall} }, [TRAINER_ROCKER_LUCA] = { .partyFlags = 0, - .trainerClass = CLASS_ROCKER, + .trainerClass = TRAINER_CLASS_ROCKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_ROCKER, .trainerName = _("LUCA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RockerLuca), - .party = {.NoItemDefaultMoves = sTrainerMons_RockerLuca} + .partySize = NELEMS(sParty_RockerLuca), + .party = {.NoItemDefaultMoves = sParty_RockerLuca} }, [TRAINER_JUGGLER_DALTON] = { .partyFlags = 0, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("DALTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerDalton), - .party = {.NoItemDefaultMoves = sTrainerMons_JugglerDalton} + .partySize = NELEMS(sParty_JugglerDalton), + .party = {.NoItemDefaultMoves = sParty_JugglerDalton} }, [TRAINER_JUGGLER_NELSON] = { .partyFlags = 0, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("NELSON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerNelson), - .party = {.NoItemDefaultMoves = sTrainerMons_JugglerNelson} + .partySize = NELEMS(sParty_JugglerNelson), + .party = {.NoItemDefaultMoves = sParty_JugglerNelson} }, [TRAINER_JUGGLER_KIRK] = { .partyFlags = 0, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("KIRK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerKirk), - .party = {.NoItemDefaultMoves = sTrainerMons_JugglerKirk} + .partySize = NELEMS(sParty_JugglerKirk), + .party = {.NoItemDefaultMoves = sParty_JugglerKirk} }, [TRAINER_JUGGLER_SHAWN] = { .partyFlags = 0, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("SHAWN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerShawn), - .party = {.NoItemDefaultMoves = sTrainerMons_JugglerShawn} + .partySize = NELEMS(sParty_JugglerShawn), + .party = {.NoItemDefaultMoves = sParty_JugglerShawn} }, [TRAINER_JUGGLER_GREGORY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("GREGORY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerGregory), - .party = {.NoItemCustomMoves = sTrainerMons_JugglerGregory} + .partySize = NELEMS(sParty_JugglerGregory), + .party = {.NoItemCustomMoves = sParty_JugglerGregory} }, [TRAINER_JUGGLER_EDWARD] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("EDWARD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerEdward), - .party = {.NoItemCustomMoves = sTrainerMons_JugglerEdward} + .partySize = NELEMS(sParty_JugglerEdward), + .party = {.NoItemCustomMoves = sParty_JugglerEdward} }, [TRAINER_JUGGLER_KAYDEN] = { .partyFlags = 0, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("KAYDEN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerKayden), - .party = {.NoItemDefaultMoves = sTrainerMons_JugglerKayden} + .partySize = NELEMS(sParty_JugglerKayden), + .party = {.NoItemDefaultMoves = sParty_JugglerKayden} }, [TRAINER_JUGGLER_NATE] = { .partyFlags = 0, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("NATE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerNate), - .party = {.NoItemDefaultMoves = sTrainerMons_JugglerNate} + .partySize = NELEMS(sParty_JugglerNate), + .party = {.NoItemDefaultMoves = sParty_JugglerNate} }, [TRAINER_TAMER_PHIL] = { .partyFlags = 0, - .trainerClass = CLASS_TAMER, + .trainerClass = TRAINER_CLASS_TAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_TAMER, .trainerName = _("PHIL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TamerPhil), - .party = {.NoItemDefaultMoves = sTrainerMons_TamerPhil} + .partySize = NELEMS(sParty_TamerPhil), + .party = {.NoItemDefaultMoves = sParty_TamerPhil} }, [TRAINER_TAMER_EDGAR] = { .partyFlags = 0, - .trainerClass = CLASS_TAMER, + .trainerClass = TRAINER_CLASS_TAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_TAMER, .trainerName = _("EDGAR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TamerEdgar), - .party = {.NoItemDefaultMoves = sTrainerMons_TamerEdgar} + .partySize = NELEMS(sParty_TamerEdgar), + .party = {.NoItemDefaultMoves = sParty_TamerEdgar} }, [TRAINER_TAMER_JASON] = { .partyFlags = 0, - .trainerClass = CLASS_TAMER, + .trainerClass = TRAINER_CLASS_TAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_TAMER, .trainerName = _("JASON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TamerJason), - .party = {.NoItemDefaultMoves = sTrainerMons_TamerJason} + .partySize = NELEMS(sParty_TamerJason), + .party = {.NoItemDefaultMoves = sParty_TamerJason} }, [TRAINER_TAMER_COLE] = { .partyFlags = 0, - .trainerClass = CLASS_TAMER, + .trainerClass = TRAINER_CLASS_TAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_TAMER, .trainerName = _("COLE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TamerCole), - .party = {.NoItemDefaultMoves = sTrainerMons_TamerCole} + .partySize = NELEMS(sParty_TamerCole), + .party = {.NoItemDefaultMoves = sParty_TamerCole} }, [TRAINER_TAMER_VINCENT] = { .partyFlags = 0, - .trainerClass = CLASS_TAMER, + .trainerClass = TRAINER_CLASS_TAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_TAMER, .trainerName = _("VINCENT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TamerVincent), - .party = {.NoItemDefaultMoves = sTrainerMons_TamerVincent} + .partySize = NELEMS(sParty_TamerVincent), + .party = {.NoItemDefaultMoves = sParty_TamerVincent} }, [TRAINER_TAMER_JOHN] = { .partyFlags = 0, - .trainerClass = CLASS_TAMER, + .trainerClass = TRAINER_CLASS_TAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_TAMER, .trainerName = _("JOHN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TamerJohn), - .party = {.NoItemDefaultMoves = sTrainerMons_TamerJohn} + .partySize = NELEMS(sParty_TamerJohn), + .party = {.NoItemDefaultMoves = sParty_TamerJohn} }, [TRAINER_BIRD_KEEPER_SEBASTIAN] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("SEBASTIAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperSebastian), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperSebastian} + .partySize = NELEMS(sParty_BirdKeeperSebastian), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperSebastian} }, [TRAINER_BIRD_KEEPER_PERRY] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("PERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperPerry), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperPerry} + .partySize = NELEMS(sParty_BirdKeeperPerry), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperPerry} }, [TRAINER_BIRD_KEEPER_ROBERT] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("ROBERT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperRobert), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperRobert} + .partySize = NELEMS(sParty_BirdKeeperRobert), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperRobert} }, [TRAINER_BIRD_KEEPER_DONALD] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("DONALD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperDonald), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperDonald} + .partySize = NELEMS(sParty_BirdKeeperDonald), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperDonald} }, [TRAINER_BIRD_KEEPER_BENNY] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("BENNY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperBenny), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperBenny} + .partySize = NELEMS(sParty_BirdKeeperBenny), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperBenny} }, [TRAINER_BIRD_KEEPER_EDWIN] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("EDWIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperEdwin), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperEdwin} + .partySize = NELEMS(sParty_BirdKeeperEdwin), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperEdwin} }, [TRAINER_BIRD_KEEPER_CHESTER] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("CHESTER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperChester), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperChester} + .partySize = NELEMS(sParty_BirdKeeperChester), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperChester} }, [TRAINER_BIRD_KEEPER_WILTON] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("WILTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperWilton), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperWilton} + .partySize = NELEMS(sParty_BirdKeeperWilton), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperWilton} }, [TRAINER_BIRD_KEEPER_RAMIRO] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("RAMIRO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperRamiro), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperRamiro} + .partySize = NELEMS(sParty_BirdKeeperRamiro), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperRamiro} }, [TRAINER_BIRD_KEEPER_JACOB] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("JACOB"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperJacob), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperJacob} + .partySize = NELEMS(sParty_BirdKeeperJacob), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperJacob} }, [TRAINER_BIRD_KEEPER_ROGER] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("ROGER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperRoger), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperRoger} + .partySize = NELEMS(sParty_BirdKeeperRoger), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperRoger} }, [TRAINER_BIRD_KEEPER_REED] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("REED"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperReed), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperReed} + .partySize = NELEMS(sParty_BirdKeeperReed), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperReed} }, [TRAINER_BIRD_KEEPER_KEITH] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("KEITH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperKeith), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperKeith} + .partySize = NELEMS(sParty_BirdKeeperKeith), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperKeith} }, [TRAINER_BIRD_KEEPER_CARTER] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("CARTER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperCarter), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperCarter} + .partySize = NELEMS(sParty_BirdKeeperCarter), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperCarter} }, [TRAINER_BIRD_KEEPER_MITCH] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("MITCH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperMitch), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperMitch} + .partySize = NELEMS(sParty_BirdKeeperMitch), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperMitch} }, [TRAINER_BIRD_KEEPER_BECK] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("BECK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperBeck), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperBeck} + .partySize = NELEMS(sParty_BirdKeeperBeck), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperBeck} }, [TRAINER_BIRD_KEEPER_MARLON] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("MARLON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperMarlon), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperMarlon} + .partySize = NELEMS(sParty_BirdKeeperMarlon), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperMarlon} }, [TRAINER_BLACK_BELT_KOICHI] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("KOICHI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltKoichi), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltKoichi} + .partySize = NELEMS(sParty_BlackBeltKoichi), + .party = {.ItemDefaultMoves = sParty_BlackBeltKoichi} }, [TRAINER_BLACK_BELT_MIKE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("MIKE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltMike), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltMike} + .partySize = NELEMS(sParty_BlackBeltMike), + .party = {.ItemDefaultMoves = sParty_BlackBeltMike} }, [TRAINER_BLACK_BELT_HIDEKI] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("HIDEKI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltHideki), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltHideki} + .partySize = NELEMS(sParty_BlackBeltHideki), + .party = {.ItemDefaultMoves = sParty_BlackBeltHideki} }, [TRAINER_BLACK_BELT_AARON] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("AARON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltAaron), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltAaron} + .partySize = NELEMS(sParty_BlackBeltAaron), + .party = {.ItemDefaultMoves = sParty_BlackBeltAaron} }, [TRAINER_BLACK_BELT_HITOSHI] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("HITOSHI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltHitoshi), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltHitoshi} + .partySize = NELEMS(sParty_BlackBeltHitoshi), + .party = {.ItemDefaultMoves = sParty_BlackBeltHitoshi} }, [TRAINER_BLACK_BELT_ATSUSHI] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("ATSUSHI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltAtsushi), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltAtsushi} + .partySize = NELEMS(sParty_BlackBeltAtsushi), + .party = {.ItemDefaultMoves = sParty_BlackBeltAtsushi} }, [TRAINER_BLACK_BELT_KIYO] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("KIYO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltKiyo), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltKiyo} + .partySize = NELEMS(sParty_BlackBeltKiyo), + .party = {.ItemDefaultMoves = sParty_BlackBeltKiyo} }, [TRAINER_BLACK_BELT_TAKASHI] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("TAKASHI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltTakashi), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltTakashi} + .partySize = NELEMS(sParty_BlackBeltTakashi), + .party = {.ItemDefaultMoves = sParty_BlackBeltTakashi} }, [TRAINER_BLACK_BELT_DAISUKE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("DAISUKE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltDaisuke), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltDaisuke} + .partySize = NELEMS(sParty_BlackBeltDaisuke), + .party = {.ItemDefaultMoves = sParty_BlackBeltDaisuke} }, [TRAINER_RIVAL_OAKS_LAB_SQUIRTLE] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL, + .trainerClass = TRAINER_CLASS_RIVAL_EARLY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_1, + .trainerPic = TRAINER_PIC_RIVAL_EARLY, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalOaksLabSquirtle), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalOaksLabSquirtle} + .partySize = NELEMS(sParty_RivalOaksLabSquirtle), + .party = {.NoItemDefaultMoves = sParty_RivalOaksLabSquirtle} }, [TRAINER_RIVAL_OAKS_LAB_BULBASAUR] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL, + .trainerClass = TRAINER_CLASS_RIVAL_EARLY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_1, + .trainerPic = TRAINER_PIC_RIVAL_EARLY, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalOaksLabBulbasaur), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalOaksLabBulbasaur} + .partySize = NELEMS(sParty_RivalOaksLabBulbasaur), + .party = {.NoItemDefaultMoves = sParty_RivalOaksLabBulbasaur} }, [TRAINER_RIVAL_OAKS_LAB_CHARMANDER] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL, + .trainerClass = TRAINER_CLASS_RIVAL_EARLY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_1, + .trainerPic = TRAINER_PIC_RIVAL_EARLY, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalOaksLabCharmander), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalOaksLabCharmander} + .partySize = NELEMS(sParty_RivalOaksLabCharmander), + .party = {.NoItemDefaultMoves = sParty_RivalOaksLabCharmander} }, [TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RIVAL, + .trainerClass = TRAINER_CLASS_RIVAL_EARLY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_1, + .trainerPic = TRAINER_PIC_RIVAL_EARLY, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalRoute22EarlySquirtle), - .party = {.NoItemCustomMoves = sTrainerMons_RivalRoute22EarlySquirtle} + .partySize = NELEMS(sParty_RivalRoute22EarlySquirtle), + .party = {.NoItemCustomMoves = sParty_RivalRoute22EarlySquirtle} }, [TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RIVAL, + .trainerClass = TRAINER_CLASS_RIVAL_EARLY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_1, + .trainerPic = TRAINER_PIC_RIVAL_EARLY, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalRoute22EarlyBulbasaur), - .party = {.NoItemCustomMoves = sTrainerMons_RivalRoute22EarlyBulbasaur} + .partySize = NELEMS(sParty_RivalRoute22EarlyBulbasaur), + .party = {.NoItemCustomMoves = sParty_RivalRoute22EarlyBulbasaur} }, [TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RIVAL, + .trainerClass = TRAINER_CLASS_RIVAL_EARLY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_1, + .trainerPic = TRAINER_PIC_RIVAL_EARLY, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalRoute22EarlyCharmander), - .party = {.NoItemCustomMoves = sTrainerMons_RivalRoute22EarlyCharmander} + .partySize = NELEMS(sParty_RivalRoute22EarlyCharmander), + .party = {.NoItemCustomMoves = sParty_RivalRoute22EarlyCharmander} }, [TRAINER_RIVAL_CERULEAN_SQUIRTLE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RIVAL, + .trainerClass = TRAINER_CLASS_RIVAL_EARLY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_1, + .trainerPic = TRAINER_PIC_RIVAL_EARLY, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalCeruleanSquirtle), - .party = {.NoItemCustomMoves = sTrainerMons_RivalCeruleanSquirtle} + .partySize = NELEMS(sParty_RivalCeruleanSquirtle), + .party = {.NoItemCustomMoves = sParty_RivalCeruleanSquirtle} }, [TRAINER_RIVAL_CERULEAN_BULBASAUR] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RIVAL, + .trainerClass = TRAINER_CLASS_RIVAL_EARLY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_1, + .trainerPic = TRAINER_PIC_RIVAL_EARLY, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalCeruleanBulbasaur), - .party = {.NoItemCustomMoves = sTrainerMons_RivalCeruleanBulbasaur} + .partySize = NELEMS(sParty_RivalCeruleanBulbasaur), + .party = {.NoItemCustomMoves = sParty_RivalCeruleanBulbasaur} }, [TRAINER_RIVAL_CERULEAN_CHARMANDER] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RIVAL, + .trainerClass = TRAINER_CLASS_RIVAL_EARLY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_1, + .trainerPic = TRAINER_PIC_RIVAL_EARLY, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalCeruleanCharmander), - .party = {.NoItemCustomMoves = sTrainerMons_RivalCeruleanCharmander} + .partySize = NELEMS(sParty_RivalCeruleanCharmander), + .party = {.NoItemCustomMoves = sParty_RivalCeruleanCharmander} }, [TRAINER_SCIENTIST_TED] = { .partyFlags = 0, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("TED"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistTed), - .party = {.NoItemDefaultMoves = sTrainerMons_ScientistTed} + .partySize = NELEMS(sParty_ScientistTed), + .party = {.NoItemDefaultMoves = sParty_ScientistTed} }, [TRAINER_SCIENTIST_CONNOR] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("CONNOR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistConnor), - .party = {.NoItemCustomMoves = sTrainerMons_ScientistConnor} + .partySize = NELEMS(sParty_ScientistConnor), + .party = {.NoItemCustomMoves = sParty_ScientistConnor} }, [TRAINER_SCIENTIST_JERRY] = { .partyFlags = 0, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("JERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistJerry), - .party = {.NoItemDefaultMoves = sTrainerMons_ScientistJerry} + .partySize = NELEMS(sParty_ScientistJerry), + .party = {.NoItemDefaultMoves = sParty_ScientistJerry} }, [TRAINER_SCIENTIST_JOSE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("JOSE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistJose), - .party = {.NoItemCustomMoves = sTrainerMons_ScientistJose} + .partySize = NELEMS(sParty_ScientistJose), + .party = {.NoItemCustomMoves = sParty_ScientistJose} }, [TRAINER_SCIENTIST_RODNEY] = { .partyFlags = 0, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("RODNEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistRodney), - .party = {.NoItemDefaultMoves = sTrainerMons_ScientistRodney} + .partySize = NELEMS(sParty_ScientistRodney), + .party = {.NoItemDefaultMoves = sParty_ScientistRodney} }, [TRAINER_SCIENTIST_BEAU] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("BEAU"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistBeau), - .party = {.NoItemCustomMoves = sTrainerMons_ScientistBeau} + .partySize = NELEMS(sParty_ScientistBeau), + .party = {.NoItemCustomMoves = sParty_ScientistBeau} }, [TRAINER_SCIENTIST_TAYLOR] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("TAYLOR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistTaylor), - .party = {.NoItemCustomMoves = sTrainerMons_ScientistTaylor} + .partySize = NELEMS(sParty_ScientistTaylor), + .party = {.NoItemCustomMoves = sParty_ScientistTaylor} }, [TRAINER_SCIENTIST_JOSHUA] = { .partyFlags = 0, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("JOSHUA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistJoshua), - .party = {.NoItemDefaultMoves = sTrainerMons_ScientistJoshua} + .partySize = NELEMS(sParty_ScientistJoshua), + .party = {.NoItemDefaultMoves = sParty_ScientistJoshua} }, [TRAINER_SCIENTIST_PARKER] = { .partyFlags = 0, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("PARKER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistParker), - .party = {.NoItemDefaultMoves = sTrainerMons_ScientistParker} + .partySize = NELEMS(sParty_ScientistParker), + .party = {.NoItemDefaultMoves = sParty_ScientistParker} }, [TRAINER_SCIENTIST_ED] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("ED"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistEd), - .party = {.NoItemCustomMoves = sTrainerMons_ScientistEd} + .partySize = NELEMS(sParty_ScientistEd), + .party = {.NoItemCustomMoves = sParty_ScientistEd} }, [TRAINER_SCIENTIST_TRAVIS] = { .partyFlags = 0, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("TRAVIS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistTravis), - .party = {.NoItemDefaultMoves = sTrainerMons_ScientistTravis} + .partySize = NELEMS(sParty_ScientistTravis), + .party = {.NoItemDefaultMoves = sParty_ScientistTravis} }, [TRAINER_SCIENTIST_BRAYDON] = { .partyFlags = 0, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("BRAYDON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistBraydon), - .party = {.NoItemDefaultMoves = sTrainerMons_ScientistBraydon} + .partySize = NELEMS(sParty_ScientistBraydon), + .party = {.NoItemDefaultMoves = sParty_ScientistBraydon} }, [TRAINER_SCIENTIST_IVAN] = { .partyFlags = 0, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("IVAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistIvan), - .party = {.NoItemDefaultMoves = sTrainerMons_ScientistIvan} + .partySize = NELEMS(sParty_ScientistIvan), + .party = {.NoItemDefaultMoves = sParty_ScientistIvan} }, [TRAINER_BOSS_GIOVANNI] = { .partyFlags = 0, - .trainerClass = CLASS_BOSS, + .trainerClass = TRAINER_CLASS_BOSS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_LEADER_GIOVANNI, .trainerName = _("GIOVANNI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BossGiovanni), - .party = {.NoItemDefaultMoves = sTrainerMons_BossGiovanni} + .partySize = NELEMS(sParty_BossGiovanni), + .party = {.NoItemDefaultMoves = sParty_BossGiovanni} }, [TRAINER_BOSS_GIOVANNI_2] = { .partyFlags = 0, - .trainerClass = CLASS_BOSS, + .trainerClass = TRAINER_CLASS_BOSS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_LEADER_GIOVANNI, .trainerName = _("GIOVANNI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BossGiovanni2), - .party = {.NoItemDefaultMoves = sTrainerMons_BossGiovanni2} + .partySize = NELEMS(sParty_BossGiovanni2), + .party = {.NoItemDefaultMoves = sParty_BossGiovanni2} }, [TRAINER_LEADER_GIOVANNI] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_LEADER_2, + .trainerClass = TRAINER_CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_LEADER_GIOVANNI, .trainerName = _("GIOVANNI"), .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_FULL_HEAL}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_LeaderGiovanni), - .party = {.NoItemCustomMoves = sTrainerMons_LeaderGiovanni} + .partySize = NELEMS(sParty_LeaderGiovanni), + .party = {.NoItemCustomMoves = sParty_LeaderGiovanni} }, [TRAINER_TEAM_ROCKET_GRUNT] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt} + .partySize = NELEMS(sParty_TeamRocketGrunt), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt} }, [TRAINER_TEAM_ROCKET_GRUNT_2] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt2), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt2} + .partySize = NELEMS(sParty_TeamRocketGrunt2), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt2} }, [TRAINER_TEAM_ROCKET_GRUNT_3] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt3), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt3} + .partySize = NELEMS(sParty_TeamRocketGrunt3), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt3} }, [TRAINER_TEAM_ROCKET_GRUNT_4] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt4), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt4} + .partySize = NELEMS(sParty_TeamRocketGrunt4), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt4} }, [TRAINER_TEAM_ROCKET_GRUNT_5] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt5), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt5} + .partySize = NELEMS(sParty_TeamRocketGrunt5), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt5} }, [TRAINER_TEAM_ROCKET_GRUNT_6] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt6), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt6} + .partySize = NELEMS(sParty_TeamRocketGrunt6), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt6} }, [TRAINER_TEAM_ROCKET_GRUNT_7] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt7), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt7} + .partySize = NELEMS(sParty_TeamRocketGrunt7), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt7} }, [TRAINER_TEAM_ROCKET_GRUNT_8] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt8), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt8} + .partySize = NELEMS(sParty_TeamRocketGrunt8), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt8} }, [TRAINER_TEAM_ROCKET_GRUNT_9] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt9), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt9} + .partySize = NELEMS(sParty_TeamRocketGrunt9), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt9} }, [TRAINER_TEAM_ROCKET_GRUNT_10] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt10), - .party = {.NoItemCustomMoves = sTrainerMons_TeamRocketGrunt10} + .partySize = NELEMS(sParty_TeamRocketGrunt10), + .party = {.NoItemCustomMoves = sParty_TeamRocketGrunt10} }, [TRAINER_TEAM_ROCKET_GRUNT_11] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt11), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt11} + .partySize = NELEMS(sParty_TeamRocketGrunt11), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt11} }, [TRAINER_TEAM_ROCKET_GRUNT_12] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt12), - .party = {.NoItemCustomMoves = sTrainerMons_TeamRocketGrunt12} + .partySize = NELEMS(sParty_TeamRocketGrunt12), + .party = {.NoItemCustomMoves = sParty_TeamRocketGrunt12} }, [TRAINER_TEAM_ROCKET_GRUNT_13] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt13), - .party = {.NoItemCustomMoves = sTrainerMons_TeamRocketGrunt13} + .partySize = NELEMS(sParty_TeamRocketGrunt13), + .party = {.NoItemCustomMoves = sParty_TeamRocketGrunt13} }, [TRAINER_TEAM_ROCKET_GRUNT_14] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt14), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt14} + .partySize = NELEMS(sParty_TeamRocketGrunt14), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt14} }, [TRAINER_TEAM_ROCKET_GRUNT_15] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt15), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt15} + .partySize = NELEMS(sParty_TeamRocketGrunt15), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt15} }, [TRAINER_TEAM_ROCKET_GRUNT_16] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt16), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt16} + .partySize = NELEMS(sParty_TeamRocketGrunt16), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt16} }, [TRAINER_TEAM_ROCKET_GRUNT_17] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt17), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt17} + .partySize = NELEMS(sParty_TeamRocketGrunt17), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt17} }, [TRAINER_TEAM_ROCKET_GRUNT_18] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt18), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt18} + .partySize = NELEMS(sParty_TeamRocketGrunt18), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt18} }, [TRAINER_TEAM_ROCKET_GRUNT_19] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt19), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt19} + .partySize = NELEMS(sParty_TeamRocketGrunt19), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt19} }, [TRAINER_TEAM_ROCKET_GRUNT_20] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt20), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt20} + .partySize = NELEMS(sParty_TeamRocketGrunt20), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt20} }, [TRAINER_TEAM_ROCKET_GRUNT_21] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt21), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt21} + .partySize = NELEMS(sParty_TeamRocketGrunt21), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt21} }, [TRAINER_TEAM_ROCKET_GRUNT_22] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt22), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt22} + .partySize = NELEMS(sParty_TeamRocketGrunt22), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt22} }, [TRAINER_TEAM_ROCKET_GRUNT_23] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt23), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt23} + .partySize = NELEMS(sParty_TeamRocketGrunt23), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt23} }, [TRAINER_TEAM_ROCKET_GRUNT_24] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt24), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt24} + .partySize = NELEMS(sParty_TeamRocketGrunt24), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt24} }, [TRAINER_TEAM_ROCKET_GRUNT_25] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt25), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt25} + .partySize = NELEMS(sParty_TeamRocketGrunt25), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt25} }, [TRAINER_TEAM_ROCKET_GRUNT_26] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt26), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt26} + .partySize = NELEMS(sParty_TeamRocketGrunt26), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt26} }, [TRAINER_TEAM_ROCKET_GRUNT_27] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt27), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt27} + .partySize = NELEMS(sParty_TeamRocketGrunt27), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt27} }, [TRAINER_TEAM_ROCKET_GRUNT_28] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt28), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt28} + .partySize = NELEMS(sParty_TeamRocketGrunt28), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt28} }, [TRAINER_TEAM_ROCKET_GRUNT_29] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt29), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt29} + .partySize = NELEMS(sParty_TeamRocketGrunt29), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt29} }, [TRAINER_TEAM_ROCKET_GRUNT_30] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt30), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt30} + .partySize = NELEMS(sParty_TeamRocketGrunt30), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt30} }, [TRAINER_TEAM_ROCKET_GRUNT_31] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt31), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt31} + .partySize = NELEMS(sParty_TeamRocketGrunt31), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt31} }, [TRAINER_TEAM_ROCKET_GRUNT_32] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt32), - .party = {.NoItemCustomMoves = sTrainerMons_TeamRocketGrunt32} + .partySize = NELEMS(sParty_TeamRocketGrunt32), + .party = {.NoItemCustomMoves = sParty_TeamRocketGrunt32} }, [TRAINER_TEAM_ROCKET_GRUNT_33] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt33), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt33} + .partySize = NELEMS(sParty_TeamRocketGrunt33), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt33} }, [TRAINER_TEAM_ROCKET_GRUNT_34] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt34), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt34} + .partySize = NELEMS(sParty_TeamRocketGrunt34), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt34} }, [TRAINER_TEAM_ROCKET_GRUNT_35] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt35), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt35} + .partySize = NELEMS(sParty_TeamRocketGrunt35), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt35} }, [TRAINER_TEAM_ROCKET_GRUNT_36] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt36), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt36} + .partySize = NELEMS(sParty_TeamRocketGrunt36), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt36} }, [TRAINER_TEAM_ROCKET_GRUNT_37] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt37), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt37} + .partySize = NELEMS(sParty_TeamRocketGrunt37), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt37} }, [TRAINER_TEAM_ROCKET_GRUNT_38] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt38), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt38} + .partySize = NELEMS(sParty_TeamRocketGrunt38), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt38} }, [TRAINER_TEAM_ROCKET_GRUNT_39] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt39), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt39} + .partySize = NELEMS(sParty_TeamRocketGrunt39), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt39} }, [TRAINER_TEAM_ROCKET_GRUNT_40] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt40), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt40} + .partySize = NELEMS(sParty_TeamRocketGrunt40), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt40} }, [TRAINER_TEAM_ROCKET_GRUNT_41] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt41), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt41} + .partySize = NELEMS(sParty_TeamRocketGrunt41), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt41} }, [TRAINER_COOLTRAINER_SAMUEL] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("SAMUEL"), .items = {ITEM_SUPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerSamuel), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerSamuel} + .partySize = NELEMS(sParty_CooltrainerSamuel), + .party = {.NoItemCustomMoves = sParty_CooltrainerSamuel} }, [TRAINER_COOLTRAINER_GEORGE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("GEORGE"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerGeorge), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerGeorge} + .partySize = NELEMS(sParty_CooltrainerGeorge), + .party = {.NoItemCustomMoves = sParty_CooltrainerGeorge} }, [TRAINER_COOLTRAINER_COLBY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("COLBY"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerColby), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerColby} + .partySize = NELEMS(sParty_CooltrainerColby), + .party = {.NoItemCustomMoves = sParty_CooltrainerColby} }, [TRAINER_COOLTRAINER_PAUL] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("PAUL"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerPaul), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerPaul} + .partySize = NELEMS(sParty_CooltrainerPaul), + .party = {.NoItemCustomMoves = sParty_CooltrainerPaul} }, [TRAINER_COOLTRAINER_ROLANDO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("ROLANDO"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerRolando), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerRolando} + .partySize = NELEMS(sParty_CooltrainerRolando), + .party = {.NoItemCustomMoves = sParty_CooltrainerRolando} }, [TRAINER_COOLTRAINER_GILBERT] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("GILBERT"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerGilbert), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerGilbert} + .partySize = NELEMS(sParty_CooltrainerGilbert), + .party = {.NoItemCustomMoves = sParty_CooltrainerGilbert} }, [TRAINER_COOLTRAINER_OWEN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("OWEN"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerOwen), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerOwen} + .partySize = NELEMS(sParty_CooltrainerOwen), + .party = {.NoItemCustomMoves = sParty_CooltrainerOwen} }, [TRAINER_COOLTRAINER_BERKE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("BERKE"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerBerke), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerBerke} + .partySize = NELEMS(sParty_CooltrainerBerke), + .party = {.NoItemCustomMoves = sParty_CooltrainerBerke} }, [TRAINER_COOLTRAINER_YUJI] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("YUJI"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerYuji), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerYuji} + .partySize = NELEMS(sParty_CooltrainerYuji), + .party = {.NoItemCustomMoves = sParty_CooltrainerYuji} }, [TRAINER_COOLTRAINER_WARREN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("WARREN"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerWarren), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerWarren} + .partySize = NELEMS(sParty_CooltrainerWarren), + .party = {.NoItemCustomMoves = sParty_CooltrainerWarren} }, [TRAINER_COOLTRAINER_MARY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("MARY"), .items = {ITEM_SUPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerMary), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerMary} + .partySize = NELEMS(sParty_CooltrainerMary), + .party = {.NoItemCustomMoves = sParty_CooltrainerMary} }, [TRAINER_COOLTRAINER_CAROLINE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("CAROLINE"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerCaroline), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerCaroline} + .partySize = NELEMS(sParty_CooltrainerCaroline), + .party = {.NoItemCustomMoves = sParty_CooltrainerCaroline} }, [TRAINER_COOLTRAINER_ALEXA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("ALEXA"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerAlexa), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerAlexa} + .partySize = NELEMS(sParty_CooltrainerAlexa), + .party = {.NoItemCustomMoves = sParty_CooltrainerAlexa} }, [TRAINER_COOLTRAINER_SHANNON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("SHANNON"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerShannon), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerShannon} + .partySize = NELEMS(sParty_CooltrainerShannon), + .party = {.NoItemCustomMoves = sParty_CooltrainerShannon} }, [TRAINER_COOLTRAINER_NAOMI] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("NAOMI"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerNaomi), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerNaomi} + .partySize = NELEMS(sParty_CooltrainerNaomi), + .party = {.NoItemCustomMoves = sParty_CooltrainerNaomi} }, [TRAINER_COOLTRAINER_BROOKE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("BROOKE"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerBrooke), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerBrooke} + .partySize = NELEMS(sParty_CooltrainerBrooke), + .party = {.NoItemCustomMoves = sParty_CooltrainerBrooke} }, [TRAINER_COOLTRAINER_AUSTINA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("AUSTINA"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerAustina), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerAustina} + .partySize = NELEMS(sParty_CooltrainerAustina), + .party = {.NoItemCustomMoves = sParty_CooltrainerAustina} }, [TRAINER_COOLTRAINER_JULIE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("JULIE"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerJulie), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerJulie} + .partySize = NELEMS(sParty_CooltrainerJulie), + .party = {.NoItemCustomMoves = sParty_CooltrainerJulie} }, [TRAINER_ELITE_FOUR_LORELEI] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_ELITE_FOUR_2, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_ELITE_FOUR_LORELEI, .trainerName = _("LORELEI"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_EliteFourLorelei), - .party = {.ItemCustomMoves = sTrainerMons_EliteFourLorelei} + .partySize = NELEMS(sParty_EliteFourLorelei), + .party = {.ItemCustomMoves = sParty_EliteFourLorelei} }, [TRAINER_ELITE_FOUR_BRUNO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_ELITE_FOUR_2, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_BRUNO, .trainerName = _("BRUNO"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_EliteFourBruno), - .party = {.ItemCustomMoves = sTrainerMons_EliteFourBruno} + .partySize = NELEMS(sParty_EliteFourBruno), + .party = {.ItemCustomMoves = sParty_EliteFourBruno} }, [TRAINER_ELITE_FOUR_AGATHA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_ELITE_FOUR_2, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_ELITE_FOUR_AGATHA, .trainerName = _("AGATHA"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_EliteFourAgatha), - .party = {.ItemCustomMoves = sTrainerMons_EliteFourAgatha} + .partySize = NELEMS(sParty_EliteFourAgatha), + .party = {.ItemCustomMoves = sParty_EliteFourAgatha} }, [TRAINER_ELITE_FOUR_LANCE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_ELITE_FOUR_2, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_LANCE, .trainerName = _("LANCE"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_EliteFourLance), - .party = {.ItemCustomMoves = sTrainerMons_EliteFourLance} + .partySize = NELEMS(sParty_EliteFourLance), + .party = {.ItemCustomMoves = sParty_EliteFourLance} }, [TRAINER_LEADER_BROCK] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_LEADER_2, + .trainerClass = TRAINER_CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_LEADER_BROCK, .trainerName = _("BROCK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_LeaderBrock), - .party = {.NoItemCustomMoves = sTrainerMons_LeaderBrock} + .partySize = NELEMS(sParty_LeaderBrock), + .party = {.NoItemCustomMoves = sParty_LeaderBrock} }, [TRAINER_LEADER_MISTY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_LEADER_2, + .trainerClass = TRAINER_CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LEADER_MISTY, .trainerName = _("MISTY"), .items = {ITEM_SUPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_LeaderMisty), - .party = {.NoItemCustomMoves = sTrainerMons_LeaderMisty} + .partySize = NELEMS(sParty_LeaderMisty), + .party = {.NoItemCustomMoves = sParty_LeaderMisty} }, [TRAINER_LEADER_LT_SURGE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_LEADER_2, + .trainerClass = TRAINER_CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_LEADER_LT_SURGE, .trainerName = _("LT. SURGE"), .items = {ITEM_SUPER_POTION, ITEM_FULL_HEAL}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_LeaderLtSurge), - .party = {.NoItemCustomMoves = sTrainerMons_LeaderLtSurge} + .partySize = NELEMS(sParty_LeaderLtSurge), + .party = {.NoItemCustomMoves = sParty_LeaderLtSurge} }, [TRAINER_LEADER_ERIKA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_LEADER_2, + .trainerClass = TRAINER_CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LEADER_ERIKA, .trainerName = _("ERIKA"), .items = {ITEM_HYPER_POTION, ITEM_FULL_HEAL}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_LeaderErika), - .party = {.NoItemCustomMoves = sTrainerMons_LeaderErika} + .partySize = NELEMS(sParty_LeaderErika), + .party = {.NoItemCustomMoves = sParty_LeaderErika} }, [TRAINER_LEADER_KOGA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_LEADER_2, + .trainerClass = TRAINER_CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_LEADER_KOGA, .trainerName = _("KOGA"), .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_FULL_HEAL}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_LeaderKoga), - .party = {.NoItemCustomMoves = sTrainerMons_LeaderKoga} + .partySize = NELEMS(sParty_LeaderKoga), + .party = {.NoItemCustomMoves = sParty_LeaderKoga} }, [TRAINER_LEADER_BLAINE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_LEADER_2, + .trainerClass = TRAINER_CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_LEADER_BLAINE, .trainerName = _("BLAINE"), .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_FULL_HEAL}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_LeaderBlaine), - .party = {.NoItemCustomMoves = sTrainerMons_LeaderBlaine} + .partySize = NELEMS(sParty_LeaderBlaine), + .party = {.NoItemCustomMoves = sParty_LeaderBlaine} }, [TRAINER_LEADER_SABRINA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_LEADER_2, + .trainerClass = TRAINER_CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LEADER_SABRINA, .trainerName = _("SABRINA"), .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_FULL_HEAL}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_LeaderSabrina), - .party = {.NoItemCustomMoves = sTrainerMons_LeaderSabrina} + .partySize = NELEMS(sParty_LeaderSabrina), + .party = {.NoItemCustomMoves = sParty_LeaderSabrina} }, [TRAINER_GENTLEMAN_THOMAS] = { .partyFlags = 0, - .trainerClass = CLASS_GENTLEMAN_2, + .trainerClass = TRAINER_CLASS_GENTLEMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("THOMAS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GentlemanThomas), - .party = {.NoItemDefaultMoves = sTrainerMons_GentlemanThomas} + .partySize = NELEMS(sParty_GentlemanThomas), + .party = {.NoItemDefaultMoves = sParty_GentlemanThomas} }, [TRAINER_GENTLEMAN_ARTHUR] = { .partyFlags = 0, - .trainerClass = CLASS_GENTLEMAN_2, + .trainerClass = TRAINER_CLASS_GENTLEMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("ARTHUR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GentlemanArthur), - .party = {.NoItemDefaultMoves = sTrainerMons_GentlemanArthur} + .partySize = NELEMS(sParty_GentlemanArthur), + .party = {.NoItemDefaultMoves = sParty_GentlemanArthur} }, [TRAINER_GENTLEMAN_TUCKER] = { .partyFlags = 0, - .trainerClass = CLASS_GENTLEMAN_2, + .trainerClass = TRAINER_CLASS_GENTLEMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("TUCKER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GentlemanTucker), - .party = {.NoItemDefaultMoves = sTrainerMons_GentlemanTucker} + .partySize = NELEMS(sParty_GentlemanTucker), + .party = {.NoItemDefaultMoves = sParty_GentlemanTucker} }, [TRAINER_GENTLEMAN_NORTON] = { .partyFlags = 0, - .trainerClass = CLASS_GENTLEMAN_2, + .trainerClass = TRAINER_CLASS_GENTLEMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("NORTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GentlemanNorton), - .party = {.NoItemDefaultMoves = sTrainerMons_GentlemanNorton} + .partySize = NELEMS(sParty_GentlemanNorton), + .party = {.NoItemDefaultMoves = sParty_GentlemanNorton} }, [TRAINER_GENTLEMAN_WALTER] = { .partyFlags = 0, - .trainerClass = CLASS_GENTLEMAN_2, + .trainerClass = TRAINER_CLASS_GENTLEMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("WALTER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GentlemanWalter), - .party = {.NoItemDefaultMoves = sTrainerMons_GentlemanWalter} + .partySize = NELEMS(sParty_GentlemanWalter), + .party = {.NoItemDefaultMoves = sParty_GentlemanWalter} }, [TRAINER_RIVAL_SS_ANNE_SQUIRTLE] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalSsAnneSquirtle), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalSsAnneSquirtle} + .partySize = NELEMS(sParty_RivalSsAnneSquirtle), + .party = {.NoItemDefaultMoves = sParty_RivalSsAnneSquirtle} }, [TRAINER_RIVAL_SS_ANNE_BULBASAUR] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalSsAnneBulbasaur), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalSsAnneBulbasaur} + .partySize = NELEMS(sParty_RivalSsAnneBulbasaur), + .party = {.NoItemDefaultMoves = sParty_RivalSsAnneBulbasaur} }, [TRAINER_RIVAL_SS_ANNE_CHARMANDER] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalSsAnneCharmander), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalSsAnneCharmander} + .partySize = NELEMS(sParty_RivalSsAnneCharmander), + .party = {.NoItemDefaultMoves = sParty_RivalSsAnneCharmander} }, [TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalPokenonTowerSquirtle), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalPokenonTowerSquirtle} + .partySize = NELEMS(sParty_RivalPokenonTowerSquirtle), + .party = {.NoItemDefaultMoves = sParty_RivalPokenonTowerSquirtle} }, [TRAINER_RIVAL_POKENON_TOWER_BULBASAUR] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalPokenonTowerBulbasaur), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalPokenonTowerBulbasaur} + .partySize = NELEMS(sParty_RivalPokenonTowerBulbasaur), + .party = {.NoItemDefaultMoves = sParty_RivalPokenonTowerBulbasaur} }, [TRAINER_RIVAL_POKENON_TOWER_CHARMANDER] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalPokenonTowerCharmander), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalPokenonTowerCharmander} + .partySize = NELEMS(sParty_RivalPokenonTowerCharmander), + .party = {.NoItemDefaultMoves = sParty_RivalPokenonTowerCharmander} }, [TRAINER_RIVAL_SILPH_SQUIRTLE] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalSilphSquirtle), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalSilphSquirtle} + .partySize = NELEMS(sParty_RivalSilphSquirtle), + .party = {.NoItemDefaultMoves = sParty_RivalSilphSquirtle} }, [TRAINER_RIVAL_SILPH_BULBASAUR] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalSilphBulbasaur), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalSilphBulbasaur} + .partySize = NELEMS(sParty_RivalSilphBulbasaur), + .party = {.NoItemDefaultMoves = sParty_RivalSilphBulbasaur} }, [TRAINER_RIVAL_SILPH_CHARMANDER] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalSilphCharmander), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalSilphCharmander} + .partySize = NELEMS(sParty_RivalSilphCharmander), + .party = {.NoItemDefaultMoves = sParty_RivalSilphCharmander} }, [TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalRoute22LateSquirtle), - .party = {.NoItemCustomMoves = sTrainerMons_RivalRoute22LateSquirtle} + .partySize = NELEMS(sParty_RivalRoute22LateSquirtle), + .party = {.NoItemCustomMoves = sParty_RivalRoute22LateSquirtle} }, [TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalRoute22LateBulbasaur), - .party = {.NoItemCustomMoves = sTrainerMons_RivalRoute22LateBulbasaur} + .partySize = NELEMS(sParty_RivalRoute22LateBulbasaur), + .party = {.NoItemCustomMoves = sParty_RivalRoute22LateBulbasaur} }, [TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalRoute22LateCharmander), - .party = {.NoItemCustomMoves = sTrainerMons_RivalRoute22LateCharmander} + .partySize = NELEMS(sParty_RivalRoute22LateCharmander), + .party = {.NoItemCustomMoves = sParty_RivalRoute22LateCharmander} }, [TRAINER_CHAMPION_FIRST_SQUIRTLE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CHAMPION_2, + .trainerClass = TRAINER_CLASS_CHAMPION, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CHAMPION_RIVAL, .trainerName = _("TERRY"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_ChampionFirstSquirtle), - .party = {.ItemCustomMoves = sTrainerMons_ChampionFirstSquirtle} + .partySize = NELEMS(sParty_ChampionFirstSquirtle), + .party = {.ItemCustomMoves = sParty_ChampionFirstSquirtle} }, [TRAINER_CHAMPION_FIRST_BULBASAUR] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CHAMPION_2, + .trainerClass = TRAINER_CLASS_CHAMPION, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CHAMPION_RIVAL, .trainerName = _("TERRY"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_ChampionFirstBulbasaur), - .party = {.ItemCustomMoves = sTrainerMons_ChampionFirstBulbasaur} + .partySize = NELEMS(sParty_ChampionFirstBulbasaur), + .party = {.ItemCustomMoves = sParty_ChampionFirstBulbasaur} }, [TRAINER_CHAMPION_FIRST_CHARMANDER] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CHAMPION_2, + .trainerClass = TRAINER_CLASS_CHAMPION, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CHAMPION_RIVAL, .trainerName = _("TERRY"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_ChampionFirstCharmander), - .party = {.ItemCustomMoves = sTrainerMons_ChampionFirstCharmander} + .partySize = NELEMS(sParty_ChampionFirstCharmander), + .party = {.ItemCustomMoves = sParty_ChampionFirstCharmander} }, [TRAINER_CHANNELER_PATRICIA] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("PATRICIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerPatricia), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerPatricia} + .partySize = NELEMS(sParty_ChannelerPatricia), + .party = {.NoItemDefaultMoves = sParty_ChannelerPatricia} }, [TRAINER_CHANNELER_CARLY] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("CARLY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerCarly), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerCarly} + .partySize = NELEMS(sParty_ChannelerCarly), + .party = {.NoItemDefaultMoves = sParty_ChannelerCarly} }, [TRAINER_CHANNELER_HOPE] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("HOPE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerHope), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerHope} + .partySize = NELEMS(sParty_ChannelerHope), + .party = {.NoItemDefaultMoves = sParty_ChannelerHope} }, [TRAINER_CHANNELER_PAULA] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("PAULA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerPaula), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerPaula} + .partySize = NELEMS(sParty_ChannelerPaula), + .party = {.NoItemDefaultMoves = sParty_ChannelerPaula} }, [TRAINER_CHANNELER_LAUREL] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("LAUREL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerLaurel), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerLaurel} + .partySize = NELEMS(sParty_ChannelerLaurel), + .party = {.NoItemDefaultMoves = sParty_ChannelerLaurel} }, [TRAINER_CHANNELER_JODY] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("JODY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerJody), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerJody} + .partySize = NELEMS(sParty_ChannelerJody), + .party = {.NoItemDefaultMoves = sParty_ChannelerJody} }, [TRAINER_CHANNELER_TAMMY] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("TAMMY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerTammy), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerTammy} + .partySize = NELEMS(sParty_ChannelerTammy), + .party = {.NoItemDefaultMoves = sParty_ChannelerTammy} }, [TRAINER_CHANNELER_RUTH] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("RUTH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerRuth), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerRuth} + .partySize = NELEMS(sParty_ChannelerRuth), + .party = {.NoItemDefaultMoves = sParty_ChannelerRuth} }, [TRAINER_CHANNELER_KARINA] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("KARINA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerKarina), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerKarina} + .partySize = NELEMS(sParty_ChannelerKarina), + .party = {.NoItemDefaultMoves = sParty_ChannelerKarina} }, [TRAINER_CHANNELER_JANAE] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("JANAE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerJanae), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerJanae} + .partySize = NELEMS(sParty_ChannelerJanae), + .party = {.NoItemDefaultMoves = sParty_ChannelerJanae} }, [TRAINER_CHANNELER_ANGELICA] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("ANGELICA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerAngelica), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerAngelica} + .partySize = NELEMS(sParty_ChannelerAngelica), + .party = {.NoItemDefaultMoves = sParty_ChannelerAngelica} }, [TRAINER_CHANNELER_EMILIA] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("EMILIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerEmilia), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerEmilia} + .partySize = NELEMS(sParty_ChannelerEmilia), + .party = {.NoItemDefaultMoves = sParty_ChannelerEmilia} }, [TRAINER_CHANNELER_JENNIFER] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("JENNIFER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerJennifer), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerJennifer} + .partySize = NELEMS(sParty_ChannelerJennifer), + .party = {.NoItemDefaultMoves = sParty_ChannelerJennifer} }, [TRAINER_CHANNELER_1] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Channeler1), - .party = {.NoItemDefaultMoves = sTrainerMons_Channeler1} + .partySize = NELEMS(sParty_Channeler1), + .party = {.NoItemDefaultMoves = sParty_Channeler1} }, [TRAINER_CHANNELER_2] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Channeler2), - .party = {.NoItemDefaultMoves = sTrainerMons_Channeler2} + .partySize = NELEMS(sParty_Channeler2), + .party = {.NoItemDefaultMoves = sParty_Channeler2} }, [TRAINER_CHANNELER_3] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Channeler3), - .party = {.NoItemDefaultMoves = sTrainerMons_Channeler3} + .partySize = NELEMS(sParty_Channeler3), + .party = {.NoItemDefaultMoves = sParty_Channeler3} }, [TRAINER_CHANNELER_4] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Channeler4), - .party = {.NoItemDefaultMoves = sTrainerMons_Channeler4} + .partySize = NELEMS(sParty_Channeler4), + .party = {.NoItemDefaultMoves = sParty_Channeler4} }, [TRAINER_CHANNELER_5] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Channeler5), - .party = {.NoItemDefaultMoves = sTrainerMons_Channeler5} + .partySize = NELEMS(sParty_Channeler5), + .party = {.NoItemDefaultMoves = sParty_Channeler5} }, [TRAINER_CHANNELER_6] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Channeler6), - .party = {.NoItemDefaultMoves = sTrainerMons_Channeler6} + .partySize = NELEMS(sParty_Channeler6), + .party = {.NoItemDefaultMoves = sParty_Channeler6} }, [TRAINER_CHANNELER_7] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Channeler7), - .party = {.NoItemDefaultMoves = sTrainerMons_Channeler7} + .partySize = NELEMS(sParty_Channeler7), + .party = {.NoItemDefaultMoves = sParty_Channeler7} }, [TRAINER_CHANNELER_8] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Channeler8), - .party = {.NoItemDefaultMoves = sTrainerMons_Channeler8} + .partySize = NELEMS(sParty_Channeler8), + .party = {.NoItemDefaultMoves = sParty_Channeler8} }, [TRAINER_CHANNELER_AMANDA] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("AMANDA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerAmanda), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerAmanda} + .partySize = NELEMS(sParty_ChannelerAmanda), + .party = {.NoItemDefaultMoves = sParty_ChannelerAmanda} }, [TRAINER_CHANNELER_STACY] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("STACY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerStacy), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerStacy} + .partySize = NELEMS(sParty_ChannelerStacy), + .party = {.NoItemDefaultMoves = sParty_ChannelerStacy} }, [TRAINER_CHANNELER_TASHA] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("TASHA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerTasha), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerTasha} + .partySize = NELEMS(sParty_ChannelerTasha), + .party = {.NoItemDefaultMoves = sParty_ChannelerTasha} }, [TRAINER_HIKER_JEREMY] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("JEREMY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerJeremy), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerJeremy} + .partySize = NELEMS(sParty_HikerJeremy), + .party = {.NoItemDefaultMoves = sParty_HikerJeremy} }, [TRAINER_PICNICKER_ALMA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ALMA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerAlma), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerAlma} + .partySize = NELEMS(sParty_PicnickerAlma), + .party = {.NoItemDefaultMoves = sParty_PicnickerAlma} }, [TRAINER_PICNICKER_SUSIE] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("SUSIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerSusie), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerSusie} + .partySize = NELEMS(sParty_PicnickerSusie), + .party = {.NoItemDefaultMoves = sParty_PicnickerSusie} }, [TRAINER_PICNICKER_VALERIE] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("VALERIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerValerie), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerValerie} + .partySize = NELEMS(sParty_PicnickerValerie), + .party = {.NoItemDefaultMoves = sParty_PicnickerValerie} }, [TRAINER_PICNICKER_GWEN] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("GWEN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerGwen), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerGwen} + .partySize = NELEMS(sParty_PicnickerGwen), + .party = {.NoItemDefaultMoves = sParty_PicnickerGwen} }, [TRAINER_BIKER_VIRGIL] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("VIRGIL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerVirgil), - .party = {.NoItemCustomMoves = sTrainerMons_BikerVirgil} + .partySize = NELEMS(sParty_BikerVirgil), + .party = {.NoItemCustomMoves = sParty_BikerVirgil} }, [TRAINER_CAMPER_FLINT] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("FLINT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperFlint), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperFlint} + .partySize = NELEMS(sParty_CamperFlint), + .party = {.NoItemDefaultMoves = sParty_CamperFlint} }, [TRAINER_PICNICKER_MISSY] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("MISSY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerMissy), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerMissy} + .partySize = NELEMS(sParty_PicnickerMissy), + .party = {.NoItemDefaultMoves = sParty_PicnickerMissy} }, [TRAINER_PICNICKER_IRENE] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("IRENE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerIrene), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerIrene} + .partySize = NELEMS(sParty_PicnickerIrene), + .party = {.NoItemDefaultMoves = sParty_PicnickerIrene} }, [TRAINER_PICNICKER_DANA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("DANA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerDana), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerDana} + .partySize = NELEMS(sParty_PicnickerDana), + .party = {.NoItemDefaultMoves = sParty_PicnickerDana} }, [TRAINER_PICNICKER_ARIANA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ARIANA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerAriana), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerAriana} + .partySize = NELEMS(sParty_PicnickerAriana), + .party = {.NoItemDefaultMoves = sParty_PicnickerAriana} }, [TRAINER_PICNICKER_LEAH] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("LEAH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerLeah), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerLeah} + .partySize = NELEMS(sParty_PicnickerLeah), + .party = {.NoItemDefaultMoves = sParty_PicnickerLeah} }, [TRAINER_CAMPER_JUSTIN] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("JUSTIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperJustin), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperJustin} + .partySize = NELEMS(sParty_CamperJustin), + .party = {.NoItemDefaultMoves = sParty_CamperJustin} }, [TRAINER_PICNICKER_YAZMIN] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("YAZMIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerYazmin), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerYazmin} + .partySize = NELEMS(sParty_PicnickerYazmin), + .party = {.NoItemDefaultMoves = sParty_PicnickerYazmin} }, [TRAINER_PICNICKER_KINDRA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("KINDRA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerKindra), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerKindra} + .partySize = NELEMS(sParty_PicnickerKindra), + .party = {.NoItemDefaultMoves = sParty_PicnickerKindra} }, [TRAINER_PICNICKER_BECKY] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("BECKY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerBecky), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerBecky} + .partySize = NELEMS(sParty_PicnickerBecky), + .party = {.NoItemDefaultMoves = sParty_PicnickerBecky} }, [TRAINER_PICNICKER_CELIA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("CELIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerCelia), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerCelia} + .partySize = NELEMS(sParty_PicnickerCelia), + .party = {.NoItemDefaultMoves = sParty_PicnickerCelia} }, [TRAINER_GENTLEMAN_BROOKS] = { .partyFlags = 0, - .trainerClass = CLASS_GENTLEMAN_2, + .trainerClass = TRAINER_CLASS_GENTLEMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("BROOKS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GentlemanBrooks), - .party = {.NoItemDefaultMoves = sTrainerMons_GentlemanBrooks} + .partySize = NELEMS(sParty_GentlemanBrooks), + .party = {.NoItemDefaultMoves = sParty_GentlemanBrooks} }, [TRAINER_GENTLEMAN_LAMAR] = { .partyFlags = 0, - .trainerClass = CLASS_GENTLEMAN_2, + .trainerClass = TRAINER_CLASS_GENTLEMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("LAMAR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GentlemanLamar), - .party = {.NoItemDefaultMoves = sTrainerMons_GentlemanLamar} + .partySize = NELEMS(sParty_GentlemanLamar), + .party = {.NoItemDefaultMoves = sParty_GentlemanLamar} }, [TRAINER_TWINS_ELI_ANNE] = { .partyFlags = 0, - .trainerClass = CLASS_TWINS_2, + .trainerClass = TRAINER_CLASS_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_TWINS, .trainerName = _("ELI & ANNE"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TwinsEliAnne), - .party = {.NoItemDefaultMoves = sTrainerMons_TwinsEliAnne} + .partySize = NELEMS(sParty_TwinsEliAnne), + .party = {.NoItemDefaultMoves = sParty_TwinsEliAnne} }, [TRAINER_COOL_COUPLE_RAY_TYRA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOL_COUPLE, + .trainerClass = TRAINER_CLASS_COOL_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOL_COUPLE, .trainerName = _("RAY & TYRA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CoolCoupleRayTyra), - .party = {.NoItemCustomMoves = sTrainerMons_CoolCoupleRayTyra} + .partySize = NELEMS(sParty_CoolCoupleRayTyra), + .party = {.NoItemCustomMoves = sParty_CoolCoupleRayTyra} }, [TRAINER_YOUNG_COUPLE_GIA_JES] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNG_COUPLE_2, + .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_YOUNG_COUPLE, .trainerName = _("GIA & JES"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungCoupleGiaJes), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungCoupleGiaJes} + .partySize = NELEMS(sParty_YoungCoupleGiaJes), + .party = {.NoItemDefaultMoves = sParty_YoungCoupleGiaJes} }, [TRAINER_TWINS_KIRI_JAN] = { .partyFlags = 0, - .trainerClass = CLASS_TWINS_2, + .trainerClass = TRAINER_CLASS_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_TWINS, .trainerName = _("KIRI & JAN"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TwinsKiriJan), - .party = {.NoItemDefaultMoves = sTrainerMons_TwinsKiriJan} + .partySize = NELEMS(sParty_TwinsKiriJan), + .party = {.NoItemDefaultMoves = sParty_TwinsKiriJan} }, [TRAINER_CRUSH_KIN_RON_MYA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_KIN, + .trainerClass = TRAINER_CLASS_CRUSH_KIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_KIN, .trainerName = _("RON & MYA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushKinRonMya), - .party = {.ItemDefaultMoves = sTrainerMons_CrushKinRonMya} + .partySize = NELEMS(sParty_CrushKinRonMya), + .party = {.ItemDefaultMoves = sParty_CrushKinRonMya} }, [TRAINER_YOUNG_COUPLE_LEA_JED] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNG_COUPLE_2, + .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_YOUNG_COUPLE, .trainerName = _("LEA & JED"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungCoupleLeaJed), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungCoupleLeaJed} + .partySize = NELEMS(sParty_YoungCoupleLeaJed), + .party = {.NoItemDefaultMoves = sParty_YoungCoupleLeaJed} }, [TRAINER_SIS_AND_BRO_LIA_LUC] = { .partyFlags = 0, - .trainerClass = CLASS_SIS_AND_BRO_2, + .trainerClass = TRAINER_CLASS_SIS_AND_BRO, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SIS_AND_BRO, .trainerName = _("LIA & LUC"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SisAndBroLiaLuc), - .party = {.NoItemDefaultMoves = sTrainerMons_SisAndBroLiaLuc} + .partySize = NELEMS(sParty_SisAndBroLiaLuc), + .party = {.NoItemDefaultMoves = sParty_SisAndBroLiaLuc} }, [TRAINER_SIS_AND_BRO_LIL_IAN] = { .partyFlags = 0, - .trainerClass = CLASS_SIS_AND_BRO_2, + .trainerClass = TRAINER_CLASS_SIS_AND_BRO, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SIS_AND_BRO, .trainerName = _("LIL & IAN"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SisAndBroLilIan), - .party = {.NoItemDefaultMoves = sTrainerMons_SisAndBroLilIan} + .partySize = NELEMS(sParty_SisAndBroLilIan), + .party = {.NoItemDefaultMoves = sParty_SisAndBroLilIan} }, [TRAINER_BUG_CATCHER_3] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcher3), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcher3} + .partySize = NELEMS(sParty_BugCatcher3), + .party = {.NoItemDefaultMoves = sParty_BugCatcher3} }, [TRAINER_BUG_CATCHER_4] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcher4), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcher4} + .partySize = NELEMS(sParty_BugCatcher4), + .party = {.NoItemDefaultMoves = sParty_BugCatcher4} }, [TRAINER_BUG_CATCHER_5] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcher5), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcher5} + .partySize = NELEMS(sParty_BugCatcher5), + .party = {.NoItemDefaultMoves = sParty_BugCatcher5} }, [TRAINER_BUG_CATCHER_6] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcher6), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcher6} + .partySize = NELEMS(sParty_BugCatcher6), + .party = {.NoItemDefaultMoves = sParty_BugCatcher6} }, [TRAINER_BUG_CATCHER_7] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcher7), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcher7} + .partySize = NELEMS(sParty_BugCatcher7), + .party = {.NoItemDefaultMoves = sParty_BugCatcher7} }, [TRAINER_BUG_CATCHER_8] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcher8), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcher8} + .partySize = NELEMS(sParty_BugCatcher8), + .party = {.NoItemDefaultMoves = sParty_BugCatcher8} }, [TRAINER_YOUNGSTER_BEN_3] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("BEN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterBen3), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterBen3} + .partySize = NELEMS(sParty_YoungsterBen3), + .party = {.NoItemDefaultMoves = sParty_YoungsterBen3} }, [TRAINER_YOUNGSTER_BEN_4] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("BEN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterBen4), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterBen4} + .partySize = NELEMS(sParty_YoungsterBen4), + .party = {.NoItemDefaultMoves = sParty_YoungsterBen4} }, [TRAINER_YOUNGSTER_CHAD_2] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("CHAD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterChad2), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterChad2} + .partySize = NELEMS(sParty_YoungsterChad2), + .party = {.NoItemDefaultMoves = sParty_YoungsterChad2} }, [TRAINER_LASS_RELI_2] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("RELI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassReli2), - .party = {.NoItemDefaultMoves = sTrainerMons_LassReli2} + .partySize = NELEMS(sParty_LassReli2), + .party = {.NoItemDefaultMoves = sParty_LassReli2} }, [TRAINER_LASS_RELI_3] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("RELI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassReli3), - .party = {.NoItemDefaultMoves = sTrainerMons_LassReli3} + .partySize = NELEMS(sParty_LassReli3), + .party = {.NoItemDefaultMoves = sParty_LassReli3} }, [TRAINER_YOUNGSTER_TIMMY_2] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("TIMMY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterTimmy2), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterTimmy2} + .partySize = NELEMS(sParty_YoungsterTimmy2), + .party = {.NoItemDefaultMoves = sParty_YoungsterTimmy2} }, [TRAINER_YOUNGSTER_TIMMY_3] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("TIMMY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterTimmy3), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterTimmy3} + .partySize = NELEMS(sParty_YoungsterTimmy3), + .party = {.NoItemDefaultMoves = sParty_YoungsterTimmy3} }, [TRAINER_YOUNGSTER_TIMMY_4] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("TIMMY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterTimmy4), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterTimmy4} + .partySize = NELEMS(sParty_YoungsterTimmy4), + .party = {.NoItemDefaultMoves = sParty_YoungsterTimmy4} }, [TRAINER_YOUNGSTER_CHAD_3] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("CHAD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterChad3), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterChad3} + .partySize = NELEMS(sParty_YoungsterChad3), + .party = {.NoItemDefaultMoves = sParty_YoungsterChad3} }, [TRAINER_LASS_JANICE_2] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("JANICE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassJanice2), - .party = {.NoItemDefaultMoves = sTrainerMons_LassJanice2} + .partySize = NELEMS(sParty_LassJanice2), + .party = {.NoItemDefaultMoves = sParty_LassJanice2} }, [TRAINER_LASS_JANICE_3] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("JANICE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassJanice3), - .party = {.NoItemDefaultMoves = sTrainerMons_LassJanice3} + .partySize = NELEMS(sParty_LassJanice3), + .party = {.NoItemDefaultMoves = sParty_LassJanice3} }, [TRAINER_YOUNGSTER_CHAD_4] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("CHAD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterChad4), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterChad4} + .partySize = NELEMS(sParty_YoungsterChad4), + .party = {.NoItemDefaultMoves = sParty_YoungsterChad4} }, [TRAINER_HIKER_FRANKLIN_2] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("FRANKLIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerFranklin2), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerFranklin2} + .partySize = NELEMS(sParty_HikerFranklin2), + .party = {.NoItemDefaultMoves = sParty_HikerFranklin2} }, [TRAINER_PKMN_PROF_PROF_OAK] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_PROF, + .trainerClass = TRAINER_CLASS_PKMN_PROF, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_PROFESSOR_OAK, .trainerName = _("PROF. OAK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnProfProfOak), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnProfProfOak} + .partySize = NELEMS(sParty_PkmnProfProfOak), + .party = {.NoItemDefaultMoves = sParty_PkmnProfProfOak} }, [TRAINER_PLAYER_BRENDAN] = { .partyFlags = 0, - .trainerClass = CLASS_PLAYER, + .trainerClass = TRAINER_CLASS_PLAYER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_BRENDAN_2, .trainerName = _("BRENDAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PlayerBrendan), - .party = {.NoItemDefaultMoves = sTrainerMons_PlayerBrendan} + .partySize = NELEMS(sParty_PlayerBrendan), + .party = {.NoItemDefaultMoves = sParty_PlayerBrendan} }, [TRAINER_PLAYER_MAY] = { .partyFlags = 0, - .trainerClass = CLASS_PLAYER, + .trainerClass = TRAINER_CLASS_PLAYER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_MAY_2, .trainerName = _("MAY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PlayerMay), - .party = {.NoItemDefaultMoves = sTrainerMons_PlayerMay} + .partySize = NELEMS(sParty_PlayerMay), + .party = {.NoItemDefaultMoves = sParty_PlayerMay} }, [TRAINER_PLAYER_RED] = { .partyFlags = 0, - .trainerClass = CLASS_PLAYER, + .trainerClass = TRAINER_CLASS_PLAYER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RED, .trainerName = _("RED"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PlayerRed), - .party = {.NoItemDefaultMoves = sTrainerMons_PlayerRed} + .partySize = NELEMS(sParty_PlayerRed), + .party = {.NoItemDefaultMoves = sParty_PlayerRed} }, [TRAINER_PLAYER_LEAF] = { .partyFlags = 0, - .trainerClass = CLASS_PLAYER, + .trainerClass = TRAINER_CLASS_PLAYER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_LEAF, .trainerName = _("LEAF"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PlayerLeaf), - .party = {.NoItemDefaultMoves = sTrainerMons_PlayerLeaf} + .partySize = NELEMS(sParty_PlayerLeaf), + .party = {.NoItemDefaultMoves = sParty_PlayerLeaf} }, [TRAINER_TEAM_ROCKET_GRUNT_42] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_F, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt42), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt42} + .partySize = NELEMS(sParty_TeamRocketGrunt42), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt42} }, [TRAINER_PSYCHIC_JACLYN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PSYCHIC_F, .trainerName = _("JACLYN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicJaclyn), - .party = {.NoItemCustomMoves = sTrainerMons_PsychicJaclyn} + .partySize = NELEMS(sParty_PsychicJaclyn), + .party = {.NoItemCustomMoves = sParty_PsychicJaclyn} }, [TRAINER_CRUSH_GIRL_SHARON] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_GIRL, + .trainerClass = TRAINER_CLASS_CRUSH_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_GIRL, .trainerName = _("SHARON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushGirlSharon), - .party = {.ItemDefaultMoves = sTrainerMons_CrushGirlSharon} + .partySize = NELEMS(sParty_CrushGirlSharon), + .party = {.ItemDefaultMoves = sParty_CrushGirlSharon} }, [TRAINER_TUBER_AMIRA] = { .partyFlags = 0, - .trainerClass = CLASS_TUBER_3, + .trainerClass = TRAINER_CLASS_TUBER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("AMIRA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TuberAmira), - .party = {.NoItemDefaultMoves = sTrainerMons_TuberAmira} + .partySize = NELEMS(sParty_TuberAmira), + .party = {.NoItemDefaultMoves = sParty_TuberAmira} }, [TRAINER_PKMN_BREEDER_ALIZE] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_BREEDER_2, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER, .trainerName = _("ALIZE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnBreederAlize), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnBreederAlize} + .partySize = NELEMS(sParty_PkmnBreederAlize), + .party = {.NoItemDefaultMoves = sParty_PkmnBreederAlize} }, [TRAINER_PKMN_RANGER_NICOLAS] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, .trainerName = _("NICOLAS"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerNicolas), - .party = {.NoItemCustomMoves = sTrainerMons_PkmnRangerNicolas} + .partySize = NELEMS(sParty_PkmnRangerNicolas), + .party = {.NoItemCustomMoves = sParty_PkmnRangerNicolas} }, [TRAINER_PKMN_RANGER_MADELINE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, .trainerName = _("MADELINE"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerMadeline), - .party = {.NoItemCustomMoves = sTrainerMons_PkmnRangerMadeline} + .partySize = NELEMS(sParty_PkmnRangerMadeline), + .party = {.NoItemCustomMoves = sParty_PkmnRangerMadeline} }, [TRAINER_AROMA_LADY_NIKKI] = { .partyFlags = 0, - .trainerClass = CLASS_AROMA_LADY_2, + .trainerClass = TRAINER_CLASS_AROMA_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_AROMA_LADY, .trainerName = _("NIKKI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_AromaLadyNikki), - .party = {.NoItemDefaultMoves = sTrainerMons_AromaLadyNikki} + .partySize = NELEMS(sParty_AromaLadyNikki), + .party = {.NoItemDefaultMoves = sParty_AromaLadyNikki} }, [TRAINER_RUIN_MANIAC_STANLY] = { .partyFlags = 0, - .trainerClass = CLASS_RUIN_MANIAC_2, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("STANLY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RuinManiacStanly), - .party = {.NoItemDefaultMoves = sTrainerMons_RuinManiacStanly} + .partySize = NELEMS(sParty_RuinManiacStanly), + .party = {.NoItemDefaultMoves = sParty_RuinManiacStanly} }, [TRAINER_LADY_JACKI] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_LADY_2, + .trainerClass = TRAINER_CLASS_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_LADY, .trainerName = _("JACKI"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LadyJacki), - .party = {.ItemDefaultMoves = sTrainerMons_LadyJacki} + .partySize = NELEMS(sParty_LadyJacki), + .party = {.ItemDefaultMoves = sParty_LadyJacki} }, [TRAINER_PAINTER_DAISY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PAINTER, + .trainerClass = TRAINER_CLASS_PAINTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_PAINTER, .trainerName = _("DAISY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PainterDaisy), - .party = {.NoItemCustomMoves = sTrainerMons_PainterDaisy} + .partySize = NELEMS(sParty_PainterDaisy), + .party = {.NoItemCustomMoves = sParty_PainterDaisy} }, [TRAINER_BIKER_GOON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("GOON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerGoon), - .party = {.NoItemCustomMoves = sTrainerMons_BikerGoon} + .partySize = NELEMS(sParty_BikerGoon), + .party = {.NoItemCustomMoves = sParty_BikerGoon} }, [TRAINER_BIKER_GOON_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("GOON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerGoon2), - .party = {.NoItemCustomMoves = sTrainerMons_BikerGoon2} + .partySize = NELEMS(sParty_BikerGoon2), + .party = {.NoItemCustomMoves = sParty_BikerGoon2} }, [TRAINER_BIKER_GOON_3] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("GOON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerGoon3), - .party = {.NoItemDefaultMoves = sTrainerMons_BikerGoon3} + .partySize = NELEMS(sParty_BikerGoon3), + .party = {.NoItemDefaultMoves = sParty_BikerGoon3} }, [TRAINER_BIKER_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Biker2), - .party = {.NoItemDefaultMoves = sTrainerMons_Biker2} + .partySize = NELEMS(sParty_Biker2), + .party = {.NoItemDefaultMoves = sParty_Biker2} }, [TRAINER_BUG_CATCHER_ANTHONY] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("ANTHONY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherAnthony), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherAnthony} + .partySize = NELEMS(sParty_BugCatcherAnthony), + .party = {.NoItemDefaultMoves = sParty_BugCatcherAnthony} }, [TRAINER_BUG_CATCHER_CHARLIE] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("CHARLIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherCharlie), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherCharlie} + .partySize = NELEMS(sParty_BugCatcherCharlie), + .party = {.NoItemDefaultMoves = sParty_BugCatcherCharlie} }, [TRAINER_TWINS_ELI_ANNE_2] = { .partyFlags = 0, - .trainerClass = CLASS_TWINS_2, + .trainerClass = TRAINER_CLASS_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_TWINS, .trainerName = _("ELI & ANNE"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TwinsEliAnne2), - .party = {.NoItemDefaultMoves = sTrainerMons_TwinsEliAnne2} + .partySize = NELEMS(sParty_TwinsEliAnne2), + .party = {.NoItemDefaultMoves = sParty_TwinsEliAnne2} }, [TRAINER_YOUNGSTER_JOHNSON] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("JOHNSON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterJohnson), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterJohnson} + .partySize = NELEMS(sParty_YoungsterJohnson), + .party = {.NoItemDefaultMoves = sParty_YoungsterJohnson} }, [TRAINER_BIKER_RICARDO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("RICARDO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerRicardo), - .party = {.NoItemCustomMoves = sTrainerMons_BikerRicardo} + .partySize = NELEMS(sParty_BikerRicardo), + .party = {.NoItemCustomMoves = sParty_BikerRicardo} }, [TRAINER_BIKER_JAREN] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("JAREN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerJaren), - .party = {.NoItemDefaultMoves = sTrainerMons_BikerJaren} + .partySize = NELEMS(sParty_BikerJaren), + .party = {.NoItemDefaultMoves = sParty_BikerJaren} }, [TRAINER_TEAM_ROCKET_GRUNT_43] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt43), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt43} + .partySize = NELEMS(sParty_TeamRocketGrunt43), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt43} }, [TRAINER_TEAM_ROCKET_GRUNT_44] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt44), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt44} + .partySize = NELEMS(sParty_TeamRocketGrunt44), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt44} }, [TRAINER_TEAM_ROCKET_GRUNT_45] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt45), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt45} + .partySize = NELEMS(sParty_TeamRocketGrunt45), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt45} }, [TRAINER_TEAM_ROCKET_GRUNT_46] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt46), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt46} + .partySize = NELEMS(sParty_TeamRocketGrunt46), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt46} }, [TRAINER_TEAM_ROCKET_GRUNT_47] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt47), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt47} + .partySize = NELEMS(sParty_TeamRocketGrunt47), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt47} }, [TRAINER_TEAM_ROCKET_GRUNT_48] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt48), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt48} + .partySize = NELEMS(sParty_TeamRocketGrunt48), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt48} }, [TRAINER_TEAM_ROCKET_ADMIN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_F, .trainerName = _("ADMIN"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_TeamRocketAdmin), - .party = {.NoItemCustomMoves = sTrainerMons_TeamRocketAdmin} + .partySize = NELEMS(sParty_TeamRocketAdmin), + .party = {.NoItemCustomMoves = sParty_TeamRocketAdmin} }, [TRAINER_TEAM_ROCKET_ADMIN_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("ADMIN"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_TeamRocketAdmin2), - .party = {.NoItemCustomMoves = sTrainerMons_TeamRocketAdmin2} + .partySize = NELEMS(sParty_TeamRocketAdmin2), + .party = {.NoItemCustomMoves = sParty_TeamRocketAdmin2} }, [TRAINER_SCIENTIST_GIDEON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("GIDEON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistGideon), - .party = {.NoItemCustomMoves = sTrainerMons_ScientistGideon} + .partySize = NELEMS(sParty_ScientistGideon), + .party = {.NoItemCustomMoves = sParty_ScientistGideon} }, [TRAINER_SWIMMER_FEMALE_AMARA] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("AMARA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleAmara), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleAmara} + .partySize = NELEMS(sParty_SwimmerFemaleAmara), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleAmara} }, [TRAINER_SWIMMER_FEMALE_MARIA] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("MARIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleMaria), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleMaria} + .partySize = NELEMS(sParty_SwimmerFemaleMaria), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleMaria} }, [TRAINER_SWIMMER_FEMALE_ABIGAIL] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("ABIGAIL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleAbigail), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleAbigail} + .partySize = NELEMS(sParty_SwimmerFemaleAbigail), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleAbigail} }, [TRAINER_SWIMMER_MALE_FINN] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("FINN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleFinn), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleFinn} + .partySize = NELEMS(sParty_SwimmerMaleFinn), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleFinn} }, [TRAINER_SWIMMER_MALE_GARRETT] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("GARRETT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleGarrett), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleGarrett} + .partySize = NELEMS(sParty_SwimmerMaleGarrett), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleGarrett} }, [TRAINER_FISHERMAN_TOMMY] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("TOMMY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanTommy), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanTommy} + .partySize = NELEMS(sParty_FishermanTommy), + .party = {.NoItemDefaultMoves = sParty_FishermanTommy} }, [TRAINER_CRUSH_GIRL_TANYA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_GIRL, + .trainerClass = TRAINER_CLASS_CRUSH_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_GIRL, .trainerName = _("TANYA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushGirlTanya), - .party = {.ItemDefaultMoves = sTrainerMons_CrushGirlTanya} + .partySize = NELEMS(sParty_CrushGirlTanya), + .party = {.ItemDefaultMoves = sParty_CrushGirlTanya} }, [TRAINER_BLACK_BELT_SHEA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("SHEA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltShea), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltShea} + .partySize = NELEMS(sParty_BlackBeltShea), + .party = {.ItemDefaultMoves = sParty_BlackBeltShea} }, [TRAINER_BLACK_BELT_HUGH] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("HUGH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltHugh), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltHugh} + .partySize = NELEMS(sParty_BlackBeltHugh), + .party = {.ItemDefaultMoves = sParty_BlackBeltHugh} }, [TRAINER_CAMPER_BRYCE] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("BRYCE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperBryce), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperBryce} + .partySize = NELEMS(sParty_CamperBryce), + .party = {.NoItemDefaultMoves = sParty_CamperBryce} }, [TRAINER_PICNICKER_CLAIRE] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("CLAIRE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerClaire), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerClaire} + .partySize = NELEMS(sParty_PicnickerClaire), + .party = {.NoItemDefaultMoves = sParty_PicnickerClaire} }, [TRAINER_CRUSH_KIN_MIK_KIA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_KIN, + .trainerClass = TRAINER_CLASS_CRUSH_KIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_KIN, .trainerName = _("MIK & KIA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushKinMikKia), - .party = {.ItemDefaultMoves = sTrainerMons_CrushKinMikKia} + .partySize = NELEMS(sParty_CrushKinMikKia), + .party = {.ItemDefaultMoves = sParty_CrushKinMikKia} }, [TRAINER_AROMA_LADY_VIOLET] = { .partyFlags = 0, - .trainerClass = CLASS_AROMA_LADY_2, + .trainerClass = TRAINER_CLASS_AROMA_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_AROMA_LADY, .trainerName = _("VIOLET"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_AromaLadyViolet), - .party = {.NoItemDefaultMoves = sTrainerMons_AromaLadyViolet} + .partySize = NELEMS(sParty_AromaLadyViolet), + .party = {.NoItemDefaultMoves = sParty_AromaLadyViolet} }, [TRAINER_TUBER_ALEXIS] = { .partyFlags = 0, - .trainerClass = CLASS_TUBER_3, + .trainerClass = TRAINER_CLASS_TUBER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("ALEXIS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TuberAlexis), - .party = {.NoItemDefaultMoves = sTrainerMons_TuberAlexis} + .partySize = NELEMS(sParty_TuberAlexis), + .party = {.NoItemDefaultMoves = sParty_TuberAlexis} }, [TRAINER_TWINS_JOY_MEG] = { .partyFlags = 0, - .trainerClass = CLASS_TWINS_2, + .trainerClass = TRAINER_CLASS_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_TWINS, .trainerName = _("JOY & MEG"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TwinsJoyMeg), - .party = {.NoItemDefaultMoves = sTrainerMons_TwinsJoyMeg} + .partySize = NELEMS(sParty_TwinsJoyMeg), + .party = {.NoItemDefaultMoves = sParty_TwinsJoyMeg} }, [TRAINER_SWIMMER_FEMALE_TISHA] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("TISHA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleTisha), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleTisha} + .partySize = NELEMS(sParty_SwimmerFemaleTisha), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleTisha} }, [TRAINER_PAINTER_CELINA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PAINTER, + .trainerClass = TRAINER_CLASS_PAINTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_PAINTER, .trainerName = _("CELINA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PainterCelina), - .party = {.NoItemCustomMoves = sTrainerMons_PainterCelina} + .partySize = NELEMS(sParty_PainterCelina), + .party = {.NoItemCustomMoves = sParty_PainterCelina} }, [TRAINER_PAINTER_RAYNA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PAINTER, + .trainerClass = TRAINER_CLASS_PAINTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_PAINTER, .trainerName = _("RAYNA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PainterRayna), - .party = {.NoItemCustomMoves = sTrainerMons_PainterRayna} + .partySize = NELEMS(sParty_PainterRayna), + .party = {.NoItemCustomMoves = sParty_PainterRayna} }, [TRAINER_LADY_GILLIAN] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_LADY_2, + .trainerClass = TRAINER_CLASS_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_LADY, .trainerName = _("GILLIAN"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LadyGillian), - .party = {.ItemDefaultMoves = sTrainerMons_LadyGillian} + .partySize = NELEMS(sParty_LadyGillian), + .party = {.ItemDefaultMoves = sParty_LadyGillian} }, [TRAINER_YOUNGSTER_DESTIN] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("DESTIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterDestin), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterDestin} + .partySize = NELEMS(sParty_YoungsterDestin), + .party = {.NoItemDefaultMoves = sParty_YoungsterDestin} }, [TRAINER_SWIMMER_MALE_TOBY] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("TOBY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleToby), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleToby} + .partySize = NELEMS(sParty_SwimmerMaleToby), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleToby} }, [TRAINER_TEAM_ROCKET_GRUNT_49] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt49), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt49} + .partySize = NELEMS(sParty_TeamRocketGrunt49), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt49} }, [TRAINER_TEAM_ROCKET_GRUNT_50] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt50), - .party = {.NoItemCustomMoves = sTrainerMons_TeamRocketGrunt50} + .partySize = NELEMS(sParty_TeamRocketGrunt50), + .party = {.NoItemCustomMoves = sParty_TeamRocketGrunt50} }, [TRAINER_TEAM_ROCKET_GRUNT_51] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_F, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt51), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt51} + .partySize = NELEMS(sParty_TeamRocketGrunt51), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt51} }, [TRAINER_BIRD_KEEPER_MILO] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("MILO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperMilo), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperMilo} + .partySize = NELEMS(sParty_BirdKeeperMilo), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperMilo} }, [TRAINER_BIRD_KEEPER_CHAZ] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("CHAZ"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperChaz), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperChaz} + .partySize = NELEMS(sParty_BirdKeeperChaz), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperChaz} }, [TRAINER_BIRD_KEEPER_HAROLD] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("HAROLD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperHarold), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperHarold} + .partySize = NELEMS(sParty_BirdKeeperHarold), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperHarold} }, [TRAINER_FISHERMAN_TYLOR] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("TYLOR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanTylor), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanTylor} + .partySize = NELEMS(sParty_FishermanTylor), + .party = {.NoItemDefaultMoves = sParty_FishermanTylor} }, [TRAINER_SWIMMER_MALE_MYMO] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("MYMO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleMymo), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleMymo} + .partySize = NELEMS(sParty_SwimmerMaleMymo), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleMymo} }, [TRAINER_SWIMMER_FEMALE_NICOLE] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("NICOLE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleNicole), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleNicole} + .partySize = NELEMS(sParty_SwimmerFemaleNicole), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleNicole} }, [TRAINER_SIS_AND_BRO_AVA_GEB] = { .partyFlags = 0, - .trainerClass = CLASS_SIS_AND_BRO_2, + .trainerClass = TRAINER_CLASS_SIS_AND_BRO, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SIS_AND_BRO, .trainerName = _("AVA & GEB"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SisAndBroAvaGeb), - .party = {.NoItemDefaultMoves = sTrainerMons_SisAndBroAvaGeb} + .partySize = NELEMS(sParty_SisAndBroAvaGeb), + .party = {.NoItemDefaultMoves = sParty_SisAndBroAvaGeb} }, [TRAINER_AROMA_LADY_ROSE] = { .partyFlags = 0, - .trainerClass = CLASS_AROMA_LADY_2, + .trainerClass = TRAINER_CLASS_AROMA_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_AROMA_LADY, .trainerName = _("ROSE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_AromaLadyRose), - .party = {.NoItemDefaultMoves = sTrainerMons_AromaLadyRose} + .partySize = NELEMS(sParty_AromaLadyRose), + .party = {.NoItemDefaultMoves = sParty_AromaLadyRose} }, [TRAINER_SWIMMER_MALE_SAMIR] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("SAMIR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleSamir), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleSamir} + .partySize = NELEMS(sParty_SwimmerMaleSamir), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleSamir} }, [TRAINER_SWIMMER_FEMALE_DENISE] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("DENISE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleDenise), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleDenise} + .partySize = NELEMS(sParty_SwimmerFemaleDenise), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleDenise} }, [TRAINER_TWINS_MIU_MIA] = { .partyFlags = 0, - .trainerClass = CLASS_TWINS_2, + .trainerClass = TRAINER_CLASS_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_TWINS, .trainerName = _("MIU & MIA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TwinsMiuMia), - .party = {.NoItemDefaultMoves = sTrainerMons_TwinsMiuMia} + .partySize = NELEMS(sParty_TwinsMiuMia), + .party = {.NoItemDefaultMoves = sParty_TwinsMiuMia} }, [TRAINER_HIKER_EARL] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("EARL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerEarl), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerEarl} + .partySize = NELEMS(sParty_HikerEarl), + .party = {.NoItemDefaultMoves = sParty_HikerEarl} }, [TRAINER_RUIN_MANIAC_FOSTER] = { .partyFlags = 0, - .trainerClass = CLASS_RUIN_MANIAC_2, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("FOSTER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RuinManiacFoster), - .party = {.NoItemDefaultMoves = sTrainerMons_RuinManiacFoster} + .partySize = NELEMS(sParty_RuinManiacFoster), + .party = {.NoItemDefaultMoves = sParty_RuinManiacFoster} }, [TRAINER_RUIN_MANIAC_LARRY] = { .partyFlags = 0, - .trainerClass = CLASS_RUIN_MANIAC_2, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("LARRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RuinManiacLarry), - .party = {.NoItemDefaultMoves = sTrainerMons_RuinManiacLarry} + .partySize = NELEMS(sParty_RuinManiacLarry), + .party = {.NoItemDefaultMoves = sParty_RuinManiacLarry} }, [TRAINER_HIKER_DARYL] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("DARYL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerDaryl), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerDaryl} + .partySize = NELEMS(sParty_HikerDaryl), + .party = {.NoItemDefaultMoves = sParty_HikerDaryl} }, [TRAINER_POKEMANIAC_HECTOR] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("HECTOR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacHector), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacHector} + .partySize = NELEMS(sParty_PokemaniacHector), + .party = {.NoItemDefaultMoves = sParty_PokemaniacHector} }, [TRAINER_PSYCHIC_DARIO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_PSYCHIC_M, .trainerName = _("DARIO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicDario), - .party = {.NoItemCustomMoves = sTrainerMons_PsychicDario} + .partySize = NELEMS(sParty_PsychicDario), + .party = {.NoItemCustomMoves = sParty_PsychicDario} }, [TRAINER_PSYCHIC_RODETTE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PSYCHIC_F, .trainerName = _("RODETTE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicRodette), - .party = {.NoItemCustomMoves = sTrainerMons_PsychicRodette} + .partySize = NELEMS(sParty_PsychicRodette), + .party = {.NoItemCustomMoves = sParty_PsychicRodette} }, [TRAINER_AROMA_LADY_MIAH] = { .partyFlags = 0, - .trainerClass = CLASS_AROMA_LADY_2, + .trainerClass = TRAINER_CLASS_AROMA_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_AROMA_LADY, .trainerName = _("MIAH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_AromaLadyMiah), - .party = {.NoItemDefaultMoves = sTrainerMons_AromaLadyMiah} + .partySize = NELEMS(sParty_AromaLadyMiah), + .party = {.NoItemDefaultMoves = sParty_AromaLadyMiah} }, [TRAINER_YOUNG_COUPLE_EVE_JON] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNG_COUPLE_2, + .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_YOUNG_COUPLE, .trainerName = _("EVE & JON"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungCoupleEveJon), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungCoupleEveJon} + .partySize = NELEMS(sParty_YoungCoupleEveJon), + .party = {.NoItemDefaultMoves = sParty_YoungCoupleEveJon} }, [TRAINER_JUGGLER_MASON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("MASON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerMason), - .party = {.NoItemCustomMoves = sTrainerMons_JugglerMason} + .partySize = NELEMS(sParty_JugglerMason), + .party = {.NoItemCustomMoves = sParty_JugglerMason} }, [TRAINER_CRUSH_GIRL_CYNDY] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_GIRL, + .trainerClass = TRAINER_CLASS_CRUSH_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_GIRL, .trainerName = _("CYNDY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushGirlCyndy), - .party = {.ItemDefaultMoves = sTrainerMons_CrushGirlCyndy} + .partySize = NELEMS(sParty_CrushGirlCyndy), + .party = {.ItemDefaultMoves = sParty_CrushGirlCyndy} }, [TRAINER_CRUSH_GIRL_JOCELYN] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_GIRL, + .trainerClass = TRAINER_CLASS_CRUSH_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_GIRL, .trainerName = _("JOCELYN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushGirlJocelyn), - .party = {.ItemDefaultMoves = sTrainerMons_CrushGirlJocelyn} + .partySize = NELEMS(sParty_CrushGirlJocelyn), + .party = {.ItemDefaultMoves = sParty_CrushGirlJocelyn} }, [TRAINER_TAMER_EVAN] = { .partyFlags = 0, - .trainerClass = CLASS_TAMER, + .trainerClass = TRAINER_CLASS_TAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_TAMER, .trainerName = _("EVAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TamerEvan), - .party = {.NoItemDefaultMoves = sTrainerMons_TamerEvan} + .partySize = NELEMS(sParty_TamerEvan), + .party = {.NoItemDefaultMoves = sParty_TamerEvan} }, [TRAINER_POKEMANIAC_MARK_2] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("MARK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacMark2), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacMark2} + .partySize = NELEMS(sParty_PokemaniacMark2), + .party = {.NoItemDefaultMoves = sParty_PokemaniacMark2} }, [TRAINER_PKMN_RANGER_LOGAN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, .trainerName = _("LOGAN"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerLogan), - .party = {.NoItemCustomMoves = sTrainerMons_PkmnRangerLogan} + .partySize = NELEMS(sParty_PkmnRangerLogan), + .party = {.NoItemCustomMoves = sParty_PkmnRangerLogan} }, [TRAINER_PKMN_RANGER_JACKSON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, .trainerName = _("JACKSON"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerJackson), - .party = {.NoItemCustomMoves = sTrainerMons_PkmnRangerJackson} + .partySize = NELEMS(sParty_PkmnRangerJackson), + .party = {.NoItemCustomMoves = sParty_PkmnRangerJackson} }, [TRAINER_PKMN_RANGER_BETH] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, .trainerName = _("BETH"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerBeth), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnRangerBeth} + .partySize = NELEMS(sParty_PkmnRangerBeth), + .party = {.NoItemDefaultMoves = sParty_PkmnRangerBeth} }, [TRAINER_PKMN_RANGER_KATELYN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, .trainerName = _("KATELYN"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerKatelyn), - .party = {.NoItemCustomMoves = sTrainerMons_PkmnRangerKatelyn} + .partySize = NELEMS(sParty_PkmnRangerKatelyn), + .party = {.NoItemCustomMoves = sParty_PkmnRangerKatelyn} }, [TRAINER_COOLTRAINER_LEROY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("LEROY"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerLeroy), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerLeroy} + .partySize = NELEMS(sParty_CooltrainerLeroy), + .party = {.NoItemCustomMoves = sParty_CooltrainerLeroy} }, [TRAINER_COOLTRAINER_MICHELLE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("MICHELLE"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerMichelle), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerMichelle} + .partySize = NELEMS(sParty_CooltrainerMichelle), + .party = {.NoItemCustomMoves = sParty_CooltrainerMichelle} }, [TRAINER_COOL_COUPLE_LEX_NYA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOL_COUPLE, + .trainerClass = TRAINER_CLASS_COOL_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOL_COUPLE, .trainerName = _("LEX & NYA"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CoolCoupleLexNya), - .party = {.NoItemCustomMoves = sTrainerMons_CoolCoupleLexNya} + .partySize = NELEMS(sParty_CoolCoupleLexNya), + .party = {.NoItemCustomMoves = sParty_CoolCoupleLexNya} }, [TRAINER_RUIN_MANIAC_BRANDON] = { .partyFlags = 0, - .trainerClass = CLASS_RUIN_MANIAC_2, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("BRANDON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RuinManiacBrandon), - .party = {.NoItemDefaultMoves = sTrainerMons_RuinManiacBrandon} + .partySize = NELEMS(sParty_RuinManiacBrandon), + .party = {.NoItemDefaultMoves = sParty_RuinManiacBrandon} }, [TRAINER_RUIN_MANIAC_BENJAMIN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RUIN_MANIAC_2, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("BENJAMIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RuinManiacBenjamin), - .party = {.NoItemCustomMoves = sTrainerMons_RuinManiacBenjamin} + .partySize = NELEMS(sParty_RuinManiacBenjamin), + .party = {.NoItemCustomMoves = sParty_RuinManiacBenjamin} }, [TRAINER_PAINTER_EDNA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PAINTER, + .trainerClass = TRAINER_CLASS_PAINTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_PAINTER, .trainerName = _("EDNA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PainterEdna), - .party = {.NoItemCustomMoves = sTrainerMons_PainterEdna} + .partySize = NELEMS(sParty_PainterEdna), + .party = {.NoItemCustomMoves = sParty_PainterEdna} }, [TRAINER_GENTLEMAN_CLIFFORD] = { .partyFlags = 0, - .trainerClass = CLASS_GENTLEMAN_2, + .trainerClass = TRAINER_CLASS_GENTLEMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("CLIFFORD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GentlemanClifford), - .party = {.NoItemDefaultMoves = sTrainerMons_GentlemanClifford} + .partySize = NELEMS(sParty_GentlemanClifford), + .party = {.NoItemDefaultMoves = sParty_GentlemanClifford} }, [TRAINER_LADY_SELPHY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_LADY_2, + .trainerClass = TRAINER_CLASS_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_LADY, .trainerName = _("SELPHY"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LadySelphy), - .party = {.ItemCustomMoves = sTrainerMons_LadySelphy} + .partySize = NELEMS(sParty_LadySelphy), + .party = {.ItemCustomMoves = sParty_LadySelphy} }, [TRAINER_RUIN_MANIAC_LAWSON] = { .partyFlags = 0, - .trainerClass = CLASS_RUIN_MANIAC_2, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("LAWSON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RuinManiacLawson), - .party = {.NoItemDefaultMoves = sTrainerMons_RuinManiacLawson} + .partySize = NELEMS(sParty_RuinManiacLawson), + .party = {.NoItemDefaultMoves = sParty_RuinManiacLawson} }, [TRAINER_PSYCHIC_LAURA] = { .partyFlags = 0, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PSYCHIC_F, .trainerName = _("LAURA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicLaura), - .party = {.NoItemDefaultMoves = sTrainerMons_PsychicLaura} + .partySize = NELEMS(sParty_PsychicLaura), + .party = {.NoItemDefaultMoves = sParty_PsychicLaura} }, [TRAINER_PKMN_BREEDER_BETHANY] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_BREEDER_2, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER, .trainerName = _("BETHANY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnBreederBethany), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnBreederBethany} + .partySize = NELEMS(sParty_PkmnBreederBethany), + .party = {.NoItemDefaultMoves = sParty_PkmnBreederBethany} }, [TRAINER_PKMN_BREEDER_ALLISON] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_BREEDER_2, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER, .trainerName = _("ALLISON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnBreederAllison), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnBreederAllison} + .partySize = NELEMS(sParty_PkmnBreederAllison), + .party = {.NoItemDefaultMoves = sParty_PkmnBreederAllison} }, [TRAINER_BUG_CATCHER_GARRET] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("GARRET"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherGarret), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherGarret} + .partySize = NELEMS(sParty_BugCatcherGarret), + .party = {.NoItemDefaultMoves = sParty_BugCatcherGarret} }, [TRAINER_BUG_CATCHER_JONAH] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("JONAH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherJonah), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherJonah} + .partySize = NELEMS(sParty_BugCatcherJonah), + .party = {.NoItemDefaultMoves = sParty_BugCatcherJonah} }, [TRAINER_BUG_CATCHER_VANCE] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("VANCE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherVance), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherVance} + .partySize = NELEMS(sParty_BugCatcherVance), + .party = {.NoItemDefaultMoves = sParty_BugCatcherVance} }, [TRAINER_YOUNGSTER_NASH] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("NASH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterNash), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterNash} + .partySize = NELEMS(sParty_YoungsterNash), + .party = {.NoItemDefaultMoves = sParty_YoungsterNash} }, [TRAINER_YOUNGSTER_CORDELL] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("CORDELL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterCordell), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterCordell} + .partySize = NELEMS(sParty_YoungsterCordell), + .party = {.NoItemDefaultMoves = sParty_YoungsterCordell} }, [TRAINER_LASS_DALIA] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("DALIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassDalia), - .party = {.NoItemDefaultMoves = sTrainerMons_LassDalia} + .partySize = NELEMS(sParty_LassDalia), + .party = {.NoItemDefaultMoves = sParty_LassDalia} }, [TRAINER_LASS_JOANA] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("JOANA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassJoana), - .party = {.NoItemDefaultMoves = sTrainerMons_LassJoana} + .partySize = NELEMS(sParty_LassJoana), + .party = {.NoItemDefaultMoves = sParty_LassJoana} }, [TRAINER_CAMPER_RILEY] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("RILEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperRiley), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperRiley} + .partySize = NELEMS(sParty_CamperRiley), + .party = {.NoItemDefaultMoves = sParty_CamperRiley} }, [TRAINER_PICNICKER_MARCY] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("MARCY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerMarcy), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerMarcy} + .partySize = NELEMS(sParty_PicnickerMarcy), + .party = {.NoItemDefaultMoves = sParty_PicnickerMarcy} }, [TRAINER_RUIN_MANIAC_LAYTON] = { .partyFlags = 0, - .trainerClass = CLASS_RUIN_MANIAC_2, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("LAYTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RuinManiacLayton), - .party = {.NoItemDefaultMoves = sTrainerMons_RuinManiacLayton} + .partySize = NELEMS(sParty_RuinManiacLayton), + .party = {.NoItemDefaultMoves = sParty_RuinManiacLayton} }, [TRAINER_PICNICKER_KELSEY_2] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("KELSEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerKelsey2), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerKelsey2} + .partySize = NELEMS(sParty_PicnickerKelsey2), + .party = {.NoItemDefaultMoves = sParty_PicnickerKelsey2} }, [TRAINER_PICNICKER_KELSEY_3] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("KELSEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerKelsey3), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerKelsey3} + .partySize = NELEMS(sParty_PicnickerKelsey3), + .party = {.NoItemDefaultMoves = sParty_PicnickerKelsey3} }, [TRAINER_PICNICKER_KELSEY_4] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("KELSEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerKelsey4), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerKelsey4} + .partySize = NELEMS(sParty_PicnickerKelsey4), + .party = {.NoItemDefaultMoves = sParty_PicnickerKelsey4} }, [TRAINER_CAMPER_RICKY_2] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("RICKY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperRicky2), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperRicky2} + .partySize = NELEMS(sParty_CamperRicky2), + .party = {.NoItemDefaultMoves = sParty_CamperRicky2} }, [TRAINER_CAMPER_RICKY_3] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("RICKY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperRicky3), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperRicky3} + .partySize = NELEMS(sParty_CamperRicky3), + .party = {.NoItemDefaultMoves = sParty_CamperRicky3} }, [TRAINER_CAMPER_RICKY_4] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("RICKY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperRicky4), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperRicky4} + .partySize = NELEMS(sParty_CamperRicky4), + .party = {.NoItemDefaultMoves = sParty_CamperRicky4} }, [TRAINER_CAMPER_JEFF_2] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("JEFF"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperJeff2), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperJeff2} + .partySize = NELEMS(sParty_CamperJeff2), + .party = {.NoItemDefaultMoves = sParty_CamperJeff2} }, [TRAINER_CAMPER_JEFF_3] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("JEFF"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperJeff3), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperJeff3} + .partySize = NELEMS(sParty_CamperJeff3), + .party = {.NoItemDefaultMoves = sParty_CamperJeff3} }, [TRAINER_CAMPER_JEFF_4] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("JEFF"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperJeff4), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperJeff4} + .partySize = NELEMS(sParty_CamperJeff4), + .party = {.NoItemDefaultMoves = sParty_CamperJeff4} }, [TRAINER_PICNICKER_ISABELLE_2] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ISABELLE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerIsabelle2), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerIsabelle2} + .partySize = NELEMS(sParty_PicnickerIsabelle2), + .party = {.NoItemDefaultMoves = sParty_PicnickerIsabelle2} }, [TRAINER_PICNICKER_ISABELLE_3] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ISABELLE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerIsabelle3), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerIsabelle3} + .partySize = NELEMS(sParty_PicnickerIsabelle3), + .party = {.NoItemDefaultMoves = sParty_PicnickerIsabelle3} }, [TRAINER_PICNICKER_ISABELLE_4] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ISABELLE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerIsabelle4), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerIsabelle4} + .partySize = NELEMS(sParty_PicnickerIsabelle4), + .party = {.NoItemDefaultMoves = sParty_PicnickerIsabelle4} }, [TRAINER_YOUNGSTER_YASU_2] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("YASU"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterYasu2), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterYasu2} + .partySize = NELEMS(sParty_YoungsterYasu2), + .party = {.NoItemDefaultMoves = sParty_YoungsterYasu2} }, [TRAINER_YOUNGSTER_YASU_3] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("YASU"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterYasu3), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterYasu3} + .partySize = NELEMS(sParty_YoungsterYasu3), + .party = {.NoItemDefaultMoves = sParty_YoungsterYasu3} }, [TRAINER_ENGINEER_BERNIE_2] = { .partyFlags = 0, - .trainerClass = CLASS_ENGINEER, + .trainerClass = TRAINER_CLASS_ENGINEER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_ENGINEER, .trainerName = _("BERNIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_EngineerBernie2), - .party = {.NoItemDefaultMoves = sTrainerMons_EngineerBernie2} + .partySize = NELEMS(sParty_EngineerBernie2), + .party = {.NoItemDefaultMoves = sParty_EngineerBernie2} }, [TRAINER_GAMER_DARIAN_2] = { .partyFlags = 0, - .trainerClass = CLASS_GAMER, + .trainerClass = TRAINER_CLASS_GAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_GAMER, .trainerName = _("DARIAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GamerDarian2), - .party = {.NoItemDefaultMoves = sTrainerMons_GamerDarian2} + .partySize = NELEMS(sParty_GamerDarian2), + .party = {.NoItemDefaultMoves = sParty_GamerDarian2} }, [TRAINER_CAMPER_CHRIS_2] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("CHRIS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperChris2), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperChris2} + .partySize = NELEMS(sParty_CamperChris2), + .party = {.NoItemDefaultMoves = sParty_CamperChris2} }, [TRAINER_CAMPER_CHRIS_3] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("CHRIS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperChris3), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperChris3} + .partySize = NELEMS(sParty_CamperChris3), + .party = {.NoItemDefaultMoves = sParty_CamperChris3} }, [TRAINER_CAMPER_CHRIS_4] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("CHRIS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperChris4), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperChris4} + .partySize = NELEMS(sParty_CamperChris4), + .party = {.NoItemDefaultMoves = sParty_CamperChris4} }, [TRAINER_PICNICKER_ALICIA_2] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ALICIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerAlicia2), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerAlicia2} + .partySize = NELEMS(sParty_PicnickerAlicia2), + .party = {.NoItemDefaultMoves = sParty_PicnickerAlicia2} }, [TRAINER_PICNICKER_ALICIA_3] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ALICIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerAlicia3), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerAlicia3} + .partySize = NELEMS(sParty_PicnickerAlicia3), + .party = {.NoItemDefaultMoves = sParty_PicnickerAlicia3} }, [TRAINER_PICNICKER_ALICIA_4] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ALICIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerAlicia4), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerAlicia4} + .partySize = NELEMS(sParty_PicnickerAlicia4), + .party = {.NoItemDefaultMoves = sParty_PicnickerAlicia4} }, [TRAINER_HIKER_JEREMY_2] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("JEREMY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerJeremy2), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerJeremy2} + .partySize = NELEMS(sParty_HikerJeremy2), + .party = {.NoItemDefaultMoves = sParty_HikerJeremy2} }, [TRAINER_POKEMANIAC_MARK_3] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("MARK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacMark3), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacMark3} + .partySize = NELEMS(sParty_PokemaniacMark3), + .party = {.NoItemDefaultMoves = sParty_PokemaniacMark3} }, [TRAINER_POKEMANIAC_HERMAN_2] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("HERMAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacHerman2), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacHerman2} + .partySize = NELEMS(sParty_PokemaniacHerman2), + .party = {.NoItemDefaultMoves = sParty_PokemaniacHerman2} }, [TRAINER_POKEMANIAC_HERMAN_3] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("HERMAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacHerman3), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacHerman3} + .partySize = NELEMS(sParty_PokemaniacHerman3), + .party = {.NoItemDefaultMoves = sParty_PokemaniacHerman3} }, [TRAINER_HIKER_TRENT_2] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("TRENT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerTrent2), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerTrent2} + .partySize = NELEMS(sParty_HikerTrent2), + .party = {.NoItemDefaultMoves = sParty_HikerTrent2} }, [TRAINER_LASS_MEGAN_2] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("MEGAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassMegan2), - .party = {.NoItemDefaultMoves = sTrainerMons_LassMegan2} + .partySize = NELEMS(sParty_LassMegan2), + .party = {.NoItemDefaultMoves = sParty_LassMegan2} }, [TRAINER_LASS_MEGAN_3] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("MEGAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassMegan3), - .party = {.NoItemDefaultMoves = sTrainerMons_LassMegan3} + .partySize = NELEMS(sParty_LassMegan3), + .party = {.NoItemDefaultMoves = sParty_LassMegan3} }, [TRAINER_SUPER_NERD_GLENN_2] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("GLENN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdGlenn2), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerdGlenn2} + .partySize = NELEMS(sParty_SuperNerdGlenn2), + .party = {.NoItemDefaultMoves = sParty_SuperNerdGlenn2} }, [TRAINER_GAMER_RICH_2] = { .partyFlags = 0, - .trainerClass = CLASS_GAMER, + .trainerClass = TRAINER_CLASS_GAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_GAMER, .trainerName = _("RICH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GamerRich2), - .party = {.NoItemDefaultMoves = sTrainerMons_GamerRich2} + .partySize = NELEMS(sParty_GamerRich2), + .party = {.NoItemDefaultMoves = sParty_GamerRich2} }, [TRAINER_BIKER_JAREN_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("JAREN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerJaren2), - .party = {.NoItemDefaultMoves = sTrainerMons_BikerJaren2} + .partySize = NELEMS(sParty_BikerJaren2), + .party = {.NoItemDefaultMoves = sParty_BikerJaren2} }, [TRAINER_FISHERMAN_ELLIOT_2] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("ELLIOT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanElliot2), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanElliot2} + .partySize = NELEMS(sParty_FishermanElliot2), + .party = {.NoItemDefaultMoves = sParty_FishermanElliot2} }, [TRAINER_ROCKER_LUCA_2] = { .partyFlags = 0, - .trainerClass = CLASS_ROCKER, + .trainerClass = TRAINER_CLASS_ROCKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_ROCKER, .trainerName = _("LUCA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RockerLuca2), - .party = {.NoItemDefaultMoves = sTrainerMons_RockerLuca2} + .partySize = NELEMS(sParty_RockerLuca2), + .party = {.NoItemDefaultMoves = sParty_RockerLuca2} }, [TRAINER_BEAUTY_SHEILA_2] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("SHEILA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautySheila2), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautySheila2} + .partySize = NELEMS(sParty_BeautySheila2), + .party = {.NoItemDefaultMoves = sParty_BeautySheila2} }, [TRAINER_BIRD_KEEPER_ROBERT_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("ROBERT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperRobert2), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperRobert2} + .partySize = NELEMS(sParty_BirdKeeperRobert2), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperRobert2} }, [TRAINER_BIRD_KEEPER_ROBERT_3] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("ROBERT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperRobert3), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperRobert3} + .partySize = NELEMS(sParty_BirdKeeperRobert3), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperRobert3} }, [TRAINER_PICNICKER_SUSIE_2] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("SUSIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerSusie2), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerSusie2} + .partySize = NELEMS(sParty_PicnickerSusie2), + .party = {.NoItemDefaultMoves = sParty_PicnickerSusie2} }, [TRAINER_PICNICKER_SUSIE_3] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("SUSIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerSusie3), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerSusie3} + .partySize = NELEMS(sParty_PicnickerSusie3), + .party = {.NoItemDefaultMoves = sParty_PicnickerSusie3} }, [TRAINER_PICNICKER_SUSIE_4] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("SUSIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerSusie4), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerSusie4} + .partySize = NELEMS(sParty_PicnickerSusie4), + .party = {.NoItemDefaultMoves = sParty_PicnickerSusie4} }, [TRAINER_BIKER_LUKAS_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("LUKAS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerLukas2), - .party = {.NoItemDefaultMoves = sTrainerMons_BikerLukas2} + .partySize = NELEMS(sParty_BikerLukas2), + .party = {.NoItemDefaultMoves = sParty_BikerLukas2} }, [TRAINER_BIRD_KEEPER_BENNY_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("BENNY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperBenny2), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperBenny2} + .partySize = NELEMS(sParty_BirdKeeperBenny2), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperBenny2} }, [TRAINER_BIRD_KEEPER_BENNY_3] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("BENNY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperBenny3), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperBenny3} + .partySize = NELEMS(sParty_BirdKeeperBenny3), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperBenny3} }, [TRAINER_BIRD_KEEPER_MARLON_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("MARLON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperMarlon2), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperMarlon2} + .partySize = NELEMS(sParty_BirdKeeperMarlon2), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperMarlon2} }, [TRAINER_BIRD_KEEPER_MARLON_3] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("MARLON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperMarlon3), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperMarlon3} + .partySize = NELEMS(sParty_BirdKeeperMarlon3), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperMarlon3} }, [TRAINER_BEAUTY_GRACE_2] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("GRACE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautyGrace2), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautyGrace2} + .partySize = NELEMS(sParty_BeautyGrace2), + .party = {.NoItemDefaultMoves = sParty_BeautyGrace2} }, [TRAINER_BIRD_KEEPER_CHESTER_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("CHESTER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperChester2), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperChester2} + .partySize = NELEMS(sParty_BirdKeeperChester2), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperChester2} }, [TRAINER_BIRD_KEEPER_CHESTER_3] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("CHESTER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperChester3), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperChester3} + .partySize = NELEMS(sParty_BirdKeeperChester3), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperChester3} }, [TRAINER_PICNICKER_BECKY_2] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("BECKY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerBecky2), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerBecky2} + .partySize = NELEMS(sParty_PicnickerBecky2), + .party = {.NoItemDefaultMoves = sParty_PicnickerBecky2} }, [TRAINER_PICNICKER_BECKY_3] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("BECKY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerBecky3), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerBecky3} + .partySize = NELEMS(sParty_PicnickerBecky3), + .party = {.NoItemDefaultMoves = sParty_PicnickerBecky3} }, [TRAINER_PICNICKER_BECKY_4] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("BECKY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerBecky4), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerBecky4} + .partySize = NELEMS(sParty_PicnickerBecky4), + .party = {.NoItemDefaultMoves = sParty_PicnickerBecky4} }, [TRAINER_CRUSH_KIN_RON_MYA_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_KIN, + .trainerClass = TRAINER_CLASS_CRUSH_KIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_KIN, .trainerName = _("RON & MYA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushKinRonMya2), - .party = {.ItemDefaultMoves = sTrainerMons_CrushKinRonMya2} + .partySize = NELEMS(sParty_CrushKinRonMya2), + .party = {.ItemDefaultMoves = sParty_CrushKinRonMya2} }, [TRAINER_CRUSH_KIN_RON_MYA_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_KIN, + .trainerClass = TRAINER_CLASS_CRUSH_KIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_KIN, .trainerName = _("RON & MYA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushKinRonMya3), - .party = {.ItemDefaultMoves = sTrainerMons_CrushKinRonMya3} + .partySize = NELEMS(sParty_CrushKinRonMya3), + .party = {.ItemDefaultMoves = sParty_CrushKinRonMya3} }, [TRAINER_CRUSH_KIN_RON_MYA_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_KIN, + .trainerClass = TRAINER_CLASS_CRUSH_KIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_KIN, .trainerName = _("RON & MYA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushKinRonMya4), - .party = {.ItemDefaultMoves = sTrainerMons_CrushKinRonMya4} + .partySize = NELEMS(sParty_CrushKinRonMya4), + .party = {.ItemDefaultMoves = sParty_CrushKinRonMya4} }, [TRAINER_BIKER_RUBEN_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("RUBEN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerRuben2), - .party = {.NoItemDefaultMoves = sTrainerMons_BikerRuben2} + .partySize = NELEMS(sParty_BikerRuben2), + .party = {.NoItemDefaultMoves = sParty_BikerRuben2} }, [TRAINER_CUE_BALL_CAMRON_2] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("CAMRON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallCamron2), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallCamron2} + .partySize = NELEMS(sParty_CueBallCamron2), + .party = {.NoItemDefaultMoves = sParty_CueBallCamron2} }, [TRAINER_BIKER_JAXON_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("JAXON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerJaxon2), - .party = {.NoItemDefaultMoves = sTrainerMons_BikerJaxon2} + .partySize = NELEMS(sParty_BikerJaxon2), + .party = {.NoItemDefaultMoves = sParty_BikerJaxon2} }, [TRAINER_CUE_BALL_ISAIAH_2] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("ISAIAH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallIsaiah2), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallIsaiah2} + .partySize = NELEMS(sParty_CueBallIsaiah2), + .party = {.NoItemDefaultMoves = sParty_CueBallIsaiah2} }, [TRAINER_CUE_BALL_COREY_2] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("COREY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallCorey2), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallCorey2} + .partySize = NELEMS(sParty_CueBallCorey2), + .party = {.NoItemDefaultMoves = sParty_CueBallCorey2} }, [TRAINER_BIRD_KEEPER_JACOB_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("JACOB"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperJacob2), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperJacob2} + .partySize = NELEMS(sParty_BirdKeeperJacob2), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperJacob2} }, [TRAINER_BIRD_KEEPER_JACOB_3] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("JACOB"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperJacob3), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperJacob3} + .partySize = NELEMS(sParty_BirdKeeperJacob3), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperJacob3} }, [TRAINER_SWIMMER_FEMALE_ALICE_2] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("ALICE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleAlice2), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleAlice2} + .partySize = NELEMS(sParty_SwimmerFemaleAlice2), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleAlice2} }, [TRAINER_SWIMMER_MALE_DARRIN_2] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("DARRIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleDarrin2), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleDarrin2} + .partySize = NELEMS(sParty_SwimmerMaleDarrin2), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleDarrin2} }, [TRAINER_PICNICKER_MISSY_2] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("MISSY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerMissy2), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerMissy2} + .partySize = NELEMS(sParty_PicnickerMissy2), + .party = {.NoItemDefaultMoves = sParty_PicnickerMissy2} }, [TRAINER_PICNICKER_MISSY_3] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("MISSY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerMissy3), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerMissy3} + .partySize = NELEMS(sParty_PicnickerMissy3), + .party = {.NoItemDefaultMoves = sParty_PicnickerMissy3} }, [TRAINER_FISHERMAN_WADE_2] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("WADE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanWade2), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanWade2} + .partySize = NELEMS(sParty_FishermanWade2), + .party = {.NoItemDefaultMoves = sParty_FishermanWade2} }, [TRAINER_SWIMMER_MALE_JACK_2] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("JACK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleJack2), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleJack2} + .partySize = NELEMS(sParty_SwimmerMaleJack2), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleJack2} }, [TRAINER_SIS_AND_BRO_LIL_IAN_2] = { .partyFlags = 0, - .trainerClass = CLASS_SIS_AND_BRO_2, + .trainerClass = TRAINER_CLASS_SIS_AND_BRO, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SIS_AND_BRO, .trainerName = _("LIL & IAN"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SisAndBroLilIan2), - .party = {.NoItemDefaultMoves = sTrainerMons_SisAndBroLilIan2} + .partySize = NELEMS(sParty_SisAndBroLilIan2), + .party = {.NoItemDefaultMoves = sParty_SisAndBroLilIan2} }, [TRAINER_SIS_AND_BRO_LIL_IAN_3] = { .partyFlags = 0, - .trainerClass = CLASS_SIS_AND_BRO_2, + .trainerClass = TRAINER_CLASS_SIS_AND_BRO, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SIS_AND_BRO, .trainerName = _("LIL & IAN"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SisAndBroLilIan3), - .party = {.NoItemDefaultMoves = sTrainerMons_SisAndBroLilIan3} + .partySize = NELEMS(sParty_SisAndBroLilIan3), + .party = {.NoItemDefaultMoves = sParty_SisAndBroLilIan3} }, [TRAINER_SWIMMER_MALE_FINN_2] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("FINN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleFinn2), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleFinn2} + .partySize = NELEMS(sParty_SwimmerMaleFinn2), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleFinn2} }, [TRAINER_CRUSH_GIRL_SHARON_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_GIRL, + .trainerClass = TRAINER_CLASS_CRUSH_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_GIRL, .trainerName = _("SHARON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushGirlSharon2), - .party = {.ItemDefaultMoves = sTrainerMons_CrushGirlSharon2} + .partySize = NELEMS(sParty_CrushGirlSharon2), + .party = {.ItemDefaultMoves = sParty_CrushGirlSharon2} }, [TRAINER_CRUSH_GIRL_SHARON_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_GIRL, + .trainerClass = TRAINER_CLASS_CRUSH_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_GIRL, .trainerName = _("SHARON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushGirlSharon3), - .party = {.ItemDefaultMoves = sTrainerMons_CrushGirlSharon3} + .partySize = NELEMS(sParty_CrushGirlSharon3), + .party = {.ItemDefaultMoves = sParty_CrushGirlSharon3} }, [TRAINER_CRUSH_GIRL_TANYA_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_GIRL, + .trainerClass = TRAINER_CLASS_CRUSH_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_GIRL, .trainerName = _("TANYA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushGirlTanya2), - .party = {.ItemDefaultMoves = sTrainerMons_CrushGirlTanya2} + .partySize = NELEMS(sParty_CrushGirlTanya2), + .party = {.ItemDefaultMoves = sParty_CrushGirlTanya2} }, [TRAINER_CRUSH_GIRL_TANYA_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_GIRL, + .trainerClass = TRAINER_CLASS_CRUSH_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_GIRL, .trainerName = _("TANYA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushGirlTanya3), - .party = {.ItemDefaultMoves = sTrainerMons_CrushGirlTanya3} + .partySize = NELEMS(sParty_CrushGirlTanya3), + .party = {.ItemDefaultMoves = sParty_CrushGirlTanya3} }, [TRAINER_BLACK_BELT_SHEA_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("SHEA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltShea2), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltShea2} + .partySize = NELEMS(sParty_BlackBeltShea2), + .party = {.ItemDefaultMoves = sParty_BlackBeltShea2} }, [TRAINER_BLACK_BELT_SHEA_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("SHEA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltShea3), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltShea3} + .partySize = NELEMS(sParty_BlackBeltShea3), + .party = {.ItemDefaultMoves = sParty_BlackBeltShea3} }, [TRAINER_BLACK_BELT_HUGH_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("HUGH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltHugh2), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltHugh2} + .partySize = NELEMS(sParty_BlackBeltHugh2), + .party = {.ItemDefaultMoves = sParty_BlackBeltHugh2} }, [TRAINER_BLACK_BELT_HUGH_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("HUGH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltHugh3), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltHugh3} + .partySize = NELEMS(sParty_BlackBeltHugh3), + .party = {.ItemDefaultMoves = sParty_BlackBeltHugh3} }, [TRAINER_CRUSH_KIN_MIK_KIA_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_KIN, + .trainerClass = TRAINER_CLASS_CRUSH_KIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_KIN, .trainerName = _("MIK & KIA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushKinMikKia2), - .party = {.ItemDefaultMoves = sTrainerMons_CrushKinMikKia2} + .partySize = NELEMS(sParty_CrushKinMikKia2), + .party = {.ItemDefaultMoves = sParty_CrushKinMikKia2} }, [TRAINER_CRUSH_KIN_MIK_KIA_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_KIN, + .trainerClass = TRAINER_CLASS_CRUSH_KIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_KIN, .trainerName = _("MIK & KIA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushKinMikKia3), - .party = {.ItemDefaultMoves = sTrainerMons_CrushKinMikKia3} + .partySize = NELEMS(sParty_CrushKinMikKia3), + .party = {.ItemDefaultMoves = sParty_CrushKinMikKia3} }, [TRAINER_TUBER_AMIRA_2] = { .partyFlags = 0, - .trainerClass = CLASS_TUBER_3, + .trainerClass = TRAINER_CLASS_TUBER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("AMIRA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TuberAmira2), - .party = {.NoItemDefaultMoves = sTrainerMons_TuberAmira2} + .partySize = NELEMS(sParty_TuberAmira2), + .party = {.NoItemDefaultMoves = sParty_TuberAmira2} }, [TRAINER_TWINS_JOY_MEG_2] = { .partyFlags = 0, - .trainerClass = CLASS_TWINS_2, + .trainerClass = TRAINER_CLASS_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_TWINS, .trainerName = _("JOY & MEG"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TwinsJoyMeg2), - .party = {.NoItemDefaultMoves = sTrainerMons_TwinsJoyMeg2} + .partySize = NELEMS(sParty_TwinsJoyMeg2), + .party = {.NoItemDefaultMoves = sParty_TwinsJoyMeg2} }, [TRAINER_PAINTER_RAYNA_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PAINTER, + .trainerClass = TRAINER_CLASS_PAINTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_PAINTER, .trainerName = _("RAYNA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PainterRayna2), - .party = {.NoItemCustomMoves = sTrainerMons_PainterRayna2} + .partySize = NELEMS(sParty_PainterRayna2), + .party = {.NoItemCustomMoves = sParty_PainterRayna2} }, [TRAINER_YOUNGSTER_DESTIN_2] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("DESTIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterDestin2), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterDestin2} + .partySize = NELEMS(sParty_YoungsterDestin2), + .party = {.NoItemDefaultMoves = sParty_YoungsterDestin2} }, [TRAINER_PKMN_BREEDER_ALIZE_2] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_BREEDER_2, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER, .trainerName = _("ALIZE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnBreederAlize2), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnBreederAlize2} + .partySize = NELEMS(sParty_PkmnBreederAlize2), + .party = {.NoItemDefaultMoves = sParty_PkmnBreederAlize2} }, [TRAINER_YOUNG_COUPLE_GIA_JES_2] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNG_COUPLE_2, + .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_YOUNG_COUPLE, .trainerName = _("GIA & JES"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungCoupleGiaJes2), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungCoupleGiaJes2} + .partySize = NELEMS(sParty_YoungCoupleGiaJes2), + .party = {.NoItemDefaultMoves = sParty_YoungCoupleGiaJes2} }, [TRAINER_YOUNG_COUPLE_GIA_JES_3] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNG_COUPLE_2, + .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_YOUNG_COUPLE, .trainerName = _("GIA & JES"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungCoupleGiaJes3), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungCoupleGiaJes3} + .partySize = NELEMS(sParty_YoungCoupleGiaJes3), + .party = {.NoItemDefaultMoves = sParty_YoungCoupleGiaJes3} }, [TRAINER_BIRD_KEEPER_MILO_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("MILO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperMilo2), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperMilo2} + .partySize = NELEMS(sParty_BirdKeeperMilo2), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperMilo2} }, [TRAINER_BIRD_KEEPER_CHAZ_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("CHAZ"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperChaz2), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperChaz2} + .partySize = NELEMS(sParty_BirdKeeperChaz2), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperChaz2} }, [TRAINER_BIRD_KEEPER_HAROLD_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("HAROLD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperHarold2), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperHarold2} + .partySize = NELEMS(sParty_BirdKeeperHarold2), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperHarold2} }, [TRAINER_SWIMMER_FEMALE_NICOLE_2] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("NICOLE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleNicole2), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleNicole2} + .partySize = NELEMS(sParty_SwimmerFemaleNicole2), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleNicole2} }, [TRAINER_PSYCHIC_JACLYN_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PSYCHIC_F, .trainerName = _("JACLYN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicJaclyn2), - .party = {.NoItemCustomMoves = sTrainerMons_PsychicJaclyn2} + .partySize = NELEMS(sParty_PsychicJaclyn2), + .party = {.NoItemCustomMoves = sParty_PsychicJaclyn2} }, [TRAINER_SWIMMER_MALE_SAMIR_2] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("SAMIR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleSamir2), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleSamir2} + .partySize = NELEMS(sParty_SwimmerMaleSamir2), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleSamir2} }, [TRAINER_HIKER_EARL_2] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("EARL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerEarl2), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerEarl2} + .partySize = NELEMS(sParty_HikerEarl2), + .party = {.NoItemDefaultMoves = sParty_HikerEarl2} }, [TRAINER_RUIN_MANIAC_LARRY_2] = { .partyFlags = 0, - .trainerClass = CLASS_RUIN_MANIAC_2, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("LARRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RuinManiacLarry2), - .party = {.NoItemDefaultMoves = sTrainerMons_RuinManiacLarry2} + .partySize = NELEMS(sParty_RuinManiacLarry2), + .party = {.NoItemDefaultMoves = sParty_RuinManiacLarry2} }, [TRAINER_POKEMANIAC_HECTOR_2] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("HECTOR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacHector2), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacHector2} + .partySize = NELEMS(sParty_PokemaniacHector2), + .party = {.NoItemDefaultMoves = sParty_PokemaniacHector2} }, [TRAINER_PSYCHIC_DARIO_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_PSYCHIC_M, .trainerName = _("DARIO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicDario2), - .party = {.NoItemCustomMoves = sTrainerMons_PsychicDario2} + .partySize = NELEMS(sParty_PsychicDario2), + .party = {.NoItemCustomMoves = sParty_PsychicDario2} }, [TRAINER_PSYCHIC_RODETTE_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PSYCHIC_F, .trainerName = _("RODETTE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicRodette2), - .party = {.NoItemCustomMoves = sTrainerMons_PsychicRodette2} + .partySize = NELEMS(sParty_PsychicRodette2), + .party = {.NoItemCustomMoves = sParty_PsychicRodette2} }, [TRAINER_JUGGLER_MASON_2] = { .partyFlags = 0, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("MASON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerMason2), - .party = {.NoItemDefaultMoves = sTrainerMons_JugglerMason2} + .partySize = NELEMS(sParty_JugglerMason2), + .party = {.NoItemDefaultMoves = sParty_JugglerMason2} }, [TRAINER_PKMN_RANGER_NICOLAS_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, .trainerName = _("NICOLAS"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerNicolas2), - .party = {.NoItemCustomMoves = sTrainerMons_PkmnRangerNicolas2} + .partySize = NELEMS(sParty_PkmnRangerNicolas2), + .party = {.NoItemCustomMoves = sParty_PkmnRangerNicolas2} }, [TRAINER_PKMN_RANGER_MADELINE_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, .trainerName = _("MADELINE"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerMadeline2), - .party = {.NoItemCustomMoves = sTrainerMons_PkmnRangerMadeline2} + .partySize = NELEMS(sParty_PkmnRangerMadeline2), + .party = {.NoItemCustomMoves = sParty_PkmnRangerMadeline2} }, [TRAINER_CRUSH_GIRL_CYNDY_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_GIRL, + .trainerClass = TRAINER_CLASS_CRUSH_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_GIRL, .trainerName = _("CYNDY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushGirlCyndy2), - .party = {.ItemDefaultMoves = sTrainerMons_CrushGirlCyndy2} + .partySize = NELEMS(sParty_CrushGirlCyndy2), + .party = {.ItemDefaultMoves = sParty_CrushGirlCyndy2} }, [TRAINER_TAMER_EVAN_2] = { .partyFlags = 0, - .trainerClass = CLASS_TAMER, + .trainerClass = TRAINER_CLASS_TAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_TAMER, .trainerName = _("EVAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TamerEvan2), - .party = {.NoItemDefaultMoves = sTrainerMons_TamerEvan2} + .partySize = NELEMS(sParty_TamerEvan2), + .party = {.NoItemDefaultMoves = sParty_TamerEvan2} }, [TRAINER_PKMN_RANGER_JACKSON_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, .trainerName = _("JACKSON"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerJackson2), - .party = {.NoItemCustomMoves = sTrainerMons_PkmnRangerJackson2} + .partySize = NELEMS(sParty_PkmnRangerJackson2), + .party = {.NoItemCustomMoves = sParty_PkmnRangerJackson2} }, [TRAINER_PKMN_RANGER_KATELYN_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, .trainerName = _("KATELYN"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerKatelyn2), - .party = {.NoItemCustomMoves = sTrainerMons_PkmnRangerKatelyn2} + .partySize = NELEMS(sParty_PkmnRangerKatelyn2), + .party = {.NoItemCustomMoves = sParty_PkmnRangerKatelyn2} }, [TRAINER_COOLTRAINER_LEROY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("LEROY"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerLeroy2), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerLeroy2} + .partySize = NELEMS(sParty_CooltrainerLeroy2), + .party = {.NoItemCustomMoves = sParty_CooltrainerLeroy2} }, [TRAINER_COOLTRAINER_MICHELLE_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("MICHELLE"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerMichelle2), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerMichelle2} + .partySize = NELEMS(sParty_CooltrainerMichelle2), + .party = {.NoItemCustomMoves = sParty_CooltrainerMichelle2} }, [TRAINER_COOL_COUPLE_LEX_NYA_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOL_COUPLE, + .trainerClass = TRAINER_CLASS_COOL_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOL_COUPLE, .trainerName = _("LEX & NYA"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CoolCoupleLexNya2), - .party = {.NoItemCustomMoves = sTrainerMons_CoolCoupleLexNya2} + .partySize = NELEMS(sParty_CoolCoupleLexNya2), + .party = {.NoItemCustomMoves = sParty_CoolCoupleLexNya2} }, [TRAINER_BUG_CATCHER_COLTON_2] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("COLTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherColton2), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherColton2} + .partySize = NELEMS(sParty_BugCatcherColton2), + .party = {.NoItemDefaultMoves = sParty_BugCatcherColton2} }, [TRAINER_BUG_CATCHER_COLTON_3] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("COLTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherColton3), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherColton3} + .partySize = NELEMS(sParty_BugCatcherColton3), + .party = {.NoItemDefaultMoves = sParty_BugCatcherColton3} }, [TRAINER_BUG_CATCHER_COLTON_4] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("COLTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherColton4), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherColton4} + .partySize = NELEMS(sParty_BugCatcherColton4), + .party = {.NoItemDefaultMoves = sParty_BugCatcherColton4} }, [TRAINER_SWIMMER_MALE_MATTHEW_2] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("MATTHEW"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleMatthew2), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleMatthew2} + .partySize = NELEMS(sParty_SwimmerMaleMatthew2), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleMatthew2} }, [TRAINER_SWIMMER_MALE_TONY_2] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("TONY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleTony2), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleTony2} + .partySize = NELEMS(sParty_SwimmerMaleTony2), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleTony2} }, [TRAINER_SWIMMER_FEMALE_MELISSA_2] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("MELISSA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleMelissa2), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleMelissa2} + .partySize = NELEMS(sParty_SwimmerFemaleMelissa2), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleMelissa2} }, [TRAINER_ELITE_FOUR_LORELEI_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_ELITE_FOUR_2, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_LORELEI, .trainerName = _("LORELEI"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_EliteFourLorelei2), - .party = {.ItemCustomMoves = sTrainerMons_EliteFourLorelei2} + .partySize = NELEMS(sParty_EliteFourLorelei2), + .party = {.ItemCustomMoves = sParty_EliteFourLorelei2} }, [TRAINER_ELITE_FOUR_BRUNO_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_ELITE_FOUR_2, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_BRUNO, .trainerName = _("BRUNO"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_EliteFourBruno2), - .party = {.ItemCustomMoves = sTrainerMons_EliteFourBruno2} + .partySize = NELEMS(sParty_EliteFourBruno2), + .party = {.ItemCustomMoves = sParty_EliteFourBruno2} }, [TRAINER_ELITE_FOUR_AGATHA_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_ELITE_FOUR_2, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_AGATHA, .trainerName = _("AGATHA"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_EliteFourAgatha2), - .party = {.ItemCustomMoves = sTrainerMons_EliteFourAgatha2} + .partySize = NELEMS(sParty_EliteFourAgatha2), + .party = {.ItemCustomMoves = sParty_EliteFourAgatha2} }, [TRAINER_ELITE_FOUR_LANCE_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_ELITE_FOUR_2, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_LANCE, .trainerName = _("LANCE"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_EliteFourLance2), - .party = {.ItemCustomMoves = sTrainerMons_EliteFourLance2} + .partySize = NELEMS(sParty_EliteFourLance2), + .party = {.ItemCustomMoves = sParty_EliteFourLance2} }, [TRAINER_CHAMPION_REMATCH_SQUIRTLE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CHAMPION_2, + .trainerClass = TRAINER_CLASS_CHAMPION, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CHAMPION_RIVAL, .trainerName = _("TERRY"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_ChampionRematchSquirtle), - .party = {.ItemCustomMoves = sTrainerMons_ChampionRematchSquirtle} + .partySize = NELEMS(sParty_ChampionRematchSquirtle), + .party = {.ItemCustomMoves = sParty_ChampionRematchSquirtle} }, [TRAINER_CHAMPION_REMATCH_BULBASAUR] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CHAMPION_2, + .trainerClass = TRAINER_CLASS_CHAMPION, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CHAMPION_RIVAL, .trainerName = _("TERRY"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_ChampionRematchBulbasaur), - .party = {.ItemCustomMoves = sTrainerMons_ChampionRematchBulbasaur} + .partySize = NELEMS(sParty_ChampionRematchBulbasaur), + .party = {.ItemCustomMoves = sParty_ChampionRematchBulbasaur} }, [TRAINER_CHAMPION_REMATCH_CHARMANDER] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CHAMPION_2, + .trainerClass = TRAINER_CLASS_CHAMPION, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CHAMPION_RIVAL, .trainerName = _("TERRY"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_ChampionRematchCharmander), - .party = {.ItemCustomMoves = sTrainerMons_ChampionRematchCharmander} + .partySize = NELEMS(sParty_ChampionRematchCharmander), + .party = {.ItemCustomMoves = sParty_ChampionRematchCharmander} }, [TRAINER_CUE_BALL_PAXTON] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("PAXTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallPaxton), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallPaxton} + .partySize = NELEMS(sParty_CueBallPaxton), + .party = {.NoItemDefaultMoves = sParty_CueBallPaxton} }, }; diff --git a/src/pokemon.c b/src/pokemon.c index 01b06a1af..168ccd318 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -31,8 +31,7 @@ #include "constants/moves.h" #include "constants/songs.h" #include "constants/item_effects.h" -#include "constants/trainer_classes.h" -#include "constants/facility_trainer_classes.h" +#include "constants/trainers.h" #include "constants/hold_effects.h" #include "constants/battle_move_effects.h" @@ -1565,10 +1564,23 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] = }, }; +// Classes dummied out static const u8 sSecretBaseFacilityClasses[][5] = { - { FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2 }, - { FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2 }, + [MALE] = { + FACILITY_CLASS_YOUNGSTER, + FACILITY_CLASS_YOUNGSTER, + FACILITY_CLASS_YOUNGSTER, + FACILITY_CLASS_YOUNGSTER, + FACILITY_CLASS_YOUNGSTER + }, + [FEMALE] = { + FACILITY_CLASS_YOUNGSTER, + FACILITY_CLASS_YOUNGSTER, + FACILITY_CLASS_YOUNGSTER, + FACILITY_CLASS_YOUNGSTER, + FACILITY_CLASS_YOUNGSTER + }, }; static const u8 sGetMonDataEVConstants[] = @@ -1630,10 +1642,24 @@ static const u16 sDeoxysBaseStats[] = const u16 gLinkPlayerFacilityClasses[] = { - FACILITY_CLASS_COOLTRAINER_3, FACILITY_CLASS_BLACK_BELT_2, FACILITY_CLASS_CAMPER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_PSYCHIC_3, - FACILITY_CLASS_BUG_CATCHER_2, FACILITY_CLASS_TAMER, FACILITY_CLASS_JUGGLER, FACILITY_CLASS_COOLTRAINER_4, FACILITY_CLASS_CHANNELER, - FACILITY_CLASS_PICNICKER_2, FACILITY_CLASS_LASS_2, FACILITY_CLASS_PSYCHIC_4, FACILITY_CLASS_CRUSH_GIRL, FACILITY_CLASS_PKMN_BREEDER_3, - FACILITY_CLASS_BEAUTY_2, FACILITY_CLASS_AQUA_LEADER, + // Male + FACILITY_CLASS_COOLTRAINER_M, + FACILITY_CLASS_BLACK_BELT, + FACILITY_CLASS_CAMPER, + FACILITY_CLASS_YOUNGSTER, + FACILITY_CLASS_PSYCHIC_M, + FACILITY_CLASS_BUG_CATCHER, + FACILITY_CLASS_TAMER, + FACILITY_CLASS_JUGGLER, + // Female + FACILITY_CLASS_COOLTRAINER_F, + FACILITY_CLASS_CHANNELER, + FACILITY_CLASS_PICNICKER, + FACILITY_CLASS_LASS, + FACILITY_CLASS_PSYCHIC_F, + FACILITY_CLASS_CRUSH_GIRL, + FACILITY_CLASS_PKMN_BREEDER, + FACILITY_CLASS_BEAUTY, }; static const struct OamData sOakSpeechNidoranFDummyOamData = @@ -5280,9 +5306,9 @@ void AdjustFriendship(struct Pokemon *mon, u8 event) // Only if it's a trainer battle with league progression significance if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER)) return; - if (!(gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_LEADER_2 - || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_ELITE_FOUR_2 - || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_CHAMPION_2)) + if (!(gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_LEADER + || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_ELITE_FOUR + || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_CHAMPION)) return; } @@ -5662,18 +5688,18 @@ static u16 GetBattleBGM(void) { switch (gTrainers[gTrainerBattleOpponent_A].trainerClass) { - case CLASS_CHAMPION_2: - return MUS_VS_CHAMPION; - case CLASS_LEADER_2: - case CLASS_ELITE_FOUR_2: - return MUS_VS_GYM_LEADER; - case CLASS_BOSS: - case CLASS_TEAM_ROCKET: - case CLASS_COOLTRAINER_2: - case CLASS_GENTLEMAN_2: - case CLASS_RIVAL_2: - default: - return MUS_VS_TRAINER; + case TRAINER_CLASS_CHAMPION: + return MUS_VS_CHAMPION; + case TRAINER_CLASS_LEADER: + case TRAINER_CLASS_ELITE_FOUR: + return MUS_VS_GYM_LEADER; + case TRAINER_CLASS_BOSS: + case TRAINER_CLASS_TEAM_ROCKET: + case TRAINER_CLASS_COOLTRAINER: + case TRAINER_CLASS_GENTLEMAN: + case TRAINER_CLASS_RIVAL_LATE: + default: + return MUS_VS_TRAINER; } } return MUS_VS_WILD; diff --git a/src/quest_log_battle.c b/src/quest_log_battle.c index f844d555e..9f1d376a9 100644 --- a/src/quest_log_battle.c +++ b/src/quest_log_battle.c @@ -5,7 +5,7 @@ #include "link.h" #include "overworld.h" #include "quest_log.h" -#include "constants/trainer_classes.h" +#include "constants/trainers.h" struct QuestLogStruct_TrainerBattleRecord { @@ -39,13 +39,13 @@ void TrySetQuestLogBattleEvent(void) { switch (gTrainers[gTrainerBattleOpponent_A].trainerClass) { - case CLASS_LEADER_2: + case TRAINER_CLASS_LEADER: eventId = QL_EVENT_DEFEATED_GYM_LEADER; break; - case CLASS_CHAMPION_2: + case TRAINER_CLASS_CHAMPION: eventId = QL_EVENT_DEFEATED_CHAMPION; break; - case CLASS_ELITE_FOUR_2: + case TRAINER_CLASS_ELITE_FOUR: eventId = QL_EVENT_DEFEATED_E4_MEMBER; break; default: diff --git a/src/quest_log_events.c b/src/quest_log_events.c index 8fe66e183..e805b5f2e 100644 --- a/src/quest_log_events.c +++ b/src/quest_log_events.c @@ -14,7 +14,7 @@ #include "region_map.h" #include "strings.h" #include "constants/maps.h" -#include "constants/trainer_classes.h" +#include "constants/trainers.h" #include "constants/items.h" #include "constants/region_map_sections.h" @@ -338,10 +338,10 @@ static bool8 ShouldRegisterEvent_HandleBeatStoryTrainer(u16 eventId, const u16 * if (eventId == QL_EVENT_DEFEATED_TRAINER) { u8 trainerClass = gTrainers[*eventData].trainerClass; - if ( trainerClass == CLASS_RIVAL - || trainerClass == CLASS_RIVAL_2 - || trainerClass == CLASS_CHAMPION_2 - || trainerClass == CLASS_BOSS) + if (trainerClass == TRAINER_CLASS_RIVAL_EARLY + || trainerClass == TRAINER_CLASS_RIVAL_LATE + || trainerClass == TRAINER_CLASS_CHAMPION + || trainerClass == TRAINER_CLASS_BOSS) return FALSE; return TRUE; } @@ -1680,9 +1680,9 @@ static const u16 *BufferQuestLogText_DefeatedTrainer(const u16 *eventData) GetMapNameGeneric(gStringVar1, r6[0]); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); - if (gTrainers[r5[2]].trainerClass == CLASS_RIVAL - || gTrainers[r5[2]].trainerClass == CLASS_RIVAL_2 - || gTrainers[r5[2]].trainerClass == CLASS_CHAMPION_2) + if (gTrainers[r5[2]].trainerClass == TRAINER_CLASS_RIVAL_EARLY + || gTrainers[r5[2]].trainerClass == TRAINER_CLASS_RIVAL_LATE + || gTrainers[r5[2]].trainerClass == TRAINER_CLASS_CHAMPION) DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, GetExpandedPlaceholder(PLACEHOLDER_ID_RIVAL)); else DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gTrainers[r5[2]].trainerName); diff --git a/src/trainer_card.c b/src/trainer_card.c index ca4dbb314..2efd575e4 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -18,7 +18,7 @@ #include "new_menu_helpers.h" #include "constants/songs.h" #include "constants/game_stat.h" -#include "constants/facility_trainer_classes.h" +#include "constants/trainers.h" // Trainer Card Strings enum @@ -308,25 +308,25 @@ static const u8 sLinkTrainerPicFacilityClasses[GENDER_COUNT][NUM_LINK_TRAINER_CA { [MALE] = { - FACILITY_CLASS_COOLTRAINER_3, - FACILITY_CLASS_BLACK_BELT_2, - FACILITY_CLASS_CAMPER_2, - FACILITY_CLASS_YOUNGSTER_2, - FACILITY_CLASS_PSYCHIC_3, - FACILITY_CLASS_BUG_CATCHER_2, + FACILITY_CLASS_COOLTRAINER_M, + FACILITY_CLASS_BLACK_BELT, + FACILITY_CLASS_CAMPER, + FACILITY_CLASS_YOUNGSTER, + FACILITY_CLASS_PSYCHIC_M, + FACILITY_CLASS_BUG_CATCHER, FACILITY_CLASS_TAMER, FACILITY_CLASS_JUGGLER }, [FEMALE] = { - FACILITY_CLASS_COOLTRAINER_4, + FACILITY_CLASS_COOLTRAINER_F, FACILITY_CLASS_CHANNELER, - FACILITY_CLASS_PICNICKER_2, - FACILITY_CLASS_LASS_2, - FACILITY_CLASS_PSYCHIC_2, + FACILITY_CLASS_PICNICKER, + FACILITY_CLASS_LASS, + FACILITY_CLASS_RS_PSYCHIC_F, FACILITY_CLASS_BATTLE_GIRL, - FACILITY_CLASS_PKMN_BREEDER_2, - FACILITY_CLASS_BEAUTY_2 + FACILITY_CLASS_RS_PKMN_BREEDER_F, + FACILITY_CLASS_BEAUTY } }; diff --git a/src/trainer_tower.c b/src/trainer_tower.c index fe45a2938..1bfcc5dc9 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -15,7 +15,7 @@ #include "constants/items.h" #include "constants/songs.h" #include "constants/layouts.h" -#include "constants/facility_trainer_classes.h" +#include "constants/trainers.h" #include "constants/event_objects.h" #include "constants/trainer_tower.h" @@ -103,210 +103,210 @@ extern const u8 gText_XMinYZSec[]; extern const u8 *const gTrainerTowerChallengeTypeTexts[]; static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = { - {OBJ_EVENT_GFX_WOMAN_2, FACILITY_CLASS_AROMA_LADY, FEMALE}, - {OBJ_EVENT_GFX_HIKER, FACILITY_CLASS_RUIN_MANIAC, MALE}, - {OBJ_EVENT_GFX_TUBER_F, FACILITY_CLASS_TUBER, FEMALE}, - {OBJ_EVENT_GFX_TUBER_M_LAND, FACILITY_CLASS_TUBER_2, MALE}, - {OBJ_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER, MALE}, - {OBJ_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_2, FEMALE}, - {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_HEX_MANIAC, MALE}, - {OBJ_EVENT_GFX_WOMAN_2, FACILITY_CLASS_LADY, FEMALE}, - {OBJ_EVENT_GFX_BEAUTY, FACILITY_CLASS_BEAUTY, FEMALE}, - {OBJ_EVENT_GFX_BOY, FACILITY_CLASS_RICH_BOY, MALE}, - {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_POKEMANIAC, MALE}, - {OBJ_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE, MALE}, - {OBJ_EVENT_GFX_BLACKBELT, FACILITY_CLASS_BLACK_BELT, MALE}, - {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_GUITARIST, MALE}, - {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_KINDLER, MALE}, - {OBJ_EVENT_GFX_CAMPER, FACILITY_CLASS_CAMPER, MALE}, - {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_BUG_MANIAC, MALE}, - {OBJ_EVENT_GFX_BOY, FACILITY_CLASS_PSYCHIC, MALE}, - {OBJ_EVENT_GFX_WOMAN_1, FACILITY_CLASS_PSYCHIC_2, FEMALE}, - {OBJ_EVENT_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN, MALE}, - {OBJ_EVENT_GFX_BOY, FACILITY_CLASS_SCHOOL_KID, MALE}, - {OBJ_EVENT_GFX_WOMAN_1, FACILITY_CLASS_SCHOOL_KID_2, FEMALE}, - {OBJ_EVENT_GFX_BALDING_MAN, FACILITY_CLASS_POKEFAN, MALE}, - {OBJ_EVENT_GFX_WOMAN_3, FACILITY_CLASS_POKEFAN_2, FEMALE}, - {OBJ_EVENT_GFX_OLD_MAN_1, FACILITY_CLASS_EXPERT, MALE}, - {OBJ_EVENT_GFX_OLD_WOMAN, FACILITY_CLASS_EXPERT_2, FEMALE}, - {OBJ_EVENT_GFX_YOUNGSTER, FACILITY_CLASS_YOUNGSTER, MALE}, - {OBJ_EVENT_GFX_FISHER, FACILITY_CLASS_FISHERMAN, MALE}, - {OBJ_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_DRAGON_TAMER, MALE}, - {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER, MALE}, - {OBJ_EVENT_GFX_LITTLE_BOY, FACILITY_CLASS_NINJA_BOY, MALE}, - {OBJ_EVENT_GFX_BATTLE_GIRL, FACILITY_CLASS_BATTLE_GIRL, FEMALE}, - {OBJ_EVENT_GFX_BEAUTY, FACILITY_CLASS_PARASOL_LADY, FEMALE}, - {OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE, FEMALE}, - {OBJ_EVENT_GFX_PICNICKER, FACILITY_CLASS_PICNICKER, FEMALE}, - {OBJ_EVENT_GFX_SAILOR, FACILITY_CLASS_SAILOR, MALE}, - {OBJ_EVENT_GFX_FAT_MAN, FACILITY_CLASS_COLLECTOR, MALE}, - {OBJ_EVENT_GFX_MAN, FACILITY_CLASS_PKMN_BREEDER, MALE}, - {OBJ_EVENT_GFX_WOMAN_2, FACILITY_CLASS_PKMN_BREEDER_2, FEMALE}, - {OBJ_EVENT_GFX_CAMPER, FACILITY_CLASS_PKMN_RANGER, MALE}, - {OBJ_EVENT_GFX_PICNICKER, FACILITY_CLASS_PKMN_RANGER_2, FEMALE}, - {OBJ_EVENT_GFX_LASS, FACILITY_CLASS_LASS, FEMALE}, - {OBJ_EVENT_GFX_BUG_CATCHER, FACILITY_CLASS_BUG_CATCHER, MALE}, - {OBJ_EVENT_GFX_HIKER, FACILITY_CLASS_HIKER, MALE}, - {OBJ_EVENT_GFX_YOUNGSTER, FACILITY_CLASS_YOUNGSTER_2, MALE}, - {OBJ_EVENT_GFX_BUG_CATCHER, FACILITY_CLASS_BUG_CATCHER_2, MALE}, - {OBJ_EVENT_GFX_LASS, FACILITY_CLASS_LASS_2, FEMALE}, - {OBJ_EVENT_GFX_SAILOR, FACILITY_CLASS_SAILOR_2, MALE}, - {OBJ_EVENT_GFX_CAMPER, FACILITY_CLASS_CAMPER_2, MALE}, - {OBJ_EVENT_GFX_PICNICKER, FACILITY_CLASS_PICNICKER_2, FEMALE}, - {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_POKEMANIAC_2, MALE}, - {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_SUPER_NERD, MALE}, - {OBJ_EVENT_GFX_HIKER, FACILITY_CLASS_HIKER_2, MALE}, - {OBJ_EVENT_GFX_BIKER, FACILITY_CLASS_BIKER, MALE}, - {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_BURGLAR, MALE}, - {OBJ_EVENT_GFX_BALDING_MAN, FACILITY_CLASS_ENGINEER, MALE}, - {OBJ_EVENT_GFX_FISHER, FACILITY_CLASS_FISHERMAN_2, MALE}, - {OBJ_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE_2, MALE}, - {OBJ_EVENT_GFX_BIKER, FACILITY_CLASS_CUE_BALL, MALE}, - {OBJ_EVENT_GFX_OLD_MAN_1, FACILITY_CLASS_GAMER, MALE}, - {OBJ_EVENT_GFX_BEAUTY, FACILITY_CLASS_BEAUTY_2, FEMALE}, - {OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE_2, FEMALE}, - {OBJ_EVENT_GFX_BOY, FACILITY_CLASS_PSYCHIC_3, MALE}, - {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_ROCKER, MALE}, - {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_JUGGLER, MALE}, - {OBJ_EVENT_GFX_MAN, FACILITY_CLASS_TAMER, MALE}, - {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER_2, MALE}, - {OBJ_EVENT_GFX_BLACKBELT, FACILITY_CLASS_BLACK_BELT_2, MALE}, - {OBJ_EVENT_GFX_SCIENTIST, FACILITY_CLASS_SCIENTIST, MALE}, - {OBJ_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER_3, MALE}, - {OBJ_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_4, FEMALE}, - {OBJ_EVENT_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN_2, MALE}, - {OBJ_EVENT_GFX_CHANNELER, FACILITY_CLASS_CHANNELER, FEMALE}, - {OBJ_EVENT_GFX_WOMAN_1, FACILITY_CLASS_PSYCHIC_4, FEMALE}, - {OBJ_EVENT_GFX_BATTLE_GIRL, FACILITY_CLASS_CRUSH_GIRL, FEMALE}, - {OBJ_EVENT_GFX_TUBER_F, FACILITY_CLASS_TUBER_3, FEMALE}, - {OBJ_EVENT_GFX_WOMAN_2, FACILITY_CLASS_PKMN_BREEDER_3, FEMALE}, - {OBJ_EVENT_GFX_CAMPER, FACILITY_CLASS_PKMN_RANGER_3, MALE}, - {OBJ_EVENT_GFX_PICNICKER, FACILITY_CLASS_PKMN_RANGER_4, FEMALE}, - {OBJ_EVENT_GFX_WOMAN_2, FACILITY_CLASS_AROMA_LADY_2, FEMALE}, - {OBJ_EVENT_GFX_HIKER, FACILITY_CLASS_RUIN_MANIAC_2, MALE}, - {OBJ_EVENT_GFX_WOMAN_2, FACILITY_CLASS_LADY_2, FEMALE}, - {OBJ_EVENT_GFX_LASS, FACILITY_CLASS_PAINTER, FEMALE} + {OBJ_EVENT_GFX_WOMAN_2, FACILITY_CLASS_RS_AROMA_LADY, FEMALE}, + {OBJ_EVENT_GFX_HIKER, FACILITY_CLASS_RS_RUIN_MANIAC, MALE}, + {OBJ_EVENT_GFX_TUBER_F, FACILITY_CLASS_RS_TUBER_F, FEMALE}, + {OBJ_EVENT_GFX_TUBER_M_LAND, FACILITY_CLASS_RS_TUBER_M, MALE}, + {OBJ_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_RS_COOLTRAINER_M, MALE}, + {OBJ_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_RS_COOLTRAINER_F, FEMALE}, + {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_HEX_MANIAC, MALE}, + {OBJ_EVENT_GFX_WOMAN_2, FACILITY_CLASS_RS_LADY, FEMALE}, + {OBJ_EVENT_GFX_BEAUTY, FACILITY_CLASS_RS_BEAUTY, FEMALE}, + {OBJ_EVENT_GFX_BOY, FACILITY_CLASS_RICH_BOY, MALE}, + {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_RS_POKEMANIAC, MALE}, + {OBJ_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_RS_SWIMMER_M, MALE}, + {OBJ_EVENT_GFX_BLACKBELT, FACILITY_CLASS_RS_BLACK_BELT, MALE}, + {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_GUITARIST, MALE}, + {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_KINDLER, MALE}, + {OBJ_EVENT_GFX_CAMPER, FACILITY_CLASS_RS_CAMPER, MALE}, + {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_BUG_MANIAC, MALE}, + {OBJ_EVENT_GFX_BOY, FACILITY_CLASS_RS_PSYCHIC_M, MALE}, + {OBJ_EVENT_GFX_WOMAN_1, FACILITY_CLASS_RS_PSYCHIC_F, FEMALE}, + {OBJ_EVENT_GFX_GENTLEMAN, FACILITY_CLASS_RS_GENTLEMAN, MALE}, + {OBJ_EVENT_GFX_BOY, FACILITY_CLASS_SCHOOL_KID_M, MALE}, + {OBJ_EVENT_GFX_WOMAN_1, FACILITY_CLASS_SCHOOL_KID_F, FEMALE}, + {OBJ_EVENT_GFX_BALDING_MAN, FACILITY_CLASS_POKEFAN_M, MALE}, + {OBJ_EVENT_GFX_WOMAN_3, FACILITY_CLASS_POKEFAN_F, FEMALE}, + {OBJ_EVENT_GFX_OLD_MAN_1, FACILITY_CLASS_EXPERT_M, MALE}, + {OBJ_EVENT_GFX_OLD_WOMAN, FACILITY_CLASS_EXPERT_F, FEMALE}, + {OBJ_EVENT_GFX_YOUNGSTER, FACILITY_CLASS_RS_YOUNGSTER, MALE}, + {OBJ_EVENT_GFX_FISHER, FACILITY_CLASS_RS_FISHERMAN, MALE}, + {OBJ_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_DRAGON_TAMER, MALE}, + {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_RS_BIRD_KEEPER, MALE}, + {OBJ_EVENT_GFX_LITTLE_BOY, FACILITY_CLASS_NINJA_BOY, MALE}, + {OBJ_EVENT_GFX_BATTLE_GIRL, FACILITY_CLASS_BATTLE_GIRL, FEMALE}, + {OBJ_EVENT_GFX_BEAUTY, FACILITY_CLASS_PARASOL_LADY, FEMALE}, + {OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_RS_SWIMMER_F, FEMALE}, + {OBJ_EVENT_GFX_PICNICKER, FACILITY_CLASS_RS_PICNICKER, FEMALE}, + {OBJ_EVENT_GFX_SAILOR, FACILITY_CLASS_RS_SAILOR, MALE}, + {OBJ_EVENT_GFX_FAT_MAN, FACILITY_CLASS_COLLECTOR, MALE}, + {OBJ_EVENT_GFX_MAN, FACILITY_CLASS_RS_PKMN_BREEDER_M, MALE}, + {OBJ_EVENT_GFX_WOMAN_2, FACILITY_CLASS_RS_PKMN_BREEDER_F, FEMALE}, + {OBJ_EVENT_GFX_CAMPER, FACILITY_CLASS_RS_PKMN_RANGER_M, MALE}, + {OBJ_EVENT_GFX_PICNICKER, FACILITY_CLASS_RS_PKMN_RANGER_F, FEMALE}, + {OBJ_EVENT_GFX_LASS, FACILITY_CLASS_RS_LASS, FEMALE}, + {OBJ_EVENT_GFX_BUG_CATCHER, FACILITY_CLASS_RS_BUG_CATCHER, MALE}, + {OBJ_EVENT_GFX_HIKER, FACILITY_CLASS_RS_HIKER, MALE}, + {OBJ_EVENT_GFX_YOUNGSTER, FACILITY_CLASS_YOUNGSTER, MALE}, + {OBJ_EVENT_GFX_BUG_CATCHER, FACILITY_CLASS_BUG_CATCHER, MALE}, + {OBJ_EVENT_GFX_LASS, FACILITY_CLASS_LASS, FEMALE}, + {OBJ_EVENT_GFX_SAILOR, FACILITY_CLASS_SAILOR, MALE}, + {OBJ_EVENT_GFX_CAMPER, FACILITY_CLASS_CAMPER, MALE}, + {OBJ_EVENT_GFX_PICNICKER, FACILITY_CLASS_PICNICKER, FEMALE}, + {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_POKEMANIAC, MALE}, + {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_SUPER_NERD, MALE}, + {OBJ_EVENT_GFX_HIKER, FACILITY_CLASS_HIKER, MALE}, + {OBJ_EVENT_GFX_BIKER, FACILITY_CLASS_BIKER, MALE}, + {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_BURGLAR, MALE}, + {OBJ_EVENT_GFX_BALDING_MAN, FACILITY_CLASS_ENGINEER, MALE}, + {OBJ_EVENT_GFX_FISHER, FACILITY_CLASS_FISHERMAN, MALE}, + {OBJ_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_M, MALE}, + {OBJ_EVENT_GFX_BIKER, FACILITY_CLASS_CUE_BALL, MALE}, + {OBJ_EVENT_GFX_OLD_MAN_1, FACILITY_CLASS_GAMER, MALE}, + {OBJ_EVENT_GFX_BEAUTY, FACILITY_CLASS_BEAUTY, FEMALE}, + {OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_F, FEMALE}, + {OBJ_EVENT_GFX_BOY, FACILITY_CLASS_PSYCHIC_M, MALE}, + {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_ROCKER, MALE}, + {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_JUGGLER, MALE}, + {OBJ_EVENT_GFX_MAN, FACILITY_CLASS_TAMER, MALE}, + {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER, MALE}, + {OBJ_EVENT_GFX_BLACKBELT, FACILITY_CLASS_BLACK_BELT, MALE}, + {OBJ_EVENT_GFX_SCIENTIST, FACILITY_CLASS_SCIENTIST, MALE}, + {OBJ_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER_M, MALE}, + {OBJ_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_F, FEMALE}, + {OBJ_EVENT_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN, MALE}, + {OBJ_EVENT_GFX_CHANNELER, FACILITY_CLASS_CHANNELER, FEMALE}, + {OBJ_EVENT_GFX_WOMAN_1, FACILITY_CLASS_PSYCHIC_F, FEMALE}, + {OBJ_EVENT_GFX_BATTLE_GIRL, FACILITY_CLASS_CRUSH_GIRL, FEMALE}, + {OBJ_EVENT_GFX_TUBER_F, FACILITY_CLASS_TUBER, FEMALE}, + {OBJ_EVENT_GFX_WOMAN_2, FACILITY_CLASS_PKMN_BREEDER, FEMALE}, + {OBJ_EVENT_GFX_CAMPER, FACILITY_CLASS_PKMN_RANGER_M, MALE}, + {OBJ_EVENT_GFX_PICNICKER, FACILITY_CLASS_PKMN_RANGER_F, FEMALE}, + {OBJ_EVENT_GFX_WOMAN_2, FACILITY_CLASS_AROMA_LADY, FEMALE}, + {OBJ_EVENT_GFX_HIKER, FACILITY_CLASS_RUIN_MANIAC, MALE}, + {OBJ_EVENT_GFX_WOMAN_2, FACILITY_CLASS_LADY, FEMALE}, + {OBJ_EVENT_GFX_LASS, FACILITY_CLASS_PAINTER, FEMALE} }; static const struct DoublesTrainerInfo sDoubleBattleTrainerInfo[] = { - {OBJ_EVENT_GFX_BEAUTY, OBJ_EVENT_GFX_WOMAN_1, FACILITY_CLASS_SR_AND_JR, FEMALE, FEMALE}, - {OBJ_EVENT_GFX_LITTLE_GIRL, OBJ_EVENT_GFX_LITTLE_GIRL, FACILITY_CLASS_TWINS, FEMALE, FEMALE}, - {OBJ_EVENT_GFX_BEAUTY, OBJ_EVENT_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE, FEMALE, MALE}, - {OBJ_EVENT_GFX_OLD_MAN_1, OBJ_EVENT_GFX_OLD_WOMAN, FACILITY_CLASS_OLD_COUPLE, MALE, FEMALE}, - {OBJ_EVENT_GFX_TUBER_M_LAND, OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SIS_AND_BRO, MALE, FEMALE}, - {OBJ_EVENT_GFX_LITTLE_GIRL, OBJ_EVENT_GFX_LITTLE_GIRL, FACILITY_CLASS_TWINS_2, FEMALE, FEMALE}, - {OBJ_EVENT_GFX_COOLTRAINER_M, OBJ_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOL_COUPLE, MALE, FEMALE}, - {OBJ_EVENT_GFX_BEAUTY, OBJ_EVENT_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE_2, FEMALE, MALE}, - {OBJ_EVENT_GFX_BATTLE_GIRL, OBJ_EVENT_GFX_BLACKBELT, FACILITY_CLASS_CRUSH_KIN, FEMALE, MALE}, - {OBJ_EVENT_GFX_SWIMMER_F_LAND, OBJ_EVENT_GFX_TUBER_M_LAND, FACILITY_CLASS_SIS_AND_BRO_2, FEMALE, MALE} + {OBJ_EVENT_GFX_BEAUTY, OBJ_EVENT_GFX_WOMAN_1, FACILITY_CLASS_SR_AND_JR, FEMALE, FEMALE}, + {OBJ_EVENT_GFX_LITTLE_GIRL, OBJ_EVENT_GFX_LITTLE_GIRL, FACILITY_CLASS_RS_TWINS, FEMALE, FEMALE}, + {OBJ_EVENT_GFX_BEAUTY, OBJ_EVENT_GFX_MAN, FACILITY_CLASS_RS_YOUNG_COUPLE, FEMALE, MALE}, + {OBJ_EVENT_GFX_OLD_MAN_1, OBJ_EVENT_GFX_OLD_WOMAN, FACILITY_CLASS_OLD_COUPLE, MALE, FEMALE}, + {OBJ_EVENT_GFX_TUBER_M_LAND, OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_RS_SIS_AND_BRO, MALE, FEMALE}, + {OBJ_EVENT_GFX_LITTLE_GIRL, OBJ_EVENT_GFX_LITTLE_GIRL, FACILITY_CLASS_TWINS, FEMALE, FEMALE}, + {OBJ_EVENT_GFX_COOLTRAINER_M, OBJ_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOL_COUPLE, MALE, FEMALE}, + {OBJ_EVENT_GFX_BEAUTY, OBJ_EVENT_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE, FEMALE, MALE}, + {OBJ_EVENT_GFX_BATTLE_GIRL, OBJ_EVENT_GFX_BLACKBELT, FACILITY_CLASS_CRUSH_KIN, FEMALE, MALE}, + {OBJ_EVENT_GFX_SWIMMER_F_LAND, OBJ_EVENT_GFX_TUBER_M_LAND, FACILITY_CLASS_SIS_AND_BRO, FEMALE, MALE} }; static const struct TrainerEncounterMusicPairs sTrainerEncounterMusicLUT[105] = { - {FACILITY_CLASS_AROMA_LADY, TRAINER_ENCOUNTER_MUSIC_AQUA}, - {FACILITY_CLASS_BOARDER_2, TRAINER_ENCOUNTER_MUSIC_AQUA}, - {FACILITY_CLASS_TEAM_AQUA_2, TRAINER_ENCOUNTER_MUSIC_AQUA}, - {FACILITY_CLASS_GAMER, TRAINER_ENCOUNTER_MUSIC_FEMALE}, - {FACILITY_CLASS_RUIN_MANIAC, TRAINER_ENCOUNTER_MUSIC_FEMALE}, - {FACILITY_CLASS_YOUNGSTER, TRAINER_ENCOUNTER_MUSIC_INTENSE}, - {FACILITY_CLASS_YOUNG_COUPLE, TRAINER_ENCOUNTER_MUSIC_FEMALE}, - {FACILITY_CLASS_FISHERMAN, TRAINER_ENCOUNTER_MUSIC_FEMALE}, - {FACILITY_CLASS_TRIATHLETE_4, TRAINER_ENCOUNTER_MUSIC_MALE}, - {FACILITY_CLASS_PKMN_RANGER, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, - {FACILITY_CLASS_LEADER_2, TRAINER_ENCOUNTER_MUSIC_TWINS}, - {FACILITY_CLASS_SIS_AND_BRO, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, - {FACILITY_CLASS_MAGMA_LEADER, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, - {FACILITY_CLASS_POKEFAN_2, TRAINER_ENCOUNTER_MUSIC_INTENSE}, - {FACILITY_CLASS_PKMN_RANGER_2, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, - {FACILITY_CLASS_PSYCHIC_3, TRAINER_ENCOUNTER_MUSIC_FEMALE}, - {FACILITY_CLASS_PICNICKER_2, TRAINER_ENCOUNTER_MUSIC_COOL}, - {FACILITY_CLASS_ELITE_FOUR_3, TRAINER_ENCOUNTER_MUSIC_COOL}, - {FACILITY_CLASS_COOLTRAINER_2, TRAINER_ENCOUNTER_MUSIC_COOL}, - {FACILITY_CLASS_GUITARIST, TRAINER_ENCOUNTER_MUSIC_INTENSE}, - {FACILITY_CLASS_BUG_CATCHER, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, - {FACILITY_CLASS_PKMN_TRAINER_4, TRAINER_ENCOUNTER_MUSIC_MALE}, - {FACILITY_CLASS_TRIATHLETE_3, TRAINER_ENCOUNTER_MUSIC_MALE}, - {FACILITY_CLASS_CAMPER_2, TRAINER_ENCOUNTER_MUSIC_TWINS}, - {FACILITY_CLASS_TRIATHLETE_2, TRAINER_ENCOUNTER_MUSIC_TWINS}, - {FACILITY_CLASS_TUBER, TRAINER_ENCOUNTER_MUSIC_INTERVIEWER}, - {FACILITY_CLASS_BEAUTY_2, TRAINER_ENCOUNTER_MUSIC_HIKER}, - {FACILITY_CLASS_INTERVIEWER, TRAINER_ENCOUNTER_MUSIC_HIKER}, - {FACILITY_CLASS_YOUNGSTER_2, TRAINER_ENCOUNTER_MUSIC_RICH}, - {FACILITY_CLASS_PSYCHIC_2, TRAINER_ENCOUNTER_MUSIC_RICH}, - {FACILITY_CLASS_TEAM_MAGMA_2, TRAINER_ENCOUNTER_MUSIC_SWIMMER}, - {FACILITY_CLASS_SWIMMER_MALE, TRAINER_ENCOUNTER_MUSIC_FEMALE}, - {FACILITY_CLASS_PKMN_TRAINER_7, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, - {FACILITY_CLASS_POKEMANIAC, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, - {FACILITY_CLASS_SUPER_NERD, TRAINER_ENCOUNTER_MUSIC_INTENSE}, - {FACILITY_CLASS_ENGINEER, TRAINER_ENCOUNTER_MUSIC_INTENSE}, - {FACILITY_CLASS_MAGMA_ADMIN_2, TRAINER_ENCOUNTER_MUSIC_INTENSE}, - {FACILITY_CLASS_BLACK_BELT, TRAINER_ENCOUNTER_MUSIC_INTENSE}, - {FACILITY_CLASS_LEADER_5, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, - {FACILITY_CLASS_SAILOR, TRAINER_ENCOUNTER_MUSIC_INTENSE}, - {FACILITY_CLASS_SAILOR_2, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, - {FACILITY_CLASS_BUG_MANIAC, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, - {FACILITY_CLASS_PKMN_TRAINER_5, TRAINER_ENCOUNTER_MUSIC_MALE}, - {FACILITY_CLASS_CAMPER, TRAINER_ENCOUNTER_MUSIC_MALE}, - {FACILITY_CLASS_KINDLER, TRAINER_ENCOUNTER_MUSIC_HIKER}, - {FACILITY_CLASS_BATTLE_GIRL, TRAINER_ENCOUNTER_MUSIC_MAGMA}, - {FACILITY_CLASS_COLLECTOR, TRAINER_ENCOUNTER_MUSIC_MAGMA}, - {FACILITY_CLASS_NINJA_BOY, TRAINER_ENCOUNTER_MUSIC_MAGMA}, - {FACILITY_CLASS_PKMN_TRAINER_3, TRAINER_ENCOUNTER_MUSIC_FEMALE}, - {FACILITY_CLASS_PARASOL_LADY, TRAINER_ENCOUNTER_MUSIC_FEMALE}, - {FACILITY_CLASS_AQUA_ADMIN_2, TRAINER_ENCOUNTER_MUSIC_HIKER}, - {FACILITY_CLASS_PKMN_TRAINER_2, TRAINER_ENCOUNTER_MUSIC_MALE}, - {FACILITY_CLASS_SWIMMER_FEMALE, TRAINER_ENCOUNTER_MUSIC_MALE}, - {FACILITY_CLASS_EXPERT_2, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, - {FACILITY_CLASS_RICH_BOY, TRAINER_ENCOUNTER_MUSIC_RICH}, - {FACILITY_CLASS_HEX_MANIAC, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, - {FACILITY_CLASS_HIKER, TRAINER_ENCOUNTER_MUSIC_FEMALE}, - {FACILITY_CLASS_BEAUTY, TRAINER_ENCOUNTER_MUSIC_FEMALE}, - {FACILITY_CLASS_SWIMMER_FEMALE_2, TRAINER_ENCOUNTER_MUSIC_FEMALE}, - {FACILITY_CLASS_LADY, TRAINER_ENCOUNTER_MUSIC_FEMALE}, - {FACILITY_CLASS_CHAMPION, TRAINER_ENCOUNTER_MUSIC_FEMALE}, - {FACILITY_CLASS_PKMN_TRAINER_6, TRAINER_ENCOUNTER_MUSIC_GIRL}, - {FACILITY_CLASS_TRIATHLETE, TRAINER_ENCOUNTER_MUSIC_GIRL}, - {FACILITY_CLASS_SWIMMER_MALE_2, TRAINER_ENCOUNTER_MUSIC_FEMALE}, - {FACILITY_CLASS_DRAGON_TAMER, TRAINER_ENCOUNTER_MUSIC_FEMALE}, - {FACILITY_CLASS_BIKER, TRAINER_ENCOUNTER_MUSIC_FEMALE}, - {FACILITY_CLASS_TRIATHLETE_5, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, - {FACILITY_CLASS_CUE_BALL, TRAINER_ENCOUNTER_MUSIC_COOL}, - {FACILITY_CLASS_BIRD_KEEPER, TRAINER_ENCOUNTER_MUSIC_COOL}, - {FACILITY_CLASS_TRIATHLETE_6, TRAINER_ENCOUNTER_MUSIC_MALE}, - {FACILITY_CLASS_POKEMANIAC_2, TRAINER_ENCOUNTER_MUSIC_GIRL}, - {FACILITY_CLASS_TWINS, TRAINER_ENCOUNTER_MUSIC_GIRL}, - {FACILITY_CLASS_LEADER_4, TRAINER_ENCOUNTER_MUSIC_MALE}, - {FACILITY_CLASS_BUG_CATCHER_2, TRAINER_ENCOUNTER_MUSIC_MALE}, - {FACILITY_CLASS_PKMN_BREEDER, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, - {FACILITY_CLASS_LEADER_8, TRAINER_ENCOUNTER_MUSIC_AQUA}, - {FACILITY_CLASS_LEADER_6, TRAINER_ENCOUNTER_MUSIC_AQUA}, - {FACILITY_CLASS_OLD_COUPLE, TRAINER_ENCOUNTER_MUSIC_INTENSE}, - {FACILITY_CLASS_PSYCHIC, TRAINER_ENCOUNTER_MUSIC_INTENSE}, - {FACILITY_CLASS_LEADER, TRAINER_ENCOUNTER_MUSIC_TWINS}, - {FACILITY_CLASS_ELITE_FOUR_4, TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR}, - {FACILITY_CLASS_GENTLEMAN, TRAINER_ENCOUNTER_MUSIC_FEMALE}, - {FACILITY_CLASS_LASS, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, - {FACILITY_CLASS_BURGLAR, TRAINER_ENCOUNTER_MUSIC_FEMALE}, - {FACILITY_CLASS_PKMN_TRAINER, TRAINER_ENCOUNTER_MUSIC_MALE}, - {FACILITY_CLASS_SCHOOL_KID, TRAINER_ENCOUNTER_MUSIC_MALE}, - {FACILITY_CLASS_LEADER_3, TRAINER_ENCOUNTER_MUSIC_INTENSE}, - {FACILITY_CLASS_POKEFAN, TRAINER_ENCOUNTER_MUSIC_MALE}, - {FACILITY_CLASS_MAGMA_ADMIN, TRAINER_ENCOUNTER_MUSIC_COOL}, - {FACILITY_CLASS_EXPERT, TRAINER_ENCOUNTER_MUSIC_COOL}, - {FACILITY_CLASS_TEAM_MAGMA, TRAINER_ENCOUNTER_MUSIC_HIKER}, - {FACILITY_CLASS_SR_AND_JR, TRAINER_ENCOUNTER_MUSIC_HIKER}, - {FACILITY_CLASS_LASS_2, TRAINER_ENCOUNTER_MUSIC_MALE}, - {FACILITY_CLASS_SCHOOL_KID_2, TRAINER_ENCOUNTER_MUSIC_MALE}, - {FACILITY_CLASS_COOLTRAINER, TRAINER_ENCOUNTER_MUSIC_MALE}, - {FACILITY_CLASS_FISHERMAN_2, TRAINER_ENCOUNTER_MUSIC_GIRL}, - {FACILITY_CLASS_TUBER_2, TRAINER_ENCOUNTER_MUSIC_GIRL}, - {FACILITY_CLASS_HIKER_2, TRAINER_ENCOUNTER_MUSIC_SWIMMER}, - {FACILITY_CLASS_BOARDER, TRAINER_ENCOUNTER_MUSIC_SWIMMER}, - {FACILITY_CLASS_PKMN_BREEDER_2, TRAINER_ENCOUNTER_MUSIC_HIKER}, - {FACILITY_CLASS_PICNICKER, TRAINER_ENCOUNTER_MUSIC_HIKER}, - {FACILITY_CLASS_LEADER_7, TRAINER_ENCOUNTER_MUSIC_MALE}, - {FACILITY_CLASS_ELITE_FOUR, TRAINER_ENCOUNTER_MUSIC_FEMALE}, - {FACILITY_CLASS_AQUA_ADMIN, TRAINER_ENCOUNTER_MUSIC_HIKER}, - {FACILITY_CLASS_ELITE_FOUR_2, TRAINER_ENCOUNTER_MUSIC_MALE} + {FACILITY_CLASS_RS_AROMA_LADY, TRAINER_ENCOUNTER_MUSIC_AQUA}, + {FACILITY_CLASS_BOARDER_F, TRAINER_ENCOUNTER_MUSIC_AQUA}, + {FACILITY_CLASS_AQUA_GRUNT_F, TRAINER_ENCOUNTER_MUSIC_AQUA}, + {FACILITY_CLASS_GAMER, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {FACILITY_CLASS_RS_RUIN_MANIAC, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {FACILITY_CLASS_RS_YOUNGSTER, TRAINER_ENCOUNTER_MUSIC_INTENSE}, + {FACILITY_CLASS_RS_YOUNG_COUPLE, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {FACILITY_CLASS_RS_FISHERMAN, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {FACILITY_CLASS_RUNNING_TRIATHLETE_F, TRAINER_ENCOUNTER_MUSIC_MALE}, + {FACILITY_CLASS_RS_PKMN_RANGER_M, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {FACILITY_CLASS_LEADER_BRAWLY, TRAINER_ENCOUNTER_MUSIC_TWINS}, + {FACILITY_CLASS_RS_SIS_AND_BRO, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {FACILITY_CLASS_MAGMA_LEADER_MAXIE, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {FACILITY_CLASS_POKEFAN_F, TRAINER_ENCOUNTER_MUSIC_INTENSE}, + {FACILITY_CLASS_RS_PKMN_RANGER_F, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {FACILITY_CLASS_PSYCHIC_M, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {FACILITY_CLASS_PICNICKER, TRAINER_ENCOUNTER_MUSIC_COOL}, + {FACILITY_CLASS_ELITE_FOUR_GLACIA, TRAINER_ENCOUNTER_MUSIC_COOL}, + {FACILITY_CLASS_RS_COOLTRAINER_F, TRAINER_ENCOUNTER_MUSIC_COOL}, + {FACILITY_CLASS_GUITARIST, TRAINER_ENCOUNTER_MUSIC_INTENSE}, + {FACILITY_CLASS_RS_BUG_CATCHER, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3, TRAINER_ENCOUNTER_MUSIC_MALE}, + {FACILITY_CLASS_RUNNING_TRIATHLETE_M, TRAINER_ENCOUNTER_MUSIC_MALE}, + {FACILITY_CLASS_CAMPER, TRAINER_ENCOUNTER_MUSIC_TWINS}, + {FACILITY_CLASS_CYCLING_TRIATHLETE_F, TRAINER_ENCOUNTER_MUSIC_TWINS}, + {FACILITY_CLASS_RS_TUBER_F, TRAINER_ENCOUNTER_MUSIC_INTERVIEWER}, + {FACILITY_CLASS_BEAUTY, TRAINER_ENCOUNTER_MUSIC_HIKER}, + {FACILITY_CLASS_INTERVIEWER, TRAINER_ENCOUNTER_MUSIC_HIKER}, + {FACILITY_CLASS_YOUNGSTER, TRAINER_ENCOUNTER_MUSIC_RICH}, + {FACILITY_CLASS_RS_PSYCHIC_F, TRAINER_ENCOUNTER_MUSIC_RICH}, + {FACILITY_CLASS_MAGMA_GRUNT_F, TRAINER_ENCOUNTER_MUSIC_SWIMMER}, + {FACILITY_CLASS_RS_SWIMMER_M, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {FACILITY_CLASS_PKMN_TRAINER_MAY_3, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {FACILITY_CLASS_RS_POKEMANIAC, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {FACILITY_CLASS_SUPER_NERD, TRAINER_ENCOUNTER_MUSIC_INTENSE}, + {FACILITY_CLASS_ENGINEER, TRAINER_ENCOUNTER_MUSIC_INTENSE}, + {FACILITY_CLASS_MAGMA_ADMIN_F, TRAINER_ENCOUNTER_MUSIC_INTENSE}, + {FACILITY_CLASS_RS_BLACK_BELT, TRAINER_ENCOUNTER_MUSIC_INTENSE}, + {FACILITY_CLASS_LEADER_FLANNERY, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {FACILITY_CLASS_RS_SAILOR, TRAINER_ENCOUNTER_MUSIC_INTENSE}, + {FACILITY_CLASS_SAILOR, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {FACILITY_CLASS_BUG_MANIAC, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {FACILITY_CLASS_PKMN_TRAINER_MAY, TRAINER_ENCOUNTER_MUSIC_MALE}, + {FACILITY_CLASS_RS_CAMPER, TRAINER_ENCOUNTER_MUSIC_MALE}, + {FACILITY_CLASS_KINDLER, TRAINER_ENCOUNTER_MUSIC_HIKER}, + {FACILITY_CLASS_BATTLE_GIRL, TRAINER_ENCOUNTER_MUSIC_MAGMA}, + {FACILITY_CLASS_COLLECTOR, TRAINER_ENCOUNTER_MUSIC_MAGMA}, + {FACILITY_CLASS_NINJA_BOY, TRAINER_ENCOUNTER_MUSIC_MAGMA}, + {FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {FACILITY_CLASS_PARASOL_LADY, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {FACILITY_CLASS_AQUA_ADMIN_F, TRAINER_ENCOUNTER_MUSIC_HIKER}, + {FACILITY_CLASS_PKMN_TRAINER_BRENDAN, TRAINER_ENCOUNTER_MUSIC_MALE}, + {FACILITY_CLASS_RS_SWIMMER_F, TRAINER_ENCOUNTER_MUSIC_MALE}, + {FACILITY_CLASS_EXPERT_F, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {FACILITY_CLASS_RICH_BOY, TRAINER_ENCOUNTER_MUSIC_RICH}, + {FACILITY_CLASS_HEX_MANIAC, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {FACILITY_CLASS_RS_HIKER, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {FACILITY_CLASS_RS_BEAUTY, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {FACILITY_CLASS_SWIMMER_F, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {FACILITY_CLASS_RS_LADY, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {FACILITY_CLASS_CHAMPION_STEVEN, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {FACILITY_CLASS_PKMN_TRAINER_MAY_2, TRAINER_ENCOUNTER_MUSIC_GIRL}, + {FACILITY_CLASS_CYCLING_TRIATHLETE_M, TRAINER_ENCOUNTER_MUSIC_GIRL}, + {FACILITY_CLASS_SWIMMER_M, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {FACILITY_CLASS_DRAGON_TAMER, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {FACILITY_CLASS_BIKER, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {FACILITY_CLASS_SWIMMING_TRIATHLETE_M, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {FACILITY_CLASS_CUE_BALL, TRAINER_ENCOUNTER_MUSIC_COOL}, + {FACILITY_CLASS_RS_BIRD_KEEPER, TRAINER_ENCOUNTER_MUSIC_COOL}, + {FACILITY_CLASS_SWIMMING_TRIATHLETE_F, TRAINER_ENCOUNTER_MUSIC_MALE}, + {FACILITY_CLASS_POKEMANIAC, TRAINER_ENCOUNTER_MUSIC_GIRL}, + {FACILITY_CLASS_RS_TWINS, TRAINER_ENCOUNTER_MUSIC_GIRL}, + {FACILITY_CLASS_LEADER_WATTSON, TRAINER_ENCOUNTER_MUSIC_MALE}, + {FACILITY_CLASS_BUG_CATCHER, TRAINER_ENCOUNTER_MUSIC_MALE}, + {FACILITY_CLASS_RS_PKMN_BREEDER_M, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {FACILITY_CLASS_LEADER_WALLACE, TRAINER_ENCOUNTER_MUSIC_AQUA}, + {FACILITY_CLASS_LEADER_NORMAN, TRAINER_ENCOUNTER_MUSIC_AQUA}, + {FACILITY_CLASS_OLD_COUPLE, TRAINER_ENCOUNTER_MUSIC_INTENSE}, + {FACILITY_CLASS_RS_PSYCHIC_M, TRAINER_ENCOUNTER_MUSIC_INTENSE}, + {FACILITY_CLASS_LEADER_ROXANNE, TRAINER_ENCOUNTER_MUSIC_TWINS}, + {FACILITY_CLASS_ELITE_FOUR_DRAKE, TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR}, + {FACILITY_CLASS_RS_GENTLEMAN, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {FACILITY_CLASS_RS_LASS, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {FACILITY_CLASS_BURGLAR, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {FACILITY_CLASS_PKMN_TRAINER_WALLY, TRAINER_ENCOUNTER_MUSIC_MALE}, + {FACILITY_CLASS_SCHOOL_KID_M, TRAINER_ENCOUNTER_MUSIC_MALE}, + {FACILITY_CLASS_LEADER_TATE_AND_LIZA, TRAINER_ENCOUNTER_MUSIC_INTENSE}, + {FACILITY_CLASS_POKEFAN_M, TRAINER_ENCOUNTER_MUSIC_MALE}, + {FACILITY_CLASS_MAGMA_ADMIN_M, TRAINER_ENCOUNTER_MUSIC_COOL}, + {FACILITY_CLASS_EXPERT_M, TRAINER_ENCOUNTER_MUSIC_COOL}, + {FACILITY_CLASS_MAGMA_GRUNT_M, TRAINER_ENCOUNTER_MUSIC_HIKER}, + {FACILITY_CLASS_SR_AND_JR, TRAINER_ENCOUNTER_MUSIC_HIKER}, + {FACILITY_CLASS_LASS, TRAINER_ENCOUNTER_MUSIC_MALE}, + {FACILITY_CLASS_SCHOOL_KID_F, TRAINER_ENCOUNTER_MUSIC_MALE}, + {FACILITY_CLASS_RS_COOLTRAINER_M, TRAINER_ENCOUNTER_MUSIC_MALE}, + {FACILITY_CLASS_FISHERMAN, TRAINER_ENCOUNTER_MUSIC_GIRL}, + {FACILITY_CLASS_RS_TUBER_M, TRAINER_ENCOUNTER_MUSIC_GIRL}, + {FACILITY_CLASS_HIKER, TRAINER_ENCOUNTER_MUSIC_SWIMMER}, + {FACILITY_CLASS_BOARDER_M, TRAINER_ENCOUNTER_MUSIC_SWIMMER}, + {FACILITY_CLASS_RS_PKMN_BREEDER_F, TRAINER_ENCOUNTER_MUSIC_HIKER}, + {FACILITY_CLASS_RS_PICNICKER, TRAINER_ENCOUNTER_MUSIC_HIKER}, + {FACILITY_CLASS_LEADER_WINONA, TRAINER_ENCOUNTER_MUSIC_MALE}, + {FACILITY_CLASS_ELITE_FOUR_SIDNEY, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {FACILITY_CLASS_AQUA_ADMIN_M, TRAINER_ENCOUNTER_MUSIC_HIKER}, + {FACILITY_CLASS_ELITE_FOUR_PHOEBE, TRAINER_ENCOUNTER_MUSIC_MALE} }; static const struct WindowTemplate sTimeBoardWindowTemplate[] = { diff --git a/src/trainer_tower_sets.c b/src/trainer_tower_sets.c index 119950d7f..65bab48bc 100644 --- a/src/trainer_tower_sets.c +++ b/src/trainer_tower_sets.c @@ -6,7 +6,7 @@ #include "constants/items.h" #include "constants/moves.h" #include "constants/trainer_tower.h" -#include "constants/facility_trainer_classes.h" +#include "constants/trainers.h" // Dummy strings must be declared explicitly for the sake of modern gcc #define DUMMY_TOWER_MON(iv) {.hpIV = iv, .attackIV = iv, .defenseIV = iv, .speedIV = iv, .spAttackIV = iv, .spDefenseIV = iv, .nickname = _("$$$$$$$$$$")} @@ -20,7 +20,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Single_4 = { .trainers = { { .name = _("COLE"), - .facilityClass = FACILITY_CLASS_YOUNGSTER_2, + .facilityClass = FACILITY_CLASS_YOUNGSTER, .textColor = 1, .speechBefore = {EC_WORD_AHAHA, EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_GOING, EC_WORD_ANYWHERE, EC_WORD_EXCL}, .speechWin = {EC_WORD_ALL_RIGHT, EC_WORD_EXCL, EC_WORD_BYE_BYE, EC_WORD_EXCL, 0xFFFF, 0xFFFF}, @@ -330,7 +330,7 @@ static const struct TrainerTowerFloor gUnknown_847B36C = { .trainers = { { .name = _("MILY"), - .facilityClass = FACILITY_CLASS_PSYCHIC_4, + .facilityClass = FACILITY_CLASS_PSYCHIC_F, .textColor = 1, .speechBefore = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_WORD_POKEMON, EC_MOVE2(SUPERPOWER), EC_WORD_EXCL}, .speechWin = {EC_WORD_ISN_T, EC_WORD_IT, EC_WORD_INCREDIBLE, EC_WORD_QUES, EC_WORD_POKEMON, EC_WORD_POWER}, @@ -782,7 +782,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Double_6 = { .trainers = { { .name = _("EMY & ALEK"), - .facilityClass = FACILITY_CLASS_YOUNG_COUPLE_2, + .facilityClass = FACILITY_CLASS_YOUNG_COUPLE, .textColor = 1, .speechBefore = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_LOST, EC_WORD_IN, EC_WORD_LOVEY_DOVEY, EC_WORD_HAPPINESS}, .speechWin = {EC_WORD_OH, EC_WORD_OH, EC_WORD_HE, EC_WORD_IS, EC_WORD_REALLY, EC_WORD_AWESOME}, @@ -925,7 +925,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Double_6 = { }, { .name = _("EMY & ALEK"), - .facilityClass = FACILITY_CLASS_YOUNG_COUPLE_2, + .facilityClass = FACILITY_CLASS_YOUNG_COUPLE, .textColor = 1, .speechBefore = {EC_WORD_I_AM, EC_WORD_GIDDY, EC_WORD_WITH, EC_WORD_LOVEY_DOVEY, EC_WORD_JOY, EC_WORD_EXCL_EXCL}, .speechWin = {EC_WORD_SIGH, EC_WORD_ELLIPSIS, EC_WORD_MY, EC_WORD_GIRL, EC_WORD_IS, EC_WORD_CUTE}, @@ -1815,7 +1815,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_2 = { .trainers = { { .name = _("MIKE"), - .facilityClass = FACILITY_CLASS_HIKER_2, + .facilityClass = FACILITY_CLASS_HIKER, .textColor = 5, .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_FULL, EC_WORD_OF, EC_WORD_POWER}, .speechWin = {EC_WORD_WHAT_S_UP_QUES, EC_WORD_WHERE, EC_WORD_IS, EC_WORD_YOUR, EC_WORD_POWER, EC_WORD_QUES}, @@ -2101,7 +2101,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_2 = { }, { .name = _("NICOLAS"), - .facilityClass = FACILITY_CLASS_BLACK_BELT_2, + .facilityClass = FACILITY_CLASS_BLACK_BELT, .textColor = 5, .speechBefore = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_WHERE, EC_WORD_YOU, EC_WORD_STOP, EC_WORD_EXCL}, .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_TO, EC_WORD_EVER, EC_WORD_BEAT, EC_WORD_ME}, @@ -2254,7 +2254,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Single_5 = { .trainers = { { .name = _("JOEY"), - .facilityClass = FACILITY_CLASS_CAMPER_2, + .facilityClass = FACILITY_CLASS_CAMPER, .textColor = 1, .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_SCARY, EC_WORD_STRONG, EC_WORD_EXCL}, .speechWin = {EC_WORD_WERE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_QUES}, @@ -2409,7 +2409,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Single_8 = { .trainers = { { .name = _("LILY"), - .facilityClass = FACILITY_CLASS_PKMN_BREEDER_3, + .facilityClass = FACILITY_CLASS_PKMN_BREEDER, .textColor = 1, .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_SOMETHING, EC_WORD_IN, EC_MOVE(RETURN), EC_WORD_EXCL}, .speechWin = {EC_WORD_I, EC_WORD_BELIEVE, EC_WORD_IN, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_EXCL}, @@ -2564,7 +2564,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Single_2 = { .trainers = { { .name = _("BRANDON"), - .facilityClass = FACILITY_CLASS_BUG_CATCHER_2, + .facilityClass = FACILITY_CLASS_BUG_CATCHER, .textColor = 1, .speechBefore = {EC_WORD_POISON, EC_WORD_IS, EC_WORD_JUST, EC_WORD_SO, EC_WORD_AWFUL, EC_WORD_ISN_T_IT_QUES}, .speechWin = {EC_WORD_SEE, EC_WORD_QUES, EC_WORD_ISN_T, EC_WORD_POISON, EC_WORD_TERRIBLE, EC_WORD_QUES}, @@ -3016,7 +3016,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Double_1 = { .trainers = { { .name = _("JEN & KIRA"), - .facilityClass = FACILITY_CLASS_TWINS_2, + .facilityClass = FACILITY_CLASS_TWINS, .textColor = 5, .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_TRY, EC_WORD_HARD, EC_WORD_EXCL}, .speechWin = {EC_WORD_EHEHE, EC_WORD_YAY, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, @@ -3159,7 +3159,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Double_1 = { }, { .name = _("JEN & KIRA"), - .facilityClass = FACILITY_CLASS_TWINS_2, + .facilityClass = FACILITY_CLASS_TWINS, .textColor = 3, .speechBefore = {EC_WORD_LET_S, EC_WORD_TRY, EC_WORD_HARD, EC_WORD_EXCL, 0xFFFF, 0xFFFF}, .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, @@ -3610,7 +3610,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_8 = { .trainers = { { .name = _("CHELSEA"), - .facilityClass = FACILITY_CLASS_PKMN_RANGER_4, + .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, .textColor = 7, .speechBefore = {EC_WORD_THE, EC_WORD_GREEN, EC_WORD_WORLD, EC_WORD_IS, EC_WORD_IMPORTANT, EC_WORD_ISN_T_IT_QUES}, .speechWin = {EC_WORD_YOU, EC_WORD_TAKE, EC_WORD_THE, EC_WORD_LOSS, 0xFFFF, 0xFFFF}, @@ -3753,7 +3753,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_8 = { }, { .name = _("TRENTON"), - .facilityClass = FACILITY_CLASS_PKMN_RANGER_3, + .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, .textColor = 7, .speechBefore = {EC_WORD_I, EC_MOVE2(PROTECT), EC_WORD_THE, EC_WORD_GREAT, EC_WORD_GREEN, EC_WORD_WORLD}, .speechWin = {EC_WORD_TAKE_THAT, EC_WORD_EXCL, EC_WORD_THE, EC_WORD_LOSS, EC_WORD_IS, EC_WORD_YOURS}, @@ -3896,7 +3896,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_8 = { }, { .name = _("ALBERT"), - .facilityClass = FACILITY_CLASS_COOLTRAINER_3, + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, .textColor = 7, .speechBefore = {EC_WORD_LET_S, EC_WORD_HAVE, EC_WORD_AN, EC_WORD_EXCITING, EC_WORD_TIME, EC_WORD_HERE}, .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_TO, EC_WORD_MAKE, EC_WORD_THINGS, EC_WORD_EXCITING}, @@ -4049,7 +4049,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_3 = { .trainers = { { .name = _("CAMRYN"), - .facilityClass = FACILITY_CLASS_PICNICKER_2, + .facilityClass = FACILITY_CLASS_PICNICKER, .textColor = 1, .speechBefore = {EC_WORD_LET_S, EC_WORD_BATTLE, EC_WORD_I, EC_WORD_WON_T, EC_WORD_LOSE, EC_WORD_EXCL}, .speechWin = {EC_WORD_I, EC_WORD_SAID, EC_WORD_THAT, EC_WORD_I, EC_WORD_WOULD, EC_WORD_WIN}, @@ -4192,7 +4192,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_3 = { }, { .name = _("NATALIA"), - .facilityClass = FACILITY_CLASS_AROMA_LADY_2, + .facilityClass = FACILITY_CLASS_AROMA_LADY, .textColor = 1, .speechBefore = {EC_WORD_THIS, EC_MOVE(SWEET_SCENT), EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_IT, EC_WORD_QUES}, .speechWin = {EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_NICE, EC_WORD_QUES, 0xFFFF, 0xFFFF}, @@ -4335,7 +4335,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_3 = { }, { .name = _("KATHLEEN"), - .facilityClass = FACILITY_CLASS_COOLTRAINER_4, + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, .textColor = 7, .speechBefore = {EC_WORD_TOO, EC_WORD_BAD, EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_FOR, EC_WORD_YOU}, .speechWin = {EC_WORD_SORRY, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, @@ -4488,7 +4488,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Single_6 = { .trainers = { { .name = _("BRADEN"), - .facilityClass = FACILITY_CLASS_SWIMMER_MALE_2, + .facilityClass = FACILITY_CLASS_SWIMMER_M, .textColor = 1, .speechBefore = {EC_WORD_I_AM, EC_WORD_PRETTY, EC_WORD_HAPPY, EC_WORD_WITH, EC_WORD_MY, EC_WORD_TOUGHNESS}, .speechWin = {EC_WORD_WROOOAAR_EXCL, 0xFFFF, EC_WORD_SERIOUSLY, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES}, @@ -4643,7 +4643,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Mixed_1 = { .trainers = { { .name = _("ALLYSON"), - .facilityClass = FACILITY_CLASS_COOLTRAINER_4, + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, .textColor = 7, .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_ABOUT, EC_WORD_TO, EC_WORD_LOSE, EC_WORD_TODAY}, .speechWin = {EC_WORD_YES, EC_WORD_EXCL_EXCL, EC_WORD_I, EC_WORD_ADORE, EC_WORD_MYSELF, EC_WORD_TODAY}, @@ -4798,7 +4798,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Single_1 = { .trainers = { { .name = _("ALBERTO"), - .facilityClass = FACILITY_CLASS_SAILOR_2, + .facilityClass = FACILITY_CLASS_SAILOR, .textColor = 5, .speechBefore = {EC_WORD_LET_S, EC_WORD_GET, EC_WORD_WITH, EC_WORD_IT, EC_WORD_RIGHT, EC_WORD_AWAY}, .speechWin = {EC_WORD_YO, EC_WORD_EXCL_EXCL, EC_WORD_YOU, EC_WORD_GIVE_UP, EC_WORD_NOW, EC_WORD_EH_QUES}, @@ -4953,7 +4953,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Mixed_5 = { .trainers = { { .name = _("KAT & KIPP"), - .facilityClass = FACILITY_CLASS_SIS_AND_BRO_2, + .facilityClass = FACILITY_CLASS_SIS_AND_BRO, .textColor = 4, .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_TRY, EC_WORD_MY, EC_WORD_BEST}, .speechWin = {EC_WORD_WAY, EC_WORD_TO, EC_WORD_GO, EC_WORD_MY, EC_WORD_AWESOME, EC_WORD_BROTHER}, @@ -5096,7 +5096,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Mixed_5 = { }, { .name = _("KAT & KIPP"), - .facilityClass = FACILITY_CLASS_SIS_AND_BRO_2, + .facilityClass = FACILITY_CLASS_SIS_AND_BRO, .textColor = 4, .speechBefore = {EC_WORD_FUFUFU, EC_WORD_ELLIPSIS, EC_WORD_WE, EC_WORD_NEVER, EC_WORD_LOSE, EC_WORD_EXCL}, .speechWin = {EC_WORD_FUFUFU, EC_WORD_ELLIPSIS, EC_WORD_WE_RE, EC_WORD_TOO_STRONG, EC_WORD_TO, EC_WORD_LOSE}, @@ -5547,7 +5547,7 @@ static const struct TrainerTowerFloor gUnknown_847FD0C = { .trainers = { { .name = _("LISA&LEAH"), - .facilityClass = FACILITY_CLASS_TWINS_2, + .facilityClass = FACILITY_CLASS_TWINS, .textColor = 1, .speechBefore = {EC_WORD_ABSOLUTELY, EC_WORD_WE_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_WIN, EC_WORD_EXCL}, .speechWin = {EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, @@ -5690,7 +5690,7 @@ static const struct TrainerTowerFloor gUnknown_847FD0C = { }, { .name = _("LISA&LEAH"), - .facilityClass = FACILITY_CLASS_TWINS_2, + .facilityClass = FACILITY_CLASS_TWINS, .textColor = 1, .speechBefore = {EC_WORD_CAN, EC_WORD_WE, EC_WORD_WIN, EC_WORD_QUES, EC_WORD_IT_S, EC_WORD_EXCITING}, .speechWin = {EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, EC_WORD_YOU, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_HAPPY}, @@ -5844,7 +5844,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_7 = { .trainers = { { .name = _("PRISCILLA"), - .facilityClass = FACILITY_CLASS_TUBER_3, + .facilityClass = FACILITY_CLASS_TUBER, .textColor = 1, .speechBefore = {EC_WORD_I_AM, EC_WORD_A_LITTLE, EC_WORD_POKEMON, EC_WORD_GIRL, EC_WORD_HERE_I_COME, EC_WORD_EXCL}, .speechWin = {EC_WORD_WAAAH, EC_WORD_EXCL, EC_WORD_DID, EC_WORD_I, EC_WORD_WIN, EC_WORD_QUES}, @@ -5987,7 +5987,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_7 = { }, { .name = _("CHARLOTTE"), - .facilityClass = FACILITY_CLASS_LADY_2, + .facilityClass = FACILITY_CLASS_LADY, .textColor = 1, .speechBefore = {EC_WORD_HELLO, EC_WORD_THERE, EC_WORD_I_AM, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_LADY}, .speechWin = {EC_WORD_OH, EC_WORD_MY, EC_WORD_MY, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_SORRY}, @@ -6130,7 +6130,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_7 = { }, { .name = _("SHANIA"), - .facilityClass = FACILITY_CLASS_SWIMMER_FEMALE_2, + .facilityClass = FACILITY_CLASS_SWIMMER_F, .textColor = 1, .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_HEROINE, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM}, .speechWin = {EC_WORD_AHAHA, EC_WORD_NO, EC_WORD_WAY, EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_SERIOUSLY}, @@ -6283,7 +6283,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_4 = { .trainers = { { .name = _("BRENNAN"), - .facilityClass = FACILITY_CLASS_SAILOR_2, + .facilityClass = FACILITY_CLASS_SAILOR, .textColor = 1, .speechBefore = {EC_WORD_TAKE, EC_WORD_THINGS, EC_WORD_EASY, EC_WORD_ELLIPSIS, EC_WORD_THAT_S, EC_WORD_IMPORTANT}, .speechWin = {EC_WORD_YOU, EC_WORD_LOSE, EC_WORD_IF, EC_WORD_YOU, EC_WORD_GIVE_UP, EC_WORD_EXCL}, @@ -6426,7 +6426,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_4 = { }, { .name = _("KADEN"), - .facilityClass = FACILITY_CLASS_FISHERMAN_2, + .facilityClass = FACILITY_CLASS_FISHERMAN, .textColor = 1, .speechBefore = {EC_WORD_MY, EC_WORD_FISHING, EC_WORD_FASHION, EC_WORD_APPEAL, EC_WORD_IS, EC_WORD_FANTASTIC}, .speechWin = {EC_WORD_MY, EC_WORD_FANTASTIC, EC_WORD_FASHION, EC_WORD_APPEAL, EC_WORD_WINS, EC_WORD_OUT}, @@ -6569,7 +6569,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_4 = { }, { .name = _("EMANUEL"), - .facilityClass = FACILITY_CLASS_GENTLEMAN_2, + .facilityClass = FACILITY_CLASS_GENTLEMAN, .textColor = 1, .speechBefore = {EC_WORD_HMM, EC_WORD_QUES, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_SKILLED, EC_WORD_QUES}, .speechWin = {EC_WORD_I, EC_WORD_SEE, EC_WORD_I, EC_WORD_WASN_T, EC_WORD_RIGHT, EC_WORD_ELLIPSIS}, @@ -7032,7 +7032,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Mixed_2 = { .trainers = { { .name = _("LORENZO"), - .facilityClass = FACILITY_CLASS_PSYCHIC_3, + .facilityClass = FACILITY_CLASS_PSYCHIC_M, .textColor = 1, .speechBefore = {EC_WORD_THIS, EC_WORD_POWER, EC_WORD_IS, EC_WORD_NOW, EC_WORD_COMPLETE, EC_WORD_EXCL}, .speechWin = {EC_WORD_NO, EC_WORD_KEEN_EYE, EC_WORD_CAN, EC_WORD_STOP, EC_WORD_MY, EC_WORD_POWER}, @@ -7484,7 +7484,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Double_7 = { .trainers = { { .name = _("AXE & REN"), - .facilityClass = FACILITY_CLASS_SIS_AND_BRO_2, + .facilityClass = FACILITY_CLASS_SIS_AND_BRO, .textColor = 2, .speechBefore = {EC_WORD_IT_S, EC_WORD_GOING, EC_WORD_TO, EC_WORD_GET, EC_WORD_AWFULLY, EC_WORD_COLD}, .speechWin = {EC_WORD_THAT_S, EC_WORD_THAT, EC_WORD_MAN, EC_WORD_I_AM, EC_WORD_COLD, EC_WORD_EXCL}, @@ -7627,7 +7627,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Double_7 = { }, { .name = _("AXE & REN"), - .facilityClass = FACILITY_CLASS_SIS_AND_BRO_2, + .facilityClass = FACILITY_CLASS_SIS_AND_BRO, .textColor = 2, .speechBefore = {EC_WORD_OUR, EC_WORD_SWIFT_SWIM, EC_WORD_LEFT, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_COLD}, .speechWin = {EC_WORD_I, EC_WORD_WON, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_HOT}, @@ -7781,7 +7781,7 @@ static const struct TrainerTowerFloor gUnknown_8481C0C = { .trainers = { { .name = _("KATI & GEB"), - .facilityClass = FACILITY_CLASS_YOUNG_COUPLE_2, + .facilityClass = FACILITY_CLASS_YOUNG_COUPLE, .textColor = 2, .speechBefore = {EC_WORD_WELCOME, EC_WORD_TO, EC_WORD_OUR, EC_WORD_LOVEY_DOVEY, EC_MOVE2(THUNDER_WAVE), EC_MOVE(SANDSTORM)}, .speechWin = {EC_WORD_LALALA, EC_WORD_LALALA, EC_WORD_OUR, EC_WORD_LOVEY_DOVEY, EC_WORD_LALALA, EC_WORD_LIFE}, @@ -7924,7 +7924,7 @@ static const struct TrainerTowerFloor gUnknown_8481C0C = { }, { .name = _("KATI & GEB"), - .facilityClass = FACILITY_CLASS_YOUNG_COUPLE_2, + .facilityClass = FACILITY_CLASS_YOUNG_COUPLE, .textColor = 2, .speechBefore = {EC_WORD_I_AM, EC_WORD_PLUS, EC_WORD_YOU_RE, EC_WORD_MINUS, EC_WORD_LOVEY_DOVEY, EC_WORD_MAGNET_PULL}, .speechWin = {EC_WORD_DON_T, EC_WORD_STOP, EC_WORD_OUR, EC_WORD_LOVEY_DOVEY, EC_WORD_LOCOMOTIVE, EC_WORD_EXCL}, @@ -8517,7 +8517,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_5 = { .trainers = { { .name = _("MAURA"), - .facilityClass = FACILITY_CLASS_BEAUTY_2, + .facilityClass = FACILITY_CLASS_BEAUTY, .textColor = 2, .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_GROUP, EC_WORD_LEADER, EC_WORD_EXCL, 0xFFFF}, .speechWin = {EC_WORD_WHAT, EC_WORD_AM, EC_WORD_I, EC_WORD_LEADER, EC_WORD_OF, EC_WORD_QUES}, @@ -8660,7 +8660,7 @@ static const struct TrainerTowerFloor sTrainerTowerFloor_Knockout_5 = { }, { .name = _("MIKAELA"), - .facilityClass = FACILITY_CLASS_LASS_2, + .facilityClass = FACILITY_CLASS_LASS, .textColor = 1, .speechBefore = {EC_WORD_I_AM, EC_WORD_REALLY, EC_WORD_THE, EC_WORD_NO_1, EC_WORD_TRAINER, EC_WORD_HERE}, .speechWin = {EC_WORD_NEVER, EC_WORD_SAID, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_AT}, |
