diff options
95 files changed, 2769 insertions, 2769 deletions
diff --git a/constants/version.inc b/constants/version.inc index 271b46dd3..09df3503c 100644 --- a/constants/version.inc +++ b/constants/version.inc @@ -31,61 +31,61 @@ .endif .ifdef SAPPHIRE - .set OPPONENT_PETALBURG_WOODS_GRUNT, OPPONENT_GRUNT_9 - .set OPPONENT_RUSTURF_TUNNEL_GRUNT, OPPONENT_GRUNT_15 - .set OPPONENT_MUSEUM_2F_GRUNT_1, OPPONENT_GRUNT_19 - .set OPPONENT_MUSEUM_2F_GRUNT_2, OPPONENT_GRUNT_20 - .set OPPONENT_514, OPPONENT_HECTOR_1 - .set OPPONENT_MT_CHIMNEY_GRUNT_1, OPPONENT_MATT_2 - .set OPPONENT_MT_CHIMNEY_GRUNT_2, OPPONENT_GRUNT_13 - .set OPPONENT_HIDEOUT_1F_GRUNT, OPPONENT_GRUNT_1 - .set OPPONENT_HIDEOUT_B1F_GRUNT_1, OPPONENT_GRUNT_2 - .set OPPONENT_HIDEOUT_B1F_GRUNT_2, OPPONENT_GRUNT_3 - .set OPPONENT_HIDEOUT_B1F_GRUNT_3, OPPONENT_GRUNT_26 - .set OPPONENT_HIDEOUT_B2F_GRUNT_1, OPPONENT_MATT_1 - .set OPPONENT_HIDEOUT_B2F_GRUNT_2, OPPONENT_GRUNT_4 - .set OPPONENT_HIDEOUT_B2F_GRUNT_3, OPPONENT_GRUNT_27 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_1, OPPONENT_GRUNT_5 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_2, OPPONENT_GRUNT_6 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_3, OPPONENT_SHELLY_2 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_4, OPPONENT_GRUNT_7 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, OPPONENT_ARCHIE_2 - .set OPPONENT_MT_CHIMNEY_GRUNT_3, OPPONENT_ARCHIE_3 - .set OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, OPPONENT_GRUNT_22 - .set OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, OPPONENT_GRUNT_23 - .set OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, OPPONENT_GRUNT_24 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_1, OPPONENT_GRUNT_16 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_2, OPPONENT_GRUNT_25 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_3, OPPONENT_GRUNT_17 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_4, OPPONENT_GRUNT_18 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_5, OPPONENT_SHELLY_1 + .set TRAINER_PETALBURG_WOODS_GRUNT, TRAINER_GRUNT_9 + .set TRAINER_RUSTURF_TUNNEL_GRUNT, TRAINER_GRUNT_15 + .set TRAINER_MUSEUM_2F_GRUNT_1, TRAINER_GRUNT_19 + .set TRAINER_MUSEUM_2F_GRUNT_2, TRAINER_GRUNT_20 + .set TRAINER_514, TRAINER_HECTOR_1 + .set TRAINER_MT_CHIMNEY_GRUNT_1, TRAINER_MATT_2 + .set TRAINER_MT_CHIMNEY_GRUNT_2, TRAINER_GRUNT_13 + .set TRAINER_HIDEOUT_1F_GRUNT, TRAINER_GRUNT_1 + .set TRAINER_HIDEOUT_B1F_GRUNT_1, TRAINER_GRUNT_2 + .set TRAINER_HIDEOUT_B1F_GRUNT_2, TRAINER_GRUNT_3 + .set TRAINER_HIDEOUT_B1F_GRUNT_3, TRAINER_GRUNT_26 + .set TRAINER_HIDEOUT_B2F_GRUNT_1, TRAINER_MATT_1 + .set TRAINER_HIDEOUT_B2F_GRUNT_2, TRAINER_GRUNT_4 + .set TRAINER_HIDEOUT_B2F_GRUNT_3, TRAINER_GRUNT_27 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_1, TRAINER_GRUNT_5 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_2, TRAINER_GRUNT_6 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_3, TRAINER_SHELLY_2 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_4, TRAINER_GRUNT_7 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_5, TRAINER_ARCHIE_2 + .set TRAINER_MT_CHIMNEY_GRUNT_3, TRAINER_ARCHIE_3 + .set TRAINER_MT_PYRE_SUMMIT_GRUNT_1, TRAINER_GRUNT_22 + .set TRAINER_MT_PYRE_SUMMIT_GRUNT_2, TRAINER_GRUNT_23 + .set TRAINER_MT_PYRE_SUMMIT_GRUNT_3, TRAINER_GRUNT_24 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_1, TRAINER_GRUNT_16 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_2, TRAINER_GRUNT_25 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_3, TRAINER_GRUNT_17 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_4, TRAINER_GRUNT_18 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_5, TRAINER_SHELLY_1 .else - .set OPPONENT_PETALBURG_WOODS_GRUNT, OPPONENT_GRUNT_36 - .set OPPONENT_RUSTURF_TUNNEL_GRUNT, OPPONENT_GRUNT_42 - .set OPPONENT_MUSEUM_2F_GRUNT_1, OPPONENT_GRUNT_46 - .set OPPONENT_MUSEUM_2F_GRUNT_2, OPPONENT_GRUNT_47 - .set OPPONENT_514, OPPONENT_HECTOR_2 - .set OPPONENT_MT_CHIMNEY_GRUNT_1, OPPONENT_TABITHA_2 - .set OPPONENT_MT_CHIMNEY_GRUNT_2, OPPONENT_GRUNT_40 - .set OPPONENT_HIDEOUT_1F_GRUNT, OPPONENT_GRUNT_28 - .set OPPONENT_HIDEOUT_B1F_GRUNT_1, OPPONENT_GRUNT_29 - .set OPPONENT_HIDEOUT_B1F_GRUNT_2, OPPONENT_GRUNT_30 - .set OPPONENT_HIDEOUT_B1F_GRUNT_3, OPPONENT_GRUNT_53 - .set OPPONENT_HIDEOUT_B2F_GRUNT_1, OPPONENT_TABITHA_1 - .set OPPONENT_HIDEOUT_B2F_GRUNT_2, OPPONENT_GRUNT_31 - .set OPPONENT_HIDEOUT_B2F_GRUNT_3, OPPONENT_GRUNT_54 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_1, OPPONENT_GRUNT_32 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_2, OPPONENT_GRUNT_33 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_3, OPPONENT_COURTNEY_2 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_4, OPPONENT_GRUNT_34 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, OPPONENT_MAXIE_2 - .set OPPONENT_MT_CHIMNEY_GRUNT_3, OPPONENT_MAXIE_3 - .set OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, OPPONENT_GRUNT_49 - .set OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, OPPONENT_GRUNT_50 - .set OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, OPPONENT_GRUNT_51 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_1, OPPONENT_GRUNT_43 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_2, OPPONENT_GRUNT_52 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_3, OPPONENT_GRUNT_44 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_4, OPPONENT_GRUNT_45 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_5, OPPONENT_COURTNEY_1 + .set TRAINER_PETALBURG_WOODS_GRUNT, TRAINER_GRUNT_36 + .set TRAINER_RUSTURF_TUNNEL_GRUNT, TRAINER_GRUNT_42 + .set TRAINER_MUSEUM_2F_GRUNT_1, TRAINER_GRUNT_46 + .set TRAINER_MUSEUM_2F_GRUNT_2, TRAINER_GRUNT_47 + .set TRAINER_514, TRAINER_HECTOR_2 + .set TRAINER_MT_CHIMNEY_GRUNT_1, TRAINER_TABITHA_2 + .set TRAINER_MT_CHIMNEY_GRUNT_2, TRAINER_GRUNT_40 + .set TRAINER_HIDEOUT_1F_GRUNT, TRAINER_GRUNT_28 + .set TRAINER_HIDEOUT_B1F_GRUNT_1, TRAINER_GRUNT_29 + .set TRAINER_HIDEOUT_B1F_GRUNT_2, TRAINER_GRUNT_30 + .set TRAINER_HIDEOUT_B1F_GRUNT_3, TRAINER_GRUNT_53 + .set TRAINER_HIDEOUT_B2F_GRUNT_1, TRAINER_TABITHA_1 + .set TRAINER_HIDEOUT_B2F_GRUNT_2, TRAINER_GRUNT_31 + .set TRAINER_HIDEOUT_B2F_GRUNT_3, TRAINER_GRUNT_54 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_1, TRAINER_GRUNT_32 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_2, TRAINER_GRUNT_33 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_3, TRAINER_COURTNEY_2 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_4, TRAINER_GRUNT_34 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_5, TRAINER_MAXIE_2 + .set TRAINER_MT_CHIMNEY_GRUNT_3, TRAINER_MAXIE_3 + .set TRAINER_MT_PYRE_SUMMIT_GRUNT_1, TRAINER_GRUNT_49 + .set TRAINER_MT_PYRE_SUMMIT_GRUNT_2, TRAINER_GRUNT_50 + .set TRAINER_MT_PYRE_SUMMIT_GRUNT_3, TRAINER_GRUNT_51 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_1, TRAINER_GRUNT_43 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_2, TRAINER_GRUNT_52 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_3, TRAINER_GRUNT_44 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_4, TRAINER_GRUNT_45 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_5, TRAINER_COURTNEY_1 .endif diff --git a/data/event_scripts.s b/data/event_scripts.s index 1f514321c..3ce319397 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1935,66 +1935,66 @@ SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0 end DewfordTown_Gym_EventScript_1A021E:: @ 81A021E - settrainerflag OPPONENT_JOSH - settrainerflag OPPONENT_TOMMY + settrainerflag TRAINER_JOSH + settrainerflag TRAINER_TOMMY return DewfordTown_Gym_EventScript_1A0225:: @ 81A0225 - settrainerflag OPPONENT_HIDEKI - settrainerflag OPPONENT_TESSA - settrainerflag OPPONENT_LAURA + settrainerflag TRAINER_HIDEKI + settrainerflag TRAINER_TESSA + settrainerflag TRAINER_LAURA return DewfordTown_Gym_EventScript_1A022F:: @ 81A022F - settrainerflag OPPONENT_KIRK - settrainerflag OPPONENT_SHAWN - settrainerflag OPPONENT_BEN - settrainerflag OPPONENT_VIVIAN + settrainerflag TRAINER_KIRK + settrainerflag TRAINER_SHAWN + settrainerflag TRAINER_BEN + settrainerflag TRAINER_VIVIAN return DewfordTown_Gym_EventScript_1A023C:: @ 81A023C - settrainerflag OPPONENT_COLE - settrainerflag OPPONENT_AXLE - settrainerflag OPPONENT_ANDY - settrainerflag OPPONENT_ZANE - settrainerflag OPPONENT_SADIE + settrainerflag TRAINER_COLE + settrainerflag TRAINER_AXLE + settrainerflag TRAINER_ANDY + settrainerflag TRAINER_ZANE + settrainerflag TRAINER_SADIE return DewfordTown_Gym_EventScript_1A024C:: @ 81A024C - settrainerflag OPPONENT_RANDALL - settrainerflag OPPONENT_PARKER - settrainerflag OPPONENT_GEORGE - settrainerflag OPPONENT_BERKE - settrainerflag OPPONENT_MARY - settrainerflag OPPONENT_LORI - settrainerflag OPPONENT_JODY + settrainerflag TRAINER_RANDALL + settrainerflag TRAINER_PARKER + settrainerflag TRAINER_GEORGE + settrainerflag TRAINER_BERKE + settrainerflag TRAINER_MARY + settrainerflag TRAINER_LORI + settrainerflag TRAINER_JODY return DewfordTown_Gym_EventScript_1A0262:: @ 81A0262 - settrainerflag OPPONENT_JARED - settrainerflag OPPONENT_TERRELL - settrainerflag OPPONENT_KYLEE - settrainerflag OPPONENT_WILL + settrainerflag TRAINER_JARED + settrainerflag TRAINER_TERRELL + settrainerflag TRAINER_KYLEE + settrainerflag TRAINER_WILL return DewfordTown_Gym_EventScript_1A026F:: @ 81A026F - settrainerflag OPPONENT_PRESTON - settrainerflag OPPONENT_VIRGIL - settrainerflag OPPONENT_FRITZ - settrainerflag OPPONENT_HANNAH - settrainerflag OPPONENT_SAMANTHA - settrainerflag OPPONENT_MAURA + settrainerflag TRAINER_PRESTON + settrainerflag TRAINER_VIRGIL + settrainerflag TRAINER_FRITZ + settrainerflag TRAINER_HANNAH + settrainerflag TRAINER_SAMANTHA + settrainerflag TRAINER_MAURA return DewfordTown_Gym_EventScript_1A0282:: @ 81A0282 - settrainerflag OPPONENT_ANDREA - settrainerflag OPPONENT_CRISSY - settrainerflag OPPONENT_BRIANNA_2 - settrainerflag OPPONENT_CONNIE - settrainerflag OPPONENT_BRIDGET - settrainerflag OPPONENT_OLIVIA - settrainerflag OPPONENT_TIFFANY - settrainerflag OPPONENT_MARISSA + settrainerflag TRAINER_ANDREA + settrainerflag TRAINER_CRISSY + settrainerflag TRAINER_BRIANNA_2 + settrainerflag TRAINER_CONNIE + settrainerflag TRAINER_BRIDGET + settrainerflag TRAINER_OLIVIA + settrainerflag TRAINER_TIFFANY + settrainerflag TRAINER_MARISSA return DewfordTown_Gym_EventScript_1A029B:: @ 81A029B diff --git a/data/maps/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc index 0c7278f3b..f2636fd31 100644 --- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc @@ -6,6 +6,6 @@ AbandonedShip_Corridors_1F_EventScript_15E965:: @ 815E965 end AbandonedShip_Corridors_1F_EventScript_15E96E:: @ 815E96E - trainerbattle 0, OPPONENT_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_19843D, AbandonedShip_Corridors_1F_Text_198479 + trainerbattle 0, TRAINER_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_19843D, AbandonedShip_Corridors_1F_Text_198479 msgbox AbandonedShip_Corridors_1F_Text_198493, 6 end diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index c34f2c28b..f1b7240db 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -50,6 +50,6 @@ AbandonedShip_Corridors_B1F_EventScript_15EA14:: @ 815EA14 end AbandonedShip_Corridors_B1F_EventScript_15EA1E:: @ 815EA1E - trainerbattle 0, OPPONENT_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_19856F, AbandonedShip_Corridors_B1F_Text_1985C5 + trainerbattle 0, TRAINER_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_19856F, AbandonedShip_Corridors_B1F_Text_1985C5 msgbox AbandonedShip_Corridors_B1F_Text_1985D7, 6 end diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc index e1e903cc0..cd7c8fd9f 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -2,7 +2,7 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67 .byte 0 AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 - trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F + trainerbattle 4, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93 @@ -10,12 +10,12 @@ AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 end AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93 - trainerbattle 7, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1989DF, AbandonedShip_Rooms2_1F_Text_198A53, AbandonedShip_Rooms2_1F_Text_198AEE + trainerbattle 7, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1989DF, AbandonedShip_Rooms2_1F_Text_198A53, AbandonedShip_Rooms2_1F_Text_198AEE msgbox AbandonedShip_Rooms2_1F_Text_198A70, 6 end AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE - trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A + trainerbattle 4, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 @@ -23,6 +23,6 @@ AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE end AbandonedShip_Rooms2_1F_EventScript_15EAD9:: @ 815EAD9 - trainerbattle 7, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_198B3B, AbandonedShip_Rooms2_1F_Text_198BCF, AbandonedShip_Rooms2_1F_Text_198C40 + trainerbattle 7, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_198B3B, AbandonedShip_Rooms2_1F_Text_198BCF, AbandonedShip_Rooms2_1F_Text_198C40 msgbox AbandonedShip_Rooms2_1F_Text_198BEA, 6 end diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc index ee49ba695..e92e83cc8 100644 --- a/data/maps/AquaHideout_1F/scripts.inc +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -36,7 +36,7 @@ AquaHideout_1F_EventScript_15D802:: @ 815D802 AquaHideout_1F_EventScript_15D80C:: @ 815D80C MagmaHideout_1F_EventScript_15D80C:: @ 815D80C - trainerbattle 2, OPPONENT_HIDEOUT_1F_GRUNT, 0, AquaHideout_1F_Text_196E01, AquaHideout_1F_Text_196E28, AquaHideout_1F_EventScript_15D827 + trainerbattle 2, TRAINER_HIDEOUT_1F_GRUNT, 0, AquaHideout_1F_Text_196E01, AquaHideout_1F_Text_196E28, AquaHideout_1F_EventScript_15D827 msgbox AquaHideout_1F_Text_196E3D, 6 end diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 3be8d487d..3b4c04273 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -17,7 +17,7 @@ AquaHideout_B1F_MapScript1_15D84A:: @ 815D84A AquaHideout_B1F_EventScript_15D850:: @ 815D850 MagmaHideout_B1F_EventScript_15D850:: @ 815D850 - trainerbattle 2, OPPONENT_HIDEOUT_B1F_GRUNT_1, 0, AquaHideout_B1F_Text_196E6F, AquaHideout_B1F_Text_196EB6, AquaHideout_B1F_EventScript_15D86B + trainerbattle 2, TRAINER_HIDEOUT_B1F_GRUNT_1, 0, AquaHideout_B1F_Text_196E6F, AquaHideout_B1F_Text_196EB6, AquaHideout_B1F_EventScript_15D86B msgbox AquaHideout_B1F_Text_196ECC, 6 end @@ -28,7 +28,7 @@ AquaHideout_B1F_EventScript_15D86B:: @ 815D86B AquaHideout_B1F_EventScript_15D875:: @ 815D875 MagmaHideout_B1F_EventScript_15D875:: @ 815D875 - trainerbattle 2, OPPONENT_HIDEOUT_B1F_GRUNT_2, 0, AquaHideout_B1F_Text_196F39, AquaHideout_B1F_Text_196F9B, AquaHideout_B1F_EventScript_15D890 + trainerbattle 2, TRAINER_HIDEOUT_B1F_GRUNT_2, 0, AquaHideout_B1F_Text_196F39, AquaHideout_B1F_Text_196F9B, AquaHideout_B1F_EventScript_15D890 msgbox AquaHideout_B1F_Text_196FB5, 6 end @@ -39,6 +39,6 @@ AquaHideout_B1F_EventScript_15D890:: @ 815D890 AquaHideout_B1F_EventScript_15D89A:: @ 815D89A MagmaHideout_B1F_EventScript_15D89A:: @ 815D89A - trainerbattle 0, OPPONENT_HIDEOUT_B1F_GRUNT_3, 0, AquaHideout_B1F_Text_196FFD, AquaHideout_B1F_Text_197040 + trainerbattle 0, TRAINER_HIDEOUT_B1F_GRUNT_3, 0, AquaHideout_B1F_Text_196FFD, AquaHideout_B1F_Text_197040 msgbox AquaHideout_B1F_Text_197056, 6 end diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 37830a00e..103de2313 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -25,7 +25,7 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD AquaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 - trainerbattle 2, OPPONENT_HIDEOUT_B2F_GRUNT_1, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD + trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_1, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD msgbox AquaHideout_B2F_Text_1971AE, 4 release end @@ -85,7 +85,7 @@ AquaHideout_B2F_Movement_15D95D:: @ 815D95D AquaHideout_B2F_EventScript_15D962:: @ 815D962 MagmaHideout_B2F_EventScript_15D962:: @ 815D962 - trainerbattle 2, OPPONENT_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D + trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D msgbox AquaHideout_B2F_Text_1972D2, 6 end @@ -96,6 +96,6 @@ AquaHideout_B2F_EventScript_15D97D:: @ 815D97D AquaHideout_B2F_EventScript_15D987:: @ 815D987 MagmaHideout_B2F_EventScript_15D987:: @ 815D987 - trainerbattle 0, OPPONENT_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390 + trainerbattle 0, TRAINER_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390 msgbox AquaHideout_B2F_Text_1973C0, 6 end diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 596f2c77f..3e57e0fec 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -7,7 +7,7 @@ DewfordTown_Gym_MapScript1_15306B:: @ 815306B end DewfordTown_Gym_EventScript_153071:: @ 8153071 - goto_if_trainer_defeated OPPONENT_BRAWLY, DewfordTown_Gym_EventScript_1530AA + goto_if_trainer_defeated TRAINER_BRAWLY, DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 copyvar VAR_SPECIAL_1, VAR_SPECIAL_0 compare VAR_SPECIAL_0, 0 @@ -80,22 +80,22 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 DewfordTown_Gym_EventScript_153122:: @ 8153122 setvar VAR_SPECIAL_0, 0 - goto_if_trainer_not_defeated OPPONENT_HIDEKI, DewfordTown_Gym_EventScript_153135 + goto_if_trainer_not_defeated TRAINER_HIDEKI, DewfordTown_Gym_EventScript_153135 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 - goto_if_trainer_not_defeated OPPONENT_TESSA, DewfordTown_Gym_EventScript_153143 + goto_if_trainer_not_defeated TRAINER_TESSA, DewfordTown_Gym_EventScript_153143 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 - goto_if_trainer_not_defeated OPPONENT_LAURA, DewfordTown_Gym_EventScript_153151 + goto_if_trainer_not_defeated TRAINER_LAURA, DewfordTown_Gym_EventScript_153151 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 return DewfordTown_Gym_EventScript_153152:: @ 8153152 - trainerbattle 1, OPPONENT_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 + trainerbattle 1, TRAINER_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_1531B5 msgbox DewfordTown_Gym_Text_175412, 4 release @@ -127,7 +127,7 @@ DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 end DewfordTown_Gym_EventScript_1531D9:: @ 81531D9 - trainerbattle 2, OPPONENT_HIDEKI, 0, DewfordTown_Gym_Text_174F61, DewfordTown_Gym_Text_174F7A, DewfordTown_Gym_EventScript_1531F4 + trainerbattle 2, TRAINER_HIDEKI, 0, DewfordTown_Gym_Text_174F61, DewfordTown_Gym_Text_174F7A, DewfordTown_Gym_EventScript_1531F4 msgbox DewfordTown_Gym_Text_174F8E, 6 end @@ -137,7 +137,7 @@ DewfordTown_Gym_EventScript_1531F4:: @ 81531F4 end DewfordTown_Gym_EventScript_1531FB:: @ 81531FB - trainerbattle 2, OPPONENT_TESSA, 0, DewfordTown_Gym_Text_174FCE, DewfordTown_Gym_Text_175009, DewfordTown_Gym_EventScript_153216 + trainerbattle 2, TRAINER_TESSA, 0, DewfordTown_Gym_Text_174FCE, DewfordTown_Gym_Text_175009, DewfordTown_Gym_EventScript_153216 msgbox DewfordTown_Gym_Text_175031, 6 end @@ -147,7 +147,7 @@ DewfordTown_Gym_EventScript_153216:: @ 8153216 end DewfordTown_Gym_EventScript_15321D:: @ 815321D - trainerbattle 2, OPPONENT_LAURA, 0, DewfordTown_Gym_Text_1750C9, DewfordTown_Gym_Text_175104, DewfordTown_Gym_EventScript_153238 + trainerbattle 2, TRAINER_LAURA, 0, DewfordTown_Gym_Text_1750C9, DewfordTown_Gym_Text_175104, DewfordTown_Gym_EventScript_153238 msgbox DewfordTown_Gym_Text_175117, 6 end diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 7e1f6e6cb..01b2cc970 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -40,7 +40,7 @@ EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 playbgm MUS_DAIGO, FALSE msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4 - trainerbattle 3, OPPONENT_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 + trainerbattle 3, TRAINER_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 goto EverGrandeCity_ChampionsRoom_EventScript_15B821 end diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 4dad28923..f00a809bd 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -43,7 +43,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 - trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 + trainerbattle 3, TRAINER_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 goto EverGrandeCity_DrakesRoom_EventScript_15B795 end diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 17555f2f6..ede08e504 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -43,7 +43,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1 playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 - trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 + trainerbattle 3, TRAINER_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB end diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 5575b99b3..db30bcfa7 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -43,7 +43,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657 playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 - trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C + trainerbattle 3, TRAINER_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C goto EverGrandeCity_PhoebesRoom_EventScript_15B661 end diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 2b6cc0571..b2b731004 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -44,7 +44,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 - trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 + trainerbattle 3, TRAINER_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 goto EverGrandeCity_SidneysRoom_EventScript_15B5C7 end diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index c0de6bfee..3a814a4b7 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -16,7 +16,7 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC end FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 - trainerbattle 1, OPPONENT_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 + trainerbattle 1, TRAINER_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_157F3E msgbox FortreeCity_Gym_Text_185F98, 4 release @@ -44,22 +44,22 @@ FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E end FortreeCity_Gym_EventScript_157F62:: @ 8157F62 - trainerbattle 0, OPPONENT_JARED, 0, FortreeCity_Gym_Text_1859B9, FortreeCity_Gym_Text_1859EA + trainerbattle 0, TRAINER_JARED, 0, FortreeCity_Gym_Text_1859B9, FortreeCity_Gym_Text_1859EA msgbox FortreeCity_Gym_Text_185A02, 6 end FortreeCity_Gym_EventScript_157F79:: @ 8157F79 - trainerbattle 0, OPPONENT_WILL, 0, FortreeCity_Gym_Text_185A7F, FortreeCity_Gym_Text_185AEC + trainerbattle 0, TRAINER_WILL, 0, FortreeCity_Gym_Text_185A7F, FortreeCity_Gym_Text_185AEC msgbox FortreeCity_Gym_Text_185B18, 6 end FortreeCity_Gym_EventScript_157F90:: @ 8157F90 - trainerbattle 0, OPPONENT_TERRELL, 0, FortreeCity_Gym_Text_185B8D, FortreeCity_Gym_Text_185BEB + trainerbattle 0, TRAINER_TERRELL, 0, FortreeCity_Gym_Text_185B8D, FortreeCity_Gym_Text_185BEB msgbox FortreeCity_Gym_Text_185C00, 6 end FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7 - trainerbattle 0, OPPONENT_KYLEE, 0, FortreeCity_Gym_Text_185C45, FortreeCity_Gym_Text_185C7C + trainerbattle 0, TRAINER_KYLEE, 0, FortreeCity_Gym_Text_185C45, FortreeCity_Gym_Text_185C7C msgbox FortreeCity_Gym_Text_185C8C, 6 end diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index d75420e88..96ad4a0aa 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -18,12 +18,12 @@ JaggedPass_EventScript_15D280:: @ 815D280 return JaggedPass_EventScript_15D285:: @ 815D285 - trainerbattle 0, OPPONENT_ERIC, 0, JaggedPass_Text_195DAC, JaggedPass_Text_195E27 + trainerbattle 0, TRAINER_ERIC, 0, JaggedPass_Text_195DAC, JaggedPass_Text_195E27 msgbox JaggedPass_Text_195E3E, 6 end JaggedPass_EventScript_15D29C:: @ 815D29C - trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF + trainerbattle 0, TRAINER_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D2C3 @@ -31,12 +31,12 @@ JaggedPass_EventScript_15D29C:: @ 815D29C end JaggedPass_EventScript_15D2C3:: @ 815D2C3 - trainerbattle 5, OPPONENT_DIANA_1, 0, JaggedPass_Text_195F58, JaggedPass_Text_195F8C + trainerbattle 5, TRAINER_DIANA_1, 0, JaggedPass_Text_195F58, JaggedPass_Text_195F8C msgbox JaggedPass_Text_195FB9, 6 end JaggedPass_EventScript_15D2DA:: @ 815D2DA - trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 + trainerbattle 0, TRAINER_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D301 @@ -44,6 +44,6 @@ JaggedPass_EventScript_15D2DA:: @ 815D2DA end JaggedPass_EventScript_15D301:: @ 815D301 - trainerbattle 5, OPPONENT_ETHAN_1, 0, JaggedPass_Text_1960AA, JaggedPass_Text_1960E2 + trainerbattle 5, TRAINER_ETHAN_1, 0, JaggedPass_Text_1960AA, JaggedPass_Text_1960E2 msgbox JaggedPass_Text_196118, 6 end diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 27655127a..3f5f9a285 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -13,53 +13,53 @@ LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F setvar VAR_TEMP_D, 0 setvar VAR_TEMP_E, 0 setvar VAR_TEMP_F, 0 - goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_1536C6 + goto_if_trainer_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_1536C6 setvar VAR_TEMP_B, 1 LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6 - goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_1536D4 + goto_if_trainer_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_1536D4 setvar VAR_TEMP_C, 1 LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4 - goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_1536E2 + goto_if_trainer_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_1536E2 setvar VAR_TEMP_D, 1 LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2 - goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_1536F0 + goto_if_trainer_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_1536F0 setvar VAR_TEMP_E, 1 LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0 - goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_1536FE + goto_if_trainer_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_1536FE setvar VAR_TEMP_F, 1 LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE return LavaridgeTown_Gym_1F_EventScript_1536FF:: @ 81536FF - goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_15370C + goto_if_trainer_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_15370C setobjectmovementtype 2, 63 LavaridgeTown_Gym_1F_EventScript_15370C:: @ 815370C - goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_153719 + goto_if_trainer_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_153719 setobjectmovementtype 3, 63 LavaridgeTown_Gym_1F_EventScript_153719:: @ 8153719 - goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_153726 + goto_if_trainer_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_153726 setobjectmovementtype 4, 63 LavaridgeTown_Gym_1F_EventScript_153726:: @ 8153726 - goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_153733 + goto_if_trainer_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_153733 setobjectmovementtype 5, 63 LavaridgeTown_Gym_1F_EventScript_153733:: @ 8153733 - goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_153740 + goto_if_trainer_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_153740 setobjectmovementtype 7, 63 LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 return LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 - trainerbattle 1, OPPONENT_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 + trainerbattle 1, TRAINER_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_1537A7 msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4 release @@ -92,7 +92,7 @@ LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 end LavaridgeTown_Gym_1F_EventScript_1537CB:: @ 81537CB - trainerbattle 2, OPPONENT_COLE, 2, LavaridgeTown_Gym_1F_Text_176432, LavaridgeTown_Gym_1F_Text_17644F, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_176432, LavaridgeTown_Gym_1F_Text_17644F, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_176472, 6 end @@ -102,22 +102,22 @@ LavaridgeTown_Gym_1F_EventScript_1537E6:: @ 81537E6 end LavaridgeTown_Gym_1F_EventScript_1537ED:: @ 81537ED - trainerbattle 2, OPPONENT_AXLE, 4, LavaridgeTown_Gym_1F_Text_1764D1, LavaridgeTown_Gym_1F_Text_176516, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1764D1, LavaridgeTown_Gym_1F_Text_176516, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_176537, 6 end LavaridgeTown_Gym_1F_EventScript_153808:: @ 8153808 - trainerbattle 2, OPPONENT_ANDY, 7, LavaridgeTown_Gym_1F_Text_17658D, LavaridgeTown_Gym_1F_Text_17663F, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_ANDY, 7, LavaridgeTown_Gym_1F_Text_17658D, LavaridgeTown_Gym_1F_Text_17663F, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_176660, 6 end LavaridgeTown_Gym_1F_EventScript_153823:: @ 8153823 - trainerbattle 2, OPPONENT_SADIE, 5, LavaridgeTown_Gym_1F_Text_176784, LavaridgeTown_Gym_1F_Text_1767A6, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_SADIE, 5, LavaridgeTown_Gym_1F_Text_176784, LavaridgeTown_Gym_1F_Text_1767A6, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_1767C1, 6 end LavaridgeTown_Gym_1F_EventScript_15383E:: @ 815383E - trainerbattle 2, OPPONENT_ZANE, 3, LavaridgeTown_Gym_1F_Text_1766D2, LavaridgeTown_Gym_1F_Text_1766FE, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_ZANE, 3, LavaridgeTown_Gym_1F_Text_1766D2, LavaridgeTown_Gym_1F_Text_1766FE, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_17671D, 6 end diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 081914bda..e32582b24 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -303,32 +303,32 @@ LilycoveCity_EventScript_14CE35:: @ 814CE35 end LilycoveCity_EventScript_14CE46:: @ 814CE46 - trainerbattle 3, OPPONENT_MAY_11, 0, LilycoveCity_Text_167BD5 + trainerbattle 3, TRAINER_MAY_11, 0, LilycoveCity_Text_167BD5 goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE56:: @ 814CE56 - trainerbattle 3, OPPONENT_MAY_12, 0, LilycoveCity_Text_167BD5 + trainerbattle 3, TRAINER_MAY_12, 0, LilycoveCity_Text_167BD5 goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE66:: @ 814CE66 - trainerbattle 3, OPPONENT_MAY_10, 0, LilycoveCity_Text_167BD5 + trainerbattle 3, TRAINER_MAY_10, 0, LilycoveCity_Text_167BD5 goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE76:: @ 814CE76 - trainerbattle 3, OPPONENT_BRENDAN_11, 0, LilycoveCity_Text_1680E4 + trainerbattle 3, TRAINER_BRENDAN_11, 0, LilycoveCity_Text_1680E4 goto LilycoveCity_EventScript_14CF12 end LilycoveCity_EventScript_14CE86:: @ 814CE86 - trainerbattle 3, OPPONENT_BRENDAN_12, 0, LilycoveCity_Text_1680E4 + trainerbattle 3, TRAINER_BRENDAN_12, 0, LilycoveCity_Text_1680E4 goto LilycoveCity_EventScript_14CF12 end LilycoveCity_EventScript_14CE96:: @ 814CE96 - trainerbattle 3, OPPONENT_BRENDAN_10, 0, LilycoveCity_Text_1680E4 + trainerbattle 3, TRAINER_BRENDAN_10, 0, LilycoveCity_Text_1680E4 goto LilycoveCity_EventScript_14CF12 end diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index bd4f8ab3d..f5eb064e5 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -160,7 +160,7 @@ MauvilleCity_EventScript_14C22B:: @ 814C22B MauvilleCity_EventScript_14C23C:: @ 814C23C msgbox MauvilleCity_Text_165F0D, 4 - trainerbattle 3, OPPONENT_WALLY_2, 0, MauvilleCity_Text_165F38 + trainerbattle 3, TRAINER_WALLY_2, 0, MauvilleCity_Text_165F38 applymovement 6, MauvilleCity_Movement_1A0843 waitmovement 0 msgbox MauvilleCity_Text_165F85, 4 diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index d9b8aced7..ae10eadfd 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -66,7 +66,7 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 end MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB - trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB + trainerbattle 1, TRAINER_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_15661D compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 @@ -161,22 +161,22 @@ MauvilleCity_Gym_EventScript_1566E1:: @ 81566E1 end MauvilleCity_Gym_EventScript_1566E6:: @ 81566E6 - trainerbattle 0, OPPONENT_KIRK, 0, MauvilleCity_Gym_Text_180956, MauvilleCity_Gym_Text_180997 + trainerbattle 0, TRAINER_KIRK, 0, MauvilleCity_Gym_Text_180956, MauvilleCity_Gym_Text_180997 msgbox MauvilleCity_Gym_Text_1809D1, 6 end MauvilleCity_Gym_EventScript_1566FD:: @ 81566FD - trainerbattle 0, OPPONENT_SHAWN, 0, MauvilleCity_Gym_Text_180A05, MauvilleCity_Gym_Text_180A42 + trainerbattle 0, TRAINER_SHAWN, 0, MauvilleCity_Gym_Text_180A05, MauvilleCity_Gym_Text_180A42 msgbox MauvilleCity_Gym_Text_180A5E, 6 end MauvilleCity_Gym_EventScript_156714:: @ 8156714 - trainerbattle 0, OPPONENT_BEN, 0, MauvilleCity_Gym_Text_180AE0, MauvilleCity_Gym_Text_180B06 + trainerbattle 0, TRAINER_BEN, 0, MauvilleCity_Gym_Text_180AE0, MauvilleCity_Gym_Text_180B06 msgbox MauvilleCity_Gym_Text_180B1D, 6 end MauvilleCity_Gym_EventScript_15672B:: @ 815672B - trainerbattle 0, OPPONENT_VIVIAN, 0, MauvilleCity_Gym_Text_180B5A, MauvilleCity_Gym_Text_180B93 + trainerbattle 0, TRAINER_VIVIAN, 0, MauvilleCity_Gym_Text_180B5A, MauvilleCity_Gym_Text_180B93 msgbox MauvilleCity_Gym_Text_180BAE, 6 end diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index 49d629294..92b9f4661 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -2,7 +2,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 815C678 .byte 0 MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 - trainerbattle 0, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 + trainerbattle 0, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6A0 @@ -10,12 +10,12 @@ MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 end MeteorFalls_1F_2R_EventScript_15C6A0:: @ 815C6A0 - trainerbattle 5, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_193AB3, MeteorFalls_1F_2R_Text_193B21 + trainerbattle 5, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_193AB3, MeteorFalls_1F_2R_Text_193B21 msgbox MeteorFalls_1F_2R_Text_193B4C, 6 end MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 - trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F + trainerbattle 4, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6E2 @@ -23,12 +23,12 @@ MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 end MeteorFalls_1F_2R_EventScript_15C6E2:: @ 815C6E2 - trainerbattle 7, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193E75, MeteorFalls_1F_2R_Text_193ECE, MeteorFalls_1F_2R_Text_193F59 + trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193E75, MeteorFalls_1F_2R_Text_193ECE, MeteorFalls_1F_2R_Text_193F59 msgbox MeteorFalls_1F_2R_Text_193EF3, 6 end MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD - trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB + trainerbattle 4, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 @@ -36,6 +36,6 @@ MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD end MeteorFalls_1F_2R_EventScript_15C728:: @ 815C728 - trainerbattle 7, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193FCA, MeteorFalls_1F_2R_Text_19403A, MeteorFalls_1F_2R_Text_1940DF + trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193FCA, MeteorFalls_1F_2R_Text_19403A, MeteorFalls_1F_2R_Text_1940DF msgbox MeteorFalls_1F_2R_Text_194066, 6 end diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index a17d09e10..0fa79a6ec 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -45,7 +45,7 @@ MossdeepCity_Gym_EventScript_15A558:: @ 815A558 end MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B - trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 + trainerbattle 8, TRAINER_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_15A5C6 msgbox MossdeepCity_Gym_Text_18D273, 4 release @@ -169,32 +169,32 @@ MossdeepCity_Gym_EventScript_15A742:: @ 815A742 end MossdeepCity_Gym_EventScript_15A74E:: @ 815A74E - trainerbattle 0, OPPONENT_PRESTON, 0, MossdeepCity_Gym_Text_18C96A, MossdeepCity_Gym_Text_18C9BA + trainerbattle 0, TRAINER_PRESTON, 0, MossdeepCity_Gym_Text_18C96A, MossdeepCity_Gym_Text_18C9BA msgbox MossdeepCity_Gym_Text_18C9E1, 6 end MossdeepCity_Gym_EventScript_15A765:: @ 815A765 - trainerbattle 0, OPPONENT_VIRGIL, 0, MossdeepCity_Gym_Text_18CA10, MossdeepCity_Gym_Text_18CA28 + trainerbattle 0, TRAINER_VIRGIL, 0, MossdeepCity_Gym_Text_18CA10, MossdeepCity_Gym_Text_18CA28 msgbox MossdeepCity_Gym_Text_18CA48, 6 end MossdeepCity_Gym_EventScript_15A77C:: @ 815A77C - trainerbattle 0, OPPONENT_FRITZ, 0, MossdeepCity_Gym_Text_18CAC0, MossdeepCity_Gym_Text_18CB46 + trainerbattle 0, TRAINER_FRITZ, 0, MossdeepCity_Gym_Text_18CAC0, MossdeepCity_Gym_Text_18CB46 msgbox MossdeepCity_Gym_Text_18CB77, 6 end MossdeepCity_Gym_EventScript_15A793:: @ 815A793 - trainerbattle 0, OPPONENT_HANNAH, 0, MossdeepCity_Gym_Text_18CC1E, MossdeepCity_Gym_Text_18CC83 + trainerbattle 0, TRAINER_HANNAH, 0, MossdeepCity_Gym_Text_18CC1E, MossdeepCity_Gym_Text_18CC83 msgbox MossdeepCity_Gym_Text_18CC9B, 6 end MossdeepCity_Gym_EventScript_15A7AA:: @ 815A7AA - trainerbattle 0, OPPONENT_SAMANTHA, 0, MossdeepCity_Gym_Text_18CD14, MossdeepCity_Gym_Text_18CD66 + trainerbattle 0, TRAINER_SAMANTHA, 0, MossdeepCity_Gym_Text_18CD14, MossdeepCity_Gym_Text_18CD66 msgbox MossdeepCity_Gym_Text_18CD73, 6 end MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1 - trainerbattle 0, OPPONENT_MAURA, 0, MossdeepCity_Gym_Text_18CDE0, MossdeepCity_Gym_Text_18CE47 + trainerbattle 0, TRAINER_MAURA, 0, MossdeepCity_Gym_Text_18CDE0, MossdeepCity_Gym_Text_18CE47 msgbox MossdeepCity_Gym_Text_18CE6C, 6 end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index f13850570..a3906af8c 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -330,20 +330,20 @@ MtChimney_EventScript_15D107:: @ 815D107 MtChimney_EventScript_15D110:: @ 815D110 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3168, MtChimney_Text_1B31EA + trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3168, MtChimney_Text_1B31EA msgbox MtChimney_Text_1B3239, 6 .else - trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8 + trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8 msgbox MtChimney_Text_1B3C07, 6 .endif end MtChimney_EventScript_15D127:: @ 815D127 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B32C8, MtChimney_Text_1B336E + trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B32C8, MtChimney_Text_1B336E msgbox MtChimney_Text_1B338D, 6 .else - trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E + trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E msgbox MtChimney_Text_1B3D3D, 6 .endif end @@ -437,7 +437,7 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA end MtChimney_EventScript_15D1E3:: @ 815D1E3 - trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 + trainerbattle 0, TRAINER_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MtChimney_EventScript_15D20A @@ -445,21 +445,21 @@ MtChimney_EventScript_15D1E3:: @ 815D1E3 end MtChimney_EventScript_15D20A:: @ 815D20A - trainerbattle 5, OPPONENT_SHELBY_1, 0, MtChimney_Text_195A45, MtChimney_Text_195AAD + trainerbattle 5, TRAINER_SHELBY_1, 0, MtChimney_Text_195A45, MtChimney_Text_195AAD msgbox MtChimney_Text_195AD9, 6 end MtChimney_EventScript_15D221:: @ 815D221 - trainerbattle 0, OPPONENT_MELISSA, 0, MtChimney_Text_195B1C, MtChimney_Text_195B5F + trainerbattle 0, TRAINER_MELISSA, 0, MtChimney_Text_195B1C, MtChimney_Text_195B5F msgbox MtChimney_Text_195B84, 6 end MtChimney_EventScript_15D238:: @ 815D238 - trainerbattle 0, OPPONENT_SHEILA, 0, MtChimney_Text_195BB2, MtChimney_Text_195BF9 + trainerbattle 0, TRAINER_SHEILA, 0, MtChimney_Text_195BB2, MtChimney_Text_195BF9 msgbox MtChimney_Text_195C31, 6 end MtChimney_EventScript_15D24F:: @ 815D24F - trainerbattle 0, OPPONENT_SHIRLEY, 0, MtChimney_Text_195CD8, MtChimney_Text_195D2F + trainerbattle 0, TRAINER_SHIRLEY, 0, MtChimney_Text_195CD8, MtChimney_Text_195D2F msgbox MtChimney_Text_195D5C, 6 end diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index 1d2368597..d2ef2894e 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -18,16 +18,16 @@ MtPyre_2F_EventScript_15D392:: @ 815D392 end MtPyre_2F_EventScript_15D39B:: @ 815D39B - trainerbattle 0, OPPONENT_MARK, 0, MtPyre_2F_Text_196674, MtPyre_2F_Text_1966BE + trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_196674, MtPyre_2F_Text_1966BE msgbox MtPyre_2F_Text_1966E7, 6 end MtPyre_2F_EventScript_15D3B2:: @ 815D3B2 - trainerbattle 4, OPPONENT_DEZ_AND_LUKE, 0, MtPyre_2F_Text_1962C6, MtPyre_2F_Text_196358, MtPyre_2F_Text_1963CB + trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_1962C6, MtPyre_2F_Text_196358, MtPyre_2F_Text_1963CB msgbox MtPyre_2F_Text_196368, 6 end MtPyre_2F_EventScript_15D3CD:: @ 815D3CD - trainerbattle 4, OPPONENT_DEZ_AND_LUKE, 0, MtPyre_2F_Text_196449, MtPyre_2F_Text_1964EB, MtPyre_2F_Text_196539 + trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_196449, MtPyre_2F_Text_1964EB, MtPyre_2F_Text_196539 msgbox MtPyre_2F_Text_196504, 6 end diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index ea8bda7b5..69a57df19 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -2,11 +2,11 @@ MtPyre_3F_MapScripts:: @ 815D3E8 .byte 0 MtPyre_3F_EventScript_15D3E9:: @ 815D3E9 - trainerbattle 0, OPPONENT_WILLIAM, 0, MtPyre_3F_Text_19672B, MtPyre_3F_Text_19679D + trainerbattle 0, TRAINER_WILLIAM, 0, MtPyre_3F_Text_19672B, MtPyre_3F_Text_19679D msgbox MtPyre_3F_Text_1967B5, 6 end MtPyre_3F_EventScript_15D400:: @ 815D400 - trainerbattle 0, OPPONENT_KAYLA, 0, MtPyre_3F_Text_1967EF, MtPyre_3F_Text_19682B + trainerbattle 0, TRAINER_KAYLA, 0, MtPyre_3F_Text_1967EF, MtPyre_3F_Text_19682B msgbox MtPyre_3F_Text_196842, 6 end diff --git a/data/maps/MtPyre_4F/scripts.inc b/data/maps/MtPyre_4F/scripts.inc index e1ebac7c1..3910d6f45 100644 --- a/data/maps/MtPyre_4F/scripts.inc +++ b/data/maps/MtPyre_4F/scripts.inc @@ -2,6 +2,6 @@ MtPyre_4F_MapScripts:: @ 815D417 .byte 0 MtPyre_4F_EventScript_15D418:: @ 815D418 - trainerbattle 0, OPPONENT_ATSUSHI, 0, MtPyre_4F_Text_1968A6, MtPyre_4F_Text_1968D0 + trainerbattle 0, TRAINER_ATSUSHI, 0, MtPyre_4F_Text_1968A6, MtPyre_4F_Text_1968D0 msgbox MtPyre_4F_Text_1968EE, 6 end diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc index 9adb249f0..8cec3a32f 100644 --- a/data/maps/MtPyre_5F/scripts.inc +++ b/data/maps/MtPyre_5F/scripts.inc @@ -2,6 +2,6 @@ MtPyre_5F_MapScripts:: @ 815D42F .byte 0 MtPyre_5F_EventScript_15D430:: @ 815D430 - trainerbattle 0, OPPONENT_TASHA, 0, MtPyre_5F_Text_196939, MtPyre_5F_Text_196997 + trainerbattle 0, TRAINER_TASHA, 0, MtPyre_5F_Text_196939, MtPyre_5F_Text_196997 msgbox MtPyre_5F_Text_1969AC, 6 end diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index ae09300a3..92086949f 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -2,7 +2,7 @@ MtPyre_6F_MapScripts:: @ 815D447 .byte 0 MtPyre_6F_EventScript_15D448:: @ 815D448 - trainerbattle 0, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 + trainerbattle 0, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MtPyre_6F_EventScript_15D46F @@ -10,6 +10,6 @@ MtPyre_6F_EventScript_15D448:: @ 815D448 end MtPyre_6F_EventScript_15D46F:: @ 815D46F - trainerbattle 5, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_196A95, MtPyre_6F_Text_196AB1 + trainerbattle 5, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_196A95, MtPyre_6F_Text_196AB1 msgbox MtPyre_6F_Text_196AC9, 6 end diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index a3fb5c494..44398e6d5 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -15,13 +15,13 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 setvar VAR_SPECIAL_5, 1 call PetalburgCity_Gym_EventScript_154F9A - call_if_trainer_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154FBB - call_if_trainer_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154FDC - call_if_trainer_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154FFD - call_if_trainer_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_15501E - call_if_trainer_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_15503F - call_if_trainer_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_155060 - call_if_trainer_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_155081 + call_if_trainer_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154FBB + call_if_trainer_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154FDC + call_if_trainer_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_154FFD + call_if_trainer_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_15501E + call_if_trainer_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_15503F + call_if_trainer_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_155060 + call_if_trainer_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_155081 end PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED @@ -382,7 +382,7 @@ PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 msgbox PetalburgCity_Gym_Text_17A653, 4 - trainerbattle 3, OPPONENT_NORMAN, 0, PetalburgCity_Gym_Text_17A77A + trainerbattle 3, TRAINER_NORMAN, 0, PetalburgCity_Gym_Text_17A77A message PetalburgCity_Gym_Text_17A7DD waitmessage call PetalburgCity_Gym_EventScript_1A02C5 @@ -625,7 +625,7 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall - goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 46 msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO @@ -637,7 +637,7 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall - goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -649,7 +649,7 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall - goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -661,7 +661,7 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall - goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 72 msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO @@ -673,7 +673,7 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall - goto_if_trainer_not_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -685,7 +685,7 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall - goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -697,7 +697,7 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall - goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -709,7 +709,7 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall - goto_if_trainer_not_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -721,7 +721,7 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall - goto_if_trainer_not_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO @@ -733,7 +733,7 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall - goto_if_trainer_not_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO @@ -744,7 +744,7 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 end PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 - trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A + trainerbattle 2, TRAINER_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E29 msgbox PetalburgCity_Gym_Text_17AE30, 6 end @@ -761,7 +761,7 @@ PetalburgCity_Gym_EventScript_154E29:: @ 8154E29 end PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 - trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 + trainerbattle 2, TRAINER_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E65 msgbox PetalburgCity_Gym_Text_17AFD3, 6 end @@ -778,7 +778,7 @@ PetalburgCity_Gym_EventScript_154E65:: @ 8154E65 end PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E - trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 + trainerbattle 2, TRAINER_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EA1 msgbox PetalburgCity_Gym_Text_17B12C, 6 end @@ -795,7 +795,7 @@ PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1 end PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA - trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE + trainerbattle 2, TRAINER_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EDD msgbox PetalburgCity_Gym_Text_17B2E4, 6 end @@ -812,7 +812,7 @@ PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD end PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 - trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A + trainerbattle 2, TRAINER_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F19 msgbox PetalburgCity_Gym_Text_17B46F, 6 end @@ -829,7 +829,7 @@ PetalburgCity_Gym_EventScript_154F19:: @ 8154F19 end PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 - trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 + trainerbattle 2, TRAINER_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F55 msgbox PetalburgCity_Gym_Text_17B5EA, 6 end @@ -846,7 +846,7 @@ PetalburgCity_Gym_EventScript_154F55:: @ 8154F55 end PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E - trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 + trainerbattle 2, TRAINER_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F91 msgbox PetalburgCity_Gym_Text_17B749, 6 end diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 69b85d743..8d1651d3a 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -30,7 +30,7 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 applymovement 3, PetalburgWoods_Movement_15CEC8 waitmovement 0 msgbox PetalburgWoods_Text_194EE8, 4 - trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 + trainerbattle 3, TRAINER_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 applymovement 3, PetalburgWoods_Movement_15CEB3 waitmovement 0 call PetalburgWoods_EventScript_15CDFA @@ -65,7 +65,7 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 applymovement 255, PetalburgWoods_Movement_1A0841 waitmovement 0 msgbox PetalburgWoods_Text_194EE8, 4 - trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 + trainerbattle 3, TRAINER_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 applymovement 3, PetalburgWoods_Movement_15CEB3 waitmovement 0 call PetalburgWoods_EventScript_15CDFA @@ -264,12 +264,12 @@ PetalburgWoods_EventScript_15CF1E:: @ 815CF1E end PetalburgWoods_EventScript_15CF27:: @ 815CF27 - trainerbattle 0, OPPONENT_LYLE, 0, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202 + trainerbattle 0, TRAINER_LYLE, 0, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202 msgbox PetalburgWoods_Text_195232, 6 end PetalburgWoods_EventScript_15CF3E:: @ 815CF3E - trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE + trainerbattle 0, TRAINER_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq PetalburgWoods_EventScript_15CF65 @@ -277,6 +277,6 @@ PetalburgWoods_EventScript_15CF3E:: @ 815CF3E end PetalburgWoods_EventScript_15CF65:: @ 815CF65 - trainerbattle 5, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338 + trainerbattle 5, TRAINER_JAMES_1, 0, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338 msgbox PetalburgWoods_Text_195356, 6 end diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index ad1571caa..758d05d45 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -18,7 +18,7 @@ Route102_EventScript_14EAF5:: @ 814EAF5 end Route102_EventScript_14EAFE:: @ 814EAFE - trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C + trainerbattle 0, TRAINER_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route102_EventScript_14EB25 @@ -26,21 +26,21 @@ Route102_EventScript_14EAFE:: @ 814EAFE end Route102_EventScript_14EB25:: @ 814EB25 - trainerbattle 5, OPPONENT_CALVIN_1, 0, Route102_Text_1B7A9F, Route102_Text_1B7AFD + trainerbattle 5, TRAINER_CALVIN_1, 0, Route102_Text_1B7A9F, Route102_Text_1B7AFD msgbox Route102_Text_1B7B2F, 6 end Route102_EventScript_14EB3C:: @ 814EB3C - trainerbattle 0, OPPONENT_RICK, 0, Route102_Text_1B7C05, Route102_Text_1B7C40 + trainerbattle 0, TRAINER_RICK, 0, Route102_Text_1B7C05, Route102_Text_1B7C40 msgbox Route102_Text_1B7C52, 6 end Route102_EventScript_14EB53:: @ 814EB53 - trainerbattle 0, OPPONENT_TIANA, 0, Route102_Text_1B7C97, Route102_Text_1B7CEC + trainerbattle 0, TRAINER_TIANA, 0, Route102_Text_1B7C97, Route102_Text_1B7CEC msgbox Route102_Text_1B7D11, 6 end Route102_EventScript_14EB6A:: @ 814EB6A - trainerbattle 0, OPPONENT_ALLEN, 0, Route102_Text_1B7B68, Route102_Text_1B7B9D + trainerbattle 0, TRAINER_ALLEN, 0, Route102_Text_1B7B68, Route102_Text_1B7B9D msgbox Route102_Text_1B7BD0, 6 end diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 361dc78c3..625fc5271 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -49,32 +49,32 @@ Route103_EventScript_14EC04:: @ 814EC04 end Route103_EventScript_14EC5D:: @ 814EC5D - trainerbattle 3, OPPONENT_MAY_4, 0, Route103_Text_16D65B + trainerbattle 3, TRAINER_MAY_4, 0, Route103_Text_16D65B goto Route103_EventScript_14ECBD end Route103_EventScript_14EC6D:: @ 814EC6D - trainerbattle 3, OPPONENT_MAY_7, 0, Route103_Text_16D65B + trainerbattle 3, TRAINER_MAY_7, 0, Route103_Text_16D65B goto Route103_EventScript_14ECBD end Route103_EventScript_14EC7D:: @ 814EC7D - trainerbattle 3, OPPONENT_MAY_1, 0, Route103_Text_16D65B + trainerbattle 3, TRAINER_MAY_1, 0, Route103_Text_16D65B goto Route103_EventScript_14ECBD end Route103_EventScript_14EC8D:: @ 814EC8D - trainerbattle 3, OPPONENT_BRENDAN_4, 0, Route103_Text_16D836 + trainerbattle 3, TRAINER_BRENDAN_4, 0, Route103_Text_16D836 goto Route103_EventScript_14ECCB end Route103_EventScript_14EC9D:: @ 814EC9D - trainerbattle 3, OPPONENT_BRENDAN_7, 0, Route103_Text_16D836 + trainerbattle 3, TRAINER_BRENDAN_7, 0, Route103_Text_16D836 goto Route103_EventScript_14ECCB end Route103_EventScript_14ECAD:: @ 814ECAD - trainerbattle 3, OPPONENT_BRENDAN_1, 0, Route103_Text_16D836 + trainerbattle 3, TRAINER_BRENDAN_1, 0, Route103_Text_16D836 goto Route103_EventScript_14ECCB end @@ -167,12 +167,12 @@ Route103_EventScript_14ED8B:: @ 814ED8B end Route103_EventScript_14ED94:: @ 814ED94 - trainerbattle 0, OPPONENT_DAISY, 0, Route103_Text_1B7D55, Route103_Text_1B7D8B + trainerbattle 0, TRAINER_DAISY, 0, Route103_Text_1B7D55, Route103_Text_1B7D8B msgbox Route103_Text_1B7DB2, 6 end Route103_EventScript_14EDAB:: @ 814EDAB - trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC + trainerbattle 4, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EDD6 @@ -180,12 +180,12 @@ Route103_EventScript_14EDAB:: @ 814EDAB end Route103_EventScript_14EDD6:: @ 814EDD6 - trainerbattle 7, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF + trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF msgbox Route103_Text_1B8053, 6 end Route103_EventScript_14EDF1:: @ 814EDF1 - trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E + trainerbattle 4, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EE1C @@ -193,17 +193,17 @@ Route103_EventScript_14EDF1:: @ 814EDF1 end Route103_EventScript_14EE1C:: @ 814EE1C - trainerbattle 7, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1 + trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1 msgbox Route103_Text_1B814D, 6 end Route103_EventScript_14EE37:: @ 814EE37 - trainerbattle 0, OPPONENT_ANDREW, 0, Route103_Text_1B81FA, Route103_Text_1B8258 + trainerbattle 0, TRAINER_ANDREW, 0, Route103_Text_1B81FA, Route103_Text_1B8258 msgbox Route103_Text_1B8281, 6 end Route103_EventScript_14EE4E:: @ 814EE4E - trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC + trainerbattle 0, TRAINER_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EE75 @@ -211,6 +211,6 @@ Route103_EventScript_14EE4E:: @ 814EE4E end Route103_EventScript_14EE75:: @ 814EE75 - trainerbattle 5, OPPONENT_MIGUEL_1, 0, Route103_Text_1B8349, Route103_Text_1B838C + trainerbattle 5, TRAINER_MIGUEL_1, 0, Route103_Text_1B8349, Route103_Text_1B838C msgbox Route103_Text_1B83A4, 6 end diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 8fda04ea5..9b055f134 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -391,17 +391,17 @@ Route104_Movement_14F16F:: @ 814F16F end_movement Route104_EventScript_14F172:: @ 814F172 - trainerbattle 0, OPPONENT_IVAN, 0, Route104_Text_1B85EB, Route104_Text_1B8637 + trainerbattle 0, TRAINER_IVAN, 0, Route104_Text_1B85EB, Route104_Text_1B8637 msgbox Route104_Text_1B8680, 6 end Route104_EventScript_14F189:: @ 814F189 - trainerbattle 0, OPPONENT_BILLY, 0, Route104_Text_1B86BE, Route104_Text_1B86E8 + trainerbattle 0, TRAINER_BILLY, 0, Route104_Text_1B86BE, Route104_Text_1B86E8 msgbox Route104_Text_1B871C, 6 end Route104_EventScript_14F1A0:: @ 814F1A0 - trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 + trainerbattle 0, TRAINER_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F1C7 @@ -409,12 +409,12 @@ Route104_EventScript_14F1A0:: @ 814F1A0 end Route104_EventScript_14F1C7:: @ 814F1C7 - trainerbattle 5, OPPONENT_HALEY_1, 0, Route104_Text_1B8839, Route104_Text_1B8852 + trainerbattle 5, TRAINER_HALEY_1, 0, Route104_Text_1B8839, Route104_Text_1B8852 msgbox Route104_Text_1B8872, 6 end Route104_EventScript_14F1DE:: @ 814F1DE - trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 + trainerbattle 0, TRAINER_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F205 @@ -422,12 +422,12 @@ Route104_EventScript_14F1DE:: @ 814F1DE end Route104_EventScript_14F205:: @ 814F205 - trainerbattle 5, OPPONENT_WINSTON_1, 0, Route104_Text_1B895E, Route104_Text_1B899E + trainerbattle 5, TRAINER_WINSTON_1, 0, Route104_Text_1B895E, Route104_Text_1B899E msgbox Route104_Text_1B89C0, 6 end Route104_EventScript_14F21C:: @ 814F21C - trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 + trainerbattle 0, TRAINER_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F243 @@ -435,19 +435,19 @@ Route104_EventScript_14F21C:: @ 814F21C end Route104_EventScript_14F243:: @ 814F243 - trainerbattle 5, OPPONENT_CINDY_1, 0, Route104_Text_1B8AA7, Route104_Text_1B8AD9 + trainerbattle 5, TRAINER_CINDY_1, 0, Route104_Text_1B8AA7, Route104_Text_1B8AD9 msgbox Route104_Text_1B8B02, 6 end Route104_EventScript_14F25A:: @ 814F25A - trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B83E9, Route104_Text_1B8414, Route104_Text_1B845C + trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_1B83E9, Route104_Text_1B8414, Route104_Text_1B845C special GetPlayerBigGuyGirlString msgbox Route104_Text_1B842C, 4 release end Route104_EventScript_14F279:: @ 814F279 - trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B84DB, Route104_Text_1B850D, Route104_Text_1B8577 + trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_1B84DB, Route104_Text_1B850D, Route104_Text_1B8577 special GetPlayerBigGuyGirlString msgbox Route104_Text_1B853B, 4 release diff --git a/data/maps/Route104_Prototype/scripts.inc b/data/maps/Route104_Prototype/scripts.inc index e0aba01c9..1b8458e62 100644 --- a/data/maps/Route104_Prototype/scripts.inc +++ b/data/maps/Route104_Prototype/scripts.inc @@ -4,12 +4,12 @@ Route104_Prototype_MapScripts:: @ 8160C4A Route104_Prototype_EventScript_160C4B:: @ 8160C4B lock faceplayer - goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_BRIANNA_1, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_CINDY_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_AMY_AND_LIV_3, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_GINA_AND_MIA_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_LUCAS_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_MIKE_1, Route104_Prototype_EventScript_160C99 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 msgbox Route104_Prototype_Text_19B267, 4 goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_2, Route104_Prototype_EventScript_160CFB @@ -24,12 +24,12 @@ Route104_Prototype_EventScript_160C99:: @ 8160C99 Route104_Prototype_EventScript_160CA3:: @ 8160CA3 lock faceplayer - goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_BRIANNA_1, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_CINDY_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_AMY_AND_LIV_3, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_GINA_AND_MIA_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_LUCAS_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_MIKE_1, Route104_Prototype_EventScript_160CF1 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 msgbox Route104_Prototype_Text_19B2E9, 4 goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_1, Route104_Prototype_EventScript_160CFB @@ -68,31 +68,31 @@ Route104_Prototype_EventScript_160D25:: @ 8160D25 end Route104_Prototype_EventScript_160D2E:: @ 8160D2E - trainerbattle 0, OPPONENT_CINDY_2, 0, Route104_Prototype_Text_19AD9B, Route104_Prototype_Text_19ADDA + trainerbattle 0, TRAINER_CINDY_2, 0, Route104_Prototype_Text_19AD9B, Route104_Prototype_Text_19ADDA msgbox Route104_Prototype_Text_19ADF7, 6 end Route104_Prototype_EventScript_160D45:: @ 8160D45 - trainerbattle 4, OPPONENT_AMY_AND_LIV_3, 0, Route104_Prototype_Text_19AE3E, Route104_Prototype_Text_19AE53, Route104_Prototype_Text_19AEA9 + trainerbattle 4, TRAINER_AMY_AND_LIV_3, 0, Route104_Prototype_Text_19AE3E, Route104_Prototype_Text_19AE53, Route104_Prototype_Text_19AEA9 msgbox Route104_Prototype_Text_19AE6A, 6 end Route104_Prototype_EventScript_160D60:: @ 8160D60 - trainerbattle 4, OPPONENT_GINA_AND_MIA_2, 0, Route104_Prototype_Text_19B148, Route104_Prototype_Text_19B17D, Route104_Prototype_Text_19B1DD + trainerbattle 4, TRAINER_GINA_AND_MIA_2, 0, Route104_Prototype_Text_19B148, Route104_Prototype_Text_19B17D, Route104_Prototype_Text_19B1DD msgbox Route104_Prototype_Text_19B18D, 6 end Route104_Prototype_EventScript_160D7B:: @ 8160D7B - trainerbattle 0, OPPONENT_MIKE_1, 0, Route104_Prototype_Text_19AEFB, Route104_Prototype_Text_19AF3E + trainerbattle 0, TRAINER_MIKE_1, 0, Route104_Prototype_Text_19AEFB, Route104_Prototype_Text_19AF3E msgbox Route104_Prototype_Text_19AF56, 6 end Route104_Prototype_EventScript_160D92:: @ 8160D92 - trainerbattle 0, OPPONENT_BRIANNA_1, 0, Route104_Prototype_Text_19AF8A, Route104_Prototype_Text_19AFDB + trainerbattle 0, TRAINER_BRIANNA_1, 0, Route104_Prototype_Text_19AF8A, Route104_Prototype_Text_19AFDB msgbox Route104_Prototype_Text_19B00D, 6 end Route104_Prototype_EventScript_160DA9:: @ 8160DA9 - trainerbattle 0, OPPONENT_LUCAS_2, 0, Route104_Prototype_Text_19B066, Route104_Prototype_Text_19B0D7 + trainerbattle 0, TRAINER_LUCAS_2, 0, Route104_Prototype_Text_19B066, Route104_Prototype_Text_19B0D7 msgbox Route104_Prototype_Text_19B0EF, 6 end diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 305a2e9af..e628c4761 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -12,26 +12,26 @@ Route105_EventScript_14F2A8:: @ 814F2A8 return Route105_EventScript_14F2BB:: @ 814F2BB - trainerbattle 0, OPPONENT_FOSTER, 0, Route105_Text_1B8B40, Route105_Text_1B8B93 + trainerbattle 0, TRAINER_FOSTER, 0, Route105_Text_1B8B40, Route105_Text_1B8B93 msgbox Route105_Text_1B8BDE, 6 end Route105_EventScript_14F2D2:: @ 814F2D2 - trainerbattle 0, OPPONENT_LUIS, 0, Route105_Text_1B8C28, Route105_Text_1B8C99 + trainerbattle 0, TRAINER_LUIS, 0, Route105_Text_1B8C28, Route105_Text_1B8C99 msgbox Route105_Text_1B8CA9, 6 end Route105_EventScript_14F2E9:: @ 814F2E9 - trainerbattle 0, OPPONENT_AUSTIN, 0, Route105_Text_1B8CEE, Route105_Text_1B8D23 + trainerbattle 0, TRAINER_AUSTIN, 0, Route105_Text_1B8CEE, Route105_Text_1B8D23 msgbox Route105_Text_1B8D45, 6 end Route105_EventScript_14F300:: @ 814F300 - trainerbattle 0, OPPONENT_BEVERLY, 0, Route105_Text_1B8D99, Route105_Text_1B8DDD + trainerbattle 0, TRAINER_BEVERLY, 0, Route105_Text_1B8D99, Route105_Text_1B8DDD msgbox Route105_Text_1B8DED, 6 end Route105_EventScript_14F317:: @ 814F317 - trainerbattle 0, OPPONENT_DAWN, 0, Route105_Text_1B8E66, Route105_Text_1B8EA0 + trainerbattle 0, TRAINER_DAWN, 0, Route105_Text_1B8E66, Route105_Text_1B8EA0 msgbox Route105_Text_1B8EBD, 6 end diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc index ae65c7013..16132e530 100644 --- a/data/maps/Route106/scripts.inc +++ b/data/maps/Route106/scripts.inc @@ -6,17 +6,17 @@ Route106_EventScript_14F32F:: @ 814F32F end Route106_EventScript_14F338:: @ 814F338 - trainerbattle 0, OPPONENT_DOUGLAS, 0, Route106_Text_1B913D, Route106_Text_1B917F + trainerbattle 0, TRAINER_DOUGLAS, 0, Route106_Text_1B913D, Route106_Text_1B917F msgbox Route106_Text_1B918A, 6 end Route106_EventScript_14F34F:: @ 814F34F - trainerbattle 0, OPPONENT_NICOLE, 0, Route106_Text_1B91AC, Route106_Text_1B91F8 + trainerbattle 0, TRAINER_NICOLE, 0, Route106_Text_1B91AC, Route106_Text_1B91F8 msgbox Route106_Text_1B9222, 6 end Route106_EventScript_14F366:: @ 814F366 - trainerbattle 0, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 + trainerbattle 0, TRAINER_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route106_EventScript_14F38D @@ -24,11 +24,11 @@ Route106_EventScript_14F366:: @ 814F366 end Route106_EventScript_14F38D:: @ 814F38D - trainerbattle 5, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8FAC, Route106_Text_1B8FF5 + trainerbattle 5, TRAINER_ELLIOT_1, 0, Route106_Text_1B8FAC, Route106_Text_1B8FF5 msgbox Route106_Text_1B9011, 6 end Route106_EventScript_14F3A4:: @ 814F3A4 - trainerbattle 0, OPPONENT_NED, 0, Route106_Text_1B9052, Route106_Text_1B90D3 + trainerbattle 0, TRAINER_NED, 0, Route106_Text_1B9052, Route106_Text_1B90D3 msgbox Route106_Text_1B910A, 6 end diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index ad2d293fc..3f8d2dc0f 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -2,12 +2,12 @@ Route107_MapScripts:: @ 814F3BB .byte 0 Route107_EventScript_14F3BC:: @ 814F3BC - trainerbattle 0, OPPONENT_DARRIN, 0, Route107_Text_1B926B, Route107_Text_1B92B7 + trainerbattle 0, TRAINER_DARRIN, 0, Route107_Text_1B926B, Route107_Text_1B92B7 msgbox Route107_Text_1B92E7, 6 end Route107_EventScript_14F3D3:: @ 814F3D3 - trainerbattle 0, OPPONENT_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 + trainerbattle 0, TRAINER_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route107_EventScript_14F3FA @@ -15,26 +15,26 @@ Route107_EventScript_14F3D3:: @ 814F3D3 end Route107_EventScript_14F3FA:: @ 814F3FA - trainerbattle 5, OPPONENT_TONY_1, 0, Route107_Text_1B93EB, Route107_Text_1B9429 + trainerbattle 5, TRAINER_TONY_1, 0, Route107_Text_1B93EB, Route107_Text_1B9429 msgbox Route107_Text_1B9477, 6 end Route107_EventScript_14F411:: @ 814F411 - trainerbattle 0, OPPONENT_DENISE, 0, Route107_Text_1B94C8, Route107_Text_1B94F2 + trainerbattle 0, TRAINER_DENISE, 0, Route107_Text_1B94C8, Route107_Text_1B94F2 msgbox Route107_Text_1B94FF, 6 end Route107_EventScript_14F428:: @ 814F428 - trainerbattle 0, OPPONENT_BETH, 0, Route107_Text_1B9538, Route107_Text_1B956B + trainerbattle 0, TRAINER_BETH, 0, Route107_Text_1B9538, Route107_Text_1B956B msgbox Route107_Text_1B9589, 6 end Route107_EventScript_14F43F:: @ 814F43F - trainerbattle 4, OPPONENT_LISA_AND_RAY, 0, Route107_Text_1B95CB, Route107_Text_1B95FB, Route107_Text_1B9672 + trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_1B95CB, Route107_Text_1B95FB, Route107_Text_1B9672 msgbox Route107_Text_1B9630, 6 end Route107_EventScript_14F45A:: @ 814F45A - trainerbattle 4, OPPONENT_LISA_AND_RAY, 0, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788 + trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788 msgbox Route107_Text_1B9735, 6 end diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc index 2e40c882d..498a52a51 100644 --- a/data/maps/Route108/scripts.inc +++ b/data/maps/Route108/scripts.inc @@ -2,21 +2,21 @@ Route108_MapScripts:: @ 814F475 .byte 0 Route108_EventScript_14F476:: @ 814F476 - trainerbattle 0, OPPONENT_JEROME, 0, Route108_Text_1B97C3, Route108_Text_1B97EF + trainerbattle 0, TRAINER_JEROME, 0, Route108_Text_1B97C3, Route108_Text_1B97EF msgbox Route108_Text_1B9823, 6 end Route108_EventScript_14F48D:: @ 814F48D - trainerbattle 0, OPPONENT_MATTHEW, 0, Route108_Text_1B9864, Route108_Text_1B989F + trainerbattle 0, TRAINER_MATTHEW, 0, Route108_Text_1B9864, Route108_Text_1B989F msgbox Route108_Text_1B98BC, 6 end Route108_EventScript_14F4A4:: @ 814F4A4 - trainerbattle 0, OPPONENT_TARA, 0, Route108_Text_1B98EC, Route108_Text_1B992C + trainerbattle 0, TRAINER_TARA, 0, Route108_Text_1B98EC, Route108_Text_1B992C msgbox Route108_Text_1B9935, 6 end Route108_EventScript_14F4BB:: @ 814F4BB - trainerbattle 0, OPPONENT_MISSY, 0, Route108_Text_1B9986, Route108_Text_1B99BB + trainerbattle 0, TRAINER_MISSY, 0, Route108_Text_1B9986, Route108_Text_1B99BB msgbox Route108_Text_1B99E9, 6 end diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 6f24b2142..899952d1a 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -373,27 +373,27 @@ Route109_EventScript_14F7A4:: @ 814F7A4 end Route109_EventScript_14F7AD:: @ 814F7AD - trainerbattle 0, OPPONENT_DAVID, 0, Route109_Text_1B9A1C, Route109_Text_1B9A59 + trainerbattle 0, TRAINER_DAVID, 0, Route109_Text_1B9A1C, Route109_Text_1B9A59 msgbox Route109_Text_1B9A6D, 6 end Route109_EventScript_14F7C4:: @ 814F7C4 - trainerbattle 0, OPPONENT_ALICE, 0, Route109_Text_1B9AAD, Route109_Text_1B9AD9 + trainerbattle 0, TRAINER_ALICE, 0, Route109_Text_1B9AAD, Route109_Text_1B9AD9 msgbox Route109_Text_1B9AEB, 6 end Route109_EventScript_14F7DB:: @ 814F7DB - trainerbattle 0, OPPONENT_HUEY, 0, Route109_Text_1B9B11, Route109_Text_1B9B57 + trainerbattle 0, TRAINER_HUEY, 0, Route109_Text_1B9B11, Route109_Text_1B9B57 msgbox Route109_Text_1B9B68, 6 end Route109_EventScript_14F7F2:: @ 814F7F2 - trainerbattle 0, OPPONENT_EDMOND, 0, Route109_Text_1B9B91, Route109_Text_1B9BAE + trainerbattle 0, TRAINER_EDMOND, 0, Route109_Text_1B9B91, Route109_Text_1B9BAE msgbox Route109_Text_1B9BD3, 6 end Route109_EventScript_14F809:: @ 814F809 - trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 + trainerbattle 0, TRAINER_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route109_EventScript_14F830 @@ -401,12 +401,12 @@ Route109_EventScript_14F809:: @ 814F809 end Route109_EventScript_14F830:: @ 814F830 - trainerbattle 5, OPPONENT_RICKY_1, 0, Route109_Text_1B9CB3, Route109_Text_1B9CEB + trainerbattle 5, TRAINER_RICKY_1, 0, Route109_Text_1B9CB3, Route109_Text_1B9CEB msgbox Route109_Text_1B9D10, 6 end Route109_EventScript_14F847:: @ 814F847 - trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 + trainerbattle 0, TRAINER_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route109_EventScript_14F86E @@ -414,31 +414,31 @@ Route109_EventScript_14F847:: @ 814F847 end Route109_EventScript_14F86E:: @ 814F86E - trainerbattle 5, OPPONENT_LOLA_1, 0, Route109_Text_1B9DD8, Route109_Text_1B9E16 + trainerbattle 5, TRAINER_LOLA_1, 0, Route109_Text_1B9DD8, Route109_Text_1B9E16 msgbox Route109_Text_1B9E1D, 6 end Route109_EventScript_14F885:: @ 814F885 - trainerbattle 0, OPPONENT_CARMEN, 0, Route109_Text_1B9E60, Route109_Text_1B9EA1 + trainerbattle 0, TRAINER_CARMEN, 0, Route109_Text_1B9E60, Route109_Text_1B9EA1 msgbox Route109_Text_1B9ECA, 6 end Route109_EventScript_14F89C:: @ 814F89C - trainerbattle 0, OPPONENT_GWEN, 0, Route109_Text_1B9F07, Route109_Text_1B9F31 + trainerbattle 0, TRAINER_GWEN, 0, Route109_Text_1B9F07, Route109_Text_1B9F31 msgbox Route109_Text_1B9F44, 6 end Route109_EventScript_14F8B3:: @ 814F8B3 - trainerbattle 0, OPPONENT_CARTER, 0, Route109_Text_1B9F65, Route109_Text_1B9F9C + trainerbattle 0, TRAINER_CARTER, 0, Route109_Text_1B9F65, Route109_Text_1B9F9C msgbox Route109_Text_1B9FB7, 6 end Route109_EventScript_14F8CA:: @ 814F8CA - trainerbattle 4, OPPONENT_MEL_AND_PAUL, 0, Route109_Text_1B9FF6, Route109_Text_1BA052, Route109_Text_1BA0BF + trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_1B9FF6, Route109_Text_1BA052, Route109_Text_1BA0BF msgbox Route109_Text_1BA069, 6 end Route109_EventScript_14F8E5:: @ 814F8E5 - trainerbattle 4, OPPONENT_MEL_AND_PAUL, 0, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0 + trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0 msgbox Route109_Text_1BA193, 6 end diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index 13d37e7bd..1506e18f9 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -76,24 +76,24 @@ Route109_SeashoreHouse_EventScript_160EAB:: @ 8160EAB end Route109_SeashoreHouse_EventScript_160EB8:: @ 8160EB8 - trainerbattle 2, OPPONENT_DWAYNE, 0, Route109_SeashoreHouse_Text_19B809, Route109_SeashoreHouse_Text_19B869, Route109_SeashoreHouse_EventScript_160F09 + trainerbattle 2, TRAINER_DWAYNE, 0, Route109_SeashoreHouse_Text_19B809, Route109_SeashoreHouse_Text_19B869, Route109_SeashoreHouse_EventScript_160F09 msgbox Route109_SeashoreHouse_Text_19B89F, 6 end Route109_SeashoreHouse_EventScript_160ED3:: @ 8160ED3 - trainerbattle 2, OPPONENT_JOHANNA, 0, Route109_SeashoreHouse_Text_19B8E5, Route109_SeashoreHouse_Text_19B949, Route109_SeashoreHouse_EventScript_160F09 + trainerbattle 2, TRAINER_JOHANNA, 0, Route109_SeashoreHouse_Text_19B8E5, Route109_SeashoreHouse_Text_19B949, Route109_SeashoreHouse_EventScript_160F09 msgbox Route109_SeashoreHouse_Text_19B955, 6 end Route109_SeashoreHouse_EventScript_160EEE:: @ 8160EEE - trainerbattle 2, OPPONENT_SIMON, 0, Route109_SeashoreHouse_Text_19B988, Route109_SeashoreHouse_Text_19B9C7, Route109_SeashoreHouse_EventScript_160F09 + trainerbattle 2, TRAINER_SIMON, 0, Route109_SeashoreHouse_Text_19B988, Route109_SeashoreHouse_Text_19B9C7, Route109_SeashoreHouse_EventScript_160F09 msgbox Route109_SeashoreHouse_Text_19B9E5, 6 end Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 - goto_if_trainer_not_defeated OPPONENT_DWAYNE, Route109_SeashoreHouse_EventScript_160F29 - goto_if_trainer_not_defeated OPPONENT_JOHANNA, Route109_SeashoreHouse_EventScript_160F29 - goto_if_trainer_not_defeated OPPONENT_SIMON, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated TRAINER_DWAYNE, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated TRAINER_JOHANNA, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated TRAINER_SIMON, Route109_SeashoreHouse_EventScript_160F29 setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS release end diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 36e5cd7a2..93333ce56 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -166,17 +166,17 @@ Route110_EventScript_14FA84:: @ 814FA84 end Route110_EventScript_14FA8E:: @ 814FA8E - trainerbattle 0, OPPONENT_EDWARD, 0, Route110_Text_1BA699, Route110_Text_1BA6D2 + trainerbattle 0, TRAINER_EDWARD, 0, Route110_Text_1BA699, Route110_Text_1BA6D2 msgbox Route110_Text_1BA6F8, 6 end Route110_EventScript_14FAA5:: @ 814FAA5 - trainerbattle 0, OPPONENT_JACLYN, 0, Route110_Text_1BA72D, Route110_Text_1BA759 + trainerbattle 0, TRAINER_JACLYN, 0, Route110_Text_1BA72D, Route110_Text_1BA759 msgbox Route110_Text_1BA76C, 6 end Route110_EventScript_14FABC:: @ 814FABC - trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 + trainerbattle 0, TRAINER_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FAE3 @@ -184,27 +184,27 @@ Route110_EventScript_14FABC:: @ 814FABC end Route110_EventScript_14FAE3:: @ 814FAE3 - trainerbattle 5, OPPONENT_EDWIN_1, 0, Route110_Text_1BA877, Route110_Text_1BA8CD + trainerbattle 5, TRAINER_EDWIN_1, 0, Route110_Text_1BA877, Route110_Text_1BA8CD msgbox Route110_Text_1BA8E9, 6 end Route110_EventScript_14FAFA:: @ 814FAFA - trainerbattle 0, OPPONENT_DALE, 0, Route110_Text_1BA913, Route110_Text_1BA93C + trainerbattle 0, TRAINER_DALE, 0, Route110_Text_1BA913, Route110_Text_1BA93C msgbox Route110_Text_1BA94A, 6 end Route110_EventScript_14FB11:: @ 814FB11 - trainerbattle 0, OPPONENT_JACOB, 0, Route110_Text_1BA22C, Route110_Text_1BA264 + trainerbattle 0, TRAINER_JACOB, 0, Route110_Text_1BA22C, Route110_Text_1BA264 msgbox Route110_Text_1BA27C, 6 end Route110_EventScript_14FB28:: @ 814FB28 - trainerbattle 0, OPPONENT_ANTHONY, 0, Route110_Text_1BA2D4, Route110_Text_1BA2FC + trainerbattle 0, TRAINER_ANTHONY, 0, Route110_Text_1BA2D4, Route110_Text_1BA2FC msgbox Route110_Text_1BA30C, 6 end Route110_EventScript_14FB3F:: @ 814FB3F - trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 + trainerbattle 0, TRAINER_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FB66 @@ -212,17 +212,17 @@ Route110_EventScript_14FB3F:: @ 814FB3F end Route110_EventScript_14FB66:: @ 814FB66 - trainerbattle 5, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA3EF, Route110_Text_1BA432 + trainerbattle 5, TRAINER_BENJAMIN_1, 0, Route110_Text_1BA3EF, Route110_Text_1BA432 msgbox Route110_Text_1BA456, 6 end Route110_EventScript_14FB7D:: @ 814FB7D - trainerbattle 0, OPPONENT_JASMINE, 0, Route110_Text_1BA5FF, Route110_Text_1BA63C + trainerbattle 0, TRAINER_JASMINE, 0, Route110_Text_1BA5FF, Route110_Text_1BA63C msgbox Route110_Text_1BA65F, 6 end Route110_EventScript_14FB94:: @ 814FB94 - trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F + trainerbattle 0, TRAINER_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FBBB @@ -230,12 +230,12 @@ Route110_EventScript_14FB94:: @ 814FB94 end Route110_EventScript_14FBBB:: @ 814FBBB - trainerbattle 5, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA573, Route110_Text_1BA5A1 + trainerbattle 5, TRAINER_ABIGAIL_1, 0, Route110_Text_1BA573, Route110_Text_1BA5A1 msgbox Route110_Text_1BA5C4, 6 end Route110_EventScript_14FBD2:: @ 814FBD2 - trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 + trainerbattle 0, TRAINER_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FBF9 @@ -243,12 +243,12 @@ Route110_EventScript_14FBD2:: @ 814FBD2 end Route110_EventScript_14FBF9:: @ 814FBF9 - trainerbattle 5, OPPONENT_ISABEL_1, 0, Route110_Text_1BAA2D, Route110_Text_1BAA76 + trainerbattle 5, TRAINER_ISABEL_1, 0, Route110_Text_1BAA2D, Route110_Text_1BAA76 msgbox Route110_Text_1BAA8F, 6 end Route110_EventScript_14FC10:: @ 814FC10 - trainerbattle 0, OPPONENT_TIMMY, 0, Route110_Text_1BAAC3, Route110_Text_1BAAF7 + trainerbattle 0, TRAINER_TIMMY, 0, Route110_Text_1BAAC3, Route110_Text_1BAAF7 msgbox Route110_Text_1BAB19, 6 end @@ -368,17 +368,17 @@ Route110_EventScript_14FDB1:: @ 814FDB1 end Route110_EventScript_14FDE0:: @ 814FDE0 - trainerbattle 3, OPPONENT_MAY_5, 0, Route110_Text_16E826 + trainerbattle 3, TRAINER_MAY_5, 0, Route110_Text_16E826 goto Route110_EventScript_14FE10 end Route110_EventScript_14FDF0:: @ 814FDF0 - trainerbattle 3, OPPONENT_MAY_8, 0, Route110_Text_16E826 + trainerbattle 3, TRAINER_MAY_8, 0, Route110_Text_16E826 goto Route110_EventScript_14FE10 end Route110_EventScript_14FE00:: @ 814FE00 - trainerbattle 3, OPPONENT_MAY_2, 0, Route110_Text_16E826 + trainerbattle 3, TRAINER_MAY_2, 0, Route110_Text_16E826 goto Route110_EventScript_14FE10 end @@ -398,17 +398,17 @@ Route110_EventScript_14FE2B:: @ 814FE2B end Route110_EventScript_14FE5A:: @ 814FE5A - trainerbattle 3, OPPONENT_BRENDAN_5, 0, Route110_Text_16EA0F + trainerbattle 3, TRAINER_BRENDAN_5, 0, Route110_Text_16EA0F goto Route110_EventScript_14FE8A end Route110_EventScript_14FE6A:: @ 814FE6A - trainerbattle 3, OPPONENT_BRENDAN_8, 0, Route110_Text_16EA0F + trainerbattle 3, TRAINER_BRENDAN_8, 0, Route110_Text_16EA0F goto Route110_EventScript_14FE8A end Route110_EventScript_14FE7A:: @ 814FE7A - trainerbattle 3, OPPONENT_BRENDAN_2, 0, Route110_Text_16EA0F + trainerbattle 3, TRAINER_BRENDAN_2, 0, Route110_Text_16EA0F goto Route110_EventScript_14FE8A end diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index df0484baf..547160a92 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -24,16 +24,16 @@ Route110_TrickHousePuzzle1_EventScript_161D26:: @ 8161D26 end Route110_TrickHousePuzzle1_EventScript_161D31:: @ 8161D31 - trainerbattle 0, OPPONENT_SALLY, 0, Route110_TrickHousePuzzle1_Text_19CB4F, Route110_TrickHousePuzzle1_Text_19CB93 + trainerbattle 0, TRAINER_SALLY, 0, Route110_TrickHousePuzzle1_Text_19CB4F, Route110_TrickHousePuzzle1_Text_19CB93 msgbox Route110_TrickHousePuzzle1_Text_19CBAB, 6 end Route110_TrickHousePuzzle1_EventScript_161D48:: @ 8161D48 - trainerbattle 0, OPPONENT_EDDIE, 0, Route110_TrickHousePuzzle1_Text_19CBD6, Route110_TrickHousePuzzle1_Text_19CC06 + trainerbattle 0, TRAINER_EDDIE, 0, Route110_TrickHousePuzzle1_Text_19CBD6, Route110_TrickHousePuzzle1_Text_19CC06 msgbox Route110_TrickHousePuzzle1_Text_19CC1B, 6 end Route110_TrickHousePuzzle1_EventScript_161D5F:: @ 8161D5F - trainerbattle 0, OPPONENT_ROBIN, 0, Route110_TrickHousePuzzle1_Text_19CC68, Route110_TrickHousePuzzle1_Text_19CC86 + trainerbattle 0, TRAINER_ROBIN, 0, Route110_TrickHousePuzzle1_Text_19CC68, Route110_TrickHousePuzzle1_Text_19CC86 msgbox Route110_TrickHousePuzzle1_Text_19CCAA, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index cdde15d1a..b8e00f385 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -90,16 +90,16 @@ Route110_TrickHousePuzzle2_EventScript_161E65:: @ 8161E65 return Route110_TrickHousePuzzle2_EventScript_161E78:: @ 8161E78 - trainerbattle 0, OPPONENT_TED, 0, Route110_TrickHousePuzzle2_Text_19CD46, Route110_TrickHousePuzzle2_Text_19CD66 + trainerbattle 0, TRAINER_TED, 0, Route110_TrickHousePuzzle2_Text_19CD46, Route110_TrickHousePuzzle2_Text_19CD66 msgbox Route110_TrickHousePuzzle2_Text_19CD91, 6 end Route110_TrickHousePuzzle2_EventScript_161E8F:: @ 8161E8F - trainerbattle 0, OPPONENT_PAUL, 0, Route110_TrickHousePuzzle2_Text_19CDBF, Route110_TrickHousePuzzle2_Text_19CDF0 + trainerbattle 0, TRAINER_PAUL, 0, Route110_TrickHousePuzzle2_Text_19CDBF, Route110_TrickHousePuzzle2_Text_19CDF0 msgbox Route110_TrickHousePuzzle2_Text_19CE0D, 6 end Route110_TrickHousePuzzle2_EventScript_161EA6:: @ 8161EA6 - trainerbattle 0, OPPONENT_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_19CE52, Route110_TrickHousePuzzle2_Text_19CE98 + trainerbattle 0, TRAINER_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_19CE52, Route110_TrickHousePuzzle2_Text_19CE98 msgbox Route110_TrickHousePuzzle2_Text_19CEB8, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index 14a021e8d..0bb582c5d 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -381,16 +381,16 @@ Route110_TrickHousePuzzle3_EventScript_1626FD:: @ 81626FD end Route110_TrickHousePuzzle3_EventScript_162708:: @ 8162708 - trainerbattle 0, OPPONENT_JUSTIN, 0, Route110_TrickHousePuzzle3_Text_19CF76, Route110_TrickHousePuzzle3_Text_19CF9D + trainerbattle 0, TRAINER_JUSTIN, 0, Route110_TrickHousePuzzle3_Text_19CF76, Route110_TrickHousePuzzle3_Text_19CF9D msgbox Route110_TrickHousePuzzle3_Text_19CFE6, 6 end Route110_TrickHousePuzzle3_EventScript_16271F:: @ 816271F - trainerbattle 0, OPPONENT_MARTHA, 0, Route110_TrickHousePuzzle3_Text_19D026, Route110_TrickHousePuzzle3_Text_19D065 + trainerbattle 0, TRAINER_MARTHA, 0, Route110_TrickHousePuzzle3_Text_19D026, Route110_TrickHousePuzzle3_Text_19D065 msgbox Route110_TrickHousePuzzle3_Text_19D07A, 6 end Route110_TrickHousePuzzle3_EventScript_162736:: @ 8162736 - trainerbattle 0, OPPONENT_ALAN, 0, Route110_TrickHousePuzzle3_Text_19D0AE, Route110_TrickHousePuzzle3_Text_19D0F0 + trainerbattle 0, TRAINER_ALAN, 0, Route110_TrickHousePuzzle3_Text_19D0AE, Route110_TrickHousePuzzle3_Text_19D0F0 msgbox Route110_TrickHousePuzzle3_Text_19D110, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc index 3808f1f2d..606697070 100644 --- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -14,16 +14,16 @@ Route110_TrickHousePuzzle4_EventScript_162760:: @ 8162760 end Route110_TrickHousePuzzle4_EventScript_16276B:: @ 816276B - trainerbattle 0, OPPONENT_CORA, 0, Route110_TrickHousePuzzle4_Text_19D1DE, Route110_TrickHousePuzzle4_Text_19D21F + trainerbattle 0, TRAINER_CORA, 0, Route110_TrickHousePuzzle4_Text_19D1DE, Route110_TrickHousePuzzle4_Text_19D21F msgbox Route110_TrickHousePuzzle4_Text_19D253, 6 end Route110_TrickHousePuzzle4_EventScript_162782:: @ 8162782 - trainerbattle 0, OPPONENT_YUJI, 0, Route110_TrickHousePuzzle4_Text_19D295, Route110_TrickHousePuzzle4_Text_19D2D1 + trainerbattle 0, TRAINER_YUJI, 0, Route110_TrickHousePuzzle4_Text_19D295, Route110_TrickHousePuzzle4_Text_19D2D1 msgbox Route110_TrickHousePuzzle4_Text_19D306, 6 end Route110_TrickHousePuzzle4_EventScript_162799:: @ 8162799 - trainerbattle 0, OPPONENT_JILL, 0, Route110_TrickHousePuzzle4_Text_19D351, Route110_TrickHousePuzzle4_Text_19D380 + trainerbattle 0, TRAINER_JILL, 0, Route110_TrickHousePuzzle4_Text_19D351, Route110_TrickHousePuzzle4_Text_19D380 msgbox Route110_TrickHousePuzzle4_Text_19D386, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 971d2a275..3378dc50b 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -28,16 +28,16 @@ Route110_TrickHousePuzzle6_EventScript_1630FC:: @ 81630FC end Route110_TrickHousePuzzle6_EventScript_163107:: @ 8163107 - trainerbattle 0, OPPONENT_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_19DC87, Route110_TrickHousePuzzle6_Text_19DCC6 + trainerbattle 0, TRAINER_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_19DC87, Route110_TrickHousePuzzle6_Text_19DCC6 msgbox Route110_TrickHousePuzzle6_Text_19DCE7, 6 end Route110_TrickHousePuzzle6_EventScript_16311E:: @ 816311E - trainerbattle 0, OPPONENT_BENNY, 0, Route110_TrickHousePuzzle6_Text_19DD49, Route110_TrickHousePuzzle6_Text_19DD83 + trainerbattle 0, TRAINER_BENNY, 0, Route110_TrickHousePuzzle6_Text_19DD49, Route110_TrickHousePuzzle6_Text_19DD83 msgbox Route110_TrickHousePuzzle6_Text_19DD96, 6 end Route110_TrickHousePuzzle6_EventScript_163135:: @ 8163135 - trainerbattle 0, OPPONENT_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_19DDCF, Route110_TrickHousePuzzle6_Text_19DDFE + trainerbattle 0, TRAINER_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_19DDCF, Route110_TrickHousePuzzle6_Text_19DDFE msgbox Route110_TrickHousePuzzle6_Text_19DE44, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 1ee608166..43bce5ceb 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -219,16 +219,16 @@ Route110_TrickHousePuzzle7_EventScript_1633D1:: @ 81633D1 end Route110_TrickHousePuzzle7_EventScript_1633D6:: @ 81633D6 - trainerbattle 0, OPPONENT_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_19DF0B, Route110_TrickHousePuzzle7_Text_19DF4B + trainerbattle 0, TRAINER_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_19DF0B, Route110_TrickHousePuzzle7_Text_19DF4B msgbox Route110_TrickHousePuzzle7_Text_19DF7E, 6 end Route110_TrickHousePuzzle7_EventScript_1633ED:: @ 81633ED - trainerbattle 0, OPPONENT_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_19DFBB, Route110_TrickHousePuzzle7_Text_19DFF2 + trainerbattle 0, TRAINER_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_19DFBB, Route110_TrickHousePuzzle7_Text_19DFF2 msgbox Route110_TrickHousePuzzle7_Text_19E00F, 6 end Route110_TrickHousePuzzle7_EventScript_163404:: @ 8163404 - trainerbattle 0, OPPONENT_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_19E054, Route110_TrickHousePuzzle7_Text_19E098 + trainerbattle 0, TRAINER_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_19E054, Route110_TrickHousePuzzle7_Text_19E098 msgbox Route110_TrickHousePuzzle7_Text_19E0B2, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc index 2c55aae4c..182f3d68a 100644 --- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -14,16 +14,16 @@ Route110_TrickHousePuzzle8_EventScript_16342E:: @ 816342E end Route110_TrickHousePuzzle8_EventScript_163439:: @ 8163439 - trainerbattle 0, OPPONENT_VINCENT, 0, Route110_TrickHousePuzzle8_Text_19E178, Route110_TrickHousePuzzle8_Text_19E1A1 + trainerbattle 0, TRAINER_VINCENT, 0, Route110_TrickHousePuzzle8_Text_19E178, Route110_TrickHousePuzzle8_Text_19E1A1 msgbox Route110_TrickHousePuzzle8_Text_19E1C5, 6 end Route110_TrickHousePuzzle8_EventScript_163450:: @ 8163450 - trainerbattle 0, OPPONENT_ELAINE, 0, Route110_TrickHousePuzzle8_Text_19E201, Route110_TrickHousePuzzle8_Text_19E22C + trainerbattle 0, TRAINER_ELAINE, 0, Route110_TrickHousePuzzle8_Text_19E201, Route110_TrickHousePuzzle8_Text_19E22C msgbox Route110_TrickHousePuzzle8_Text_19E24C, 6 end Route110_TrickHousePuzzle8_EventScript_163467:: @ 8163467 - trainerbattle 0, OPPONENT_LEROY, 0, Route110_TrickHousePuzzle8_Text_19E284, Route110_TrickHousePuzzle8_Text_19E2C1 + trainerbattle 0, TRAINER_LEROY, 0, Route110_TrickHousePuzzle8_Text_19E284, Route110_TrickHousePuzzle8_Text_19E2C1 msgbox Route110_TrickHousePuzzle8_Text_19E2EE, 6 end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index e554de5f4..9aa8894f4 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -15,7 +15,7 @@ Route111_EventScript_14FFA6:: @ 814FFA6 Route111_MapScript1_14FFB9:: @ 814FFB9 call Route111_EventScript_14FFCD call Route111_EventScript_1AE313 - goto_if_trainer_not_defeated OPPONENT_VICKY, Route111_EventScript_15000D + goto_if_trainer_not_defeated TRAINER_VICKY, Route111_EventScript_15000D end Route111_EventScript_14FFCD:: @ 814FFCD @@ -42,9 +42,9 @@ Route111_EventScript_15000D:: @ 815000D setflag FLAG_HIDE_VICTORIA_WINSTRATE setflag FLAG_HIDE_VIVI_WINSTRATE setflag FLAG_HIDE_VICKI_WINSTRATE - cleartrainerflag OPPONENT_VICTOR - cleartrainerflag OPPONENT_VICTORIA - cleartrainerflag OPPONENT_VIVI + cleartrainerflag TRAINER_VICTOR + cleartrainerflag TRAINER_VICTORIA + cleartrainerflag TRAINER_VIVI end Route111_EventScript_150023:: @ 8150023 @@ -243,7 +243,7 @@ Route111_EventScript_1501D1:: @ 81501D1 Route111_EventScript_1501F3:: @ 81501F3 msgbox Route111_Text_16F7B3, 4 - trainerbattle 3, OPPONENT_VICTOR, 0, Route111_Text_16F7D2 + trainerbattle 3, TRAINER_VICTOR, 0, Route111_Text_16F7D2 applymovement 1, Route111_Movement_1A0841 waitmovement 0 call Route111_EventScript_150348 @@ -261,7 +261,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F82D, 4 - trainerbattle 3, OPPONENT_VICTORIA, 0, Route111_Text_16F8A6 + trainerbattle 3, TRAINER_VICTORIA, 0, Route111_Text_16F8A6 applymovement 2, Route111_Movement_1A0841 waitmovement 0 call Route111_EventScript_150348 @@ -279,7 +279,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F90E, 4 - trainerbattle 3, OPPONENT_VIVI, 0, Route111_Text_16F956 + trainerbattle 3, TRAINER_VIVI, 0, Route111_Text_16F956 applymovement 3, Route111_Movement_1A0841 waitmovement 0 call Route111_EventScript_150348 @@ -297,7 +297,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F991, 4 - trainerbattle 3, OPPONENT_VICKY, 0, Route111_Text_16F9EC + trainerbattle 3, TRAINER_VICKY, 0, Route111_Text_16F9EC msgbox Route111_Text_16FA22, 4 closemessage applymovement 4, Route111_Movement_1A0841 @@ -368,27 +368,27 @@ Route111_EventScript_15039E:: @ 815039E end Route111_EventScript_1503A7:: @ 81503A7 - trainerbattle 0, OPPONENT_DREW, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7 + trainerbattle 0, TRAINER_DREW, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7 msgbox Route111_Text_1BAC10, 6 end Route111_EventScript_1503BE:: @ 81503BE - trainerbattle 0, OPPONENT_HEIDI, 0, Route111_Text_1BAC60, Route111_Text_1BACC5 + trainerbattle 0, TRAINER_HEIDI, 0, Route111_Text_1BAC60, Route111_Text_1BACC5 msgbox Route111_Text_1BACD8, 6 end Route111_EventScript_1503D5:: @ 81503D5 - trainerbattle 0, OPPONENT_CLIFF, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3 + trainerbattle 0, TRAINER_CLIFF, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3 msgbox Route111_Text_1BADC2, 6 end Route111_EventScript_1503EC:: @ 81503EC - trainerbattle 0, OPPONENT_BECKY, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E + trainerbattle 0, TRAINER_BECKY, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E msgbox Route111_Text_1BAE81, 6 end Route111_EventScript_150403:: @ 8150403 - trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 + trainerbattle 0, TRAINER_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_15042A @@ -396,27 +396,27 @@ Route111_EventScript_150403:: @ 8150403 end Route111_EventScript_15042A:: @ 815042A - trainerbattle 5, OPPONENT_DUSTY_1, 0, Route111_Text_1BAFC1, Route111_Text_1BB034 + trainerbattle 5, TRAINER_DUSTY_1, 0, Route111_Text_1BAFC1, Route111_Text_1BB034 msgbox Route111_Text_1BB070, 6 end Route111_EventScript_150441:: @ 8150441 - trainerbattle 0, OPPONENT_TRAVIS, 0, Route111_Text_1BB111, Route111_Text_1BB140 + trainerbattle 0, TRAINER_TRAVIS, 0, Route111_Text_1BB111, Route111_Text_1BB140 msgbox Route111_Text_1BB15B, 6 end Route111_EventScript_150458:: @ 8150458 - trainerbattle 0, OPPONENT_IRENE, 0, Route111_Text_1BB199, Route111_Text_1BB1D8 + trainerbattle 0, TRAINER_IRENE, 0, Route111_Text_1BB199, Route111_Text_1BB1D8 msgbox Route111_Text_1BB1F6, 6 end Route111_EventScript_15046F:: @ 815046F - trainerbattle 0, OPPONENT_DAISUKE, 0, Route111_Text_1BB250, Route111_Text_1BB27E + trainerbattle 0, TRAINER_DAISUKE, 0, Route111_Text_1BB250, Route111_Text_1BB27E msgbox Route111_Text_1BB290, 6 end Route111_EventScript_150486:: @ 8150486 - trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 + trainerbattle 0, TRAINER_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_1504AD @@ -424,12 +424,12 @@ Route111_EventScript_150486:: @ 8150486 end Route111_EventScript_1504AD:: @ 81504AD - trainerbattle 5, OPPONENT_WILTON_1, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA + trainerbattle 5, TRAINER_WILTON_1, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA msgbox Route111_Text_1BB40E, 6 end Route111_EventScript_1504C4:: @ 81504C4 - trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F + trainerbattle 0, TRAINER_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_1504EB @@ -437,6 +437,6 @@ Route111_EventScript_1504C4:: @ 81504C4 end Route111_EventScript_1504EB:: @ 81504EB - trainerbattle 5, OPPONENT_BROOKE_1, 0, Route111_Text_1BB529, Route111_Text_1BB5A2 + trainerbattle 5, TRAINER_BROOKE_1, 0, Route111_Text_1BB529, Route111_Text_1BB5A2 msgbox Route111_Text_1BB5C1, 6 end diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 83d93f222..8e3f73fc0 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -32,12 +32,12 @@ Route112_EventScript_150540:: @ 8150540 end Route112_EventScript_150549:: @ 8150549 - trainerbattle 0, OPPONENT_BRICE, 0, Route112_Text_1BB619, Route112_Text_1BB655 + trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_1BB619, Route112_Text_1BB655 msgbox Route112_Text_1BB667, 6 end Route112_EventScript_150560:: @ 8150560 - trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 + trainerbattle 0, TRAINER_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route112_EventScript_150587 @@ -45,16 +45,16 @@ Route112_EventScript_150560:: @ 8150560 end Route112_EventScript_150587:: @ 8150587 - trainerbattle 5, OPPONENT_TRENT_1, 0, Route112_Text_1BB7C7, Route112_Text_1BB801 + trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_1BB7C7, Route112_Text_1BB801 msgbox Route112_Text_1BB819, 6 end Route112_EventScript_15059E:: @ 815059E - trainerbattle 0, OPPONENT_LARRY, 0, Route112_Text_1BB893, Route112_Text_1BB8B6 + trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_1BB893, Route112_Text_1BB8B6 msgbox Route112_Text_1BB8BE, 6 end Route112_EventScript_1505B5:: @ 81505B5 - trainerbattle 0, OPPONENT_CAROL, 0, Route112_Text_1BB8F0, Route112_Text_1BB942 + trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_1BB8F0, Route112_Text_1BB942 msgbox Route112_Text_1BB958, 6 end diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 41b289db0..5b44f2442 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -49,17 +49,17 @@ Route113_EventScript_150632:: @ 8150632 end Route113_EventScript_15063B:: @ 815063B - trainerbattle 0, OPPONENT_NEAL, 0, Route113_Text_1BB9BA, Route113_Text_1BB9E6 + trainerbattle 0, TRAINER_NEAL, 0, Route113_Text_1BB9BA, Route113_Text_1BB9E6 msgbox Route113_Text_1BB9FB, 6 end Route113_EventScript_150652:: @ 8150652 - trainerbattle 0, OPPONENT_DILLON, 0, Route113_Text_1BBA62, Route113_Text_1BBA9B + trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_1BBA62, Route113_Text_1BBA9B msgbox Route113_Text_1BBAB7, 6 end Route113_EventScript_150669:: @ 8150669 - trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A + trainerbattle 0, TRAINER_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route113_EventScript_150690 @@ -67,12 +67,12 @@ Route113_EventScript_150669:: @ 8150669 end Route113_EventScript_150690:: @ 8150690 - trainerbattle 5, OPPONENT_MADELINE_1, 0, Route113_Text_1BBBCE, Route113_Text_1BBC0D + trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_1BBBCE, Route113_Text_1BBC0D msgbox Route113_Text_1BBC1C, 6 end Route113_EventScript_1506A7:: @ 81506A7 - trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 + trainerbattle 0, TRAINER_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route113_EventScript_1506CE @@ -80,21 +80,21 @@ Route113_EventScript_1506A7:: @ 81506A7 end Route113_EventScript_1506CE:: @ 81506CE - trainerbattle 5, OPPONENT_LAO_1, 0, Route113_Text_1BBCE6, Route113_Text_1BBD1D + trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_1BBCE6, Route113_Text_1BBD1D msgbox Route113_Text_1BBD38, 6 end Route113_EventScript_1506E5:: @ 81506E5 - trainerbattle 0, OPPONENT_LUNG, 0, Route113_Text_1BBD92, Route113_Text_1BBDC6 + trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_1BBD92, Route113_Text_1BBDC6 msgbox Route113_Text_1BBE1D, 6 end Route113_EventScript_1506FC:: @ 81506FC - trainerbattle 4, OPPONENT_TORI_AND_TIA, 0, Route113_Text_1BBE65, Route113_Text_1BBEA1, Route113_Text_1BBF25 + trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_1BBE65, Route113_Text_1BBEA1, Route113_Text_1BBF25 msgbox Route113_Text_1BBEE4, 6 end Route113_EventScript_150717:: @ 8150717 - trainerbattle 4, OPPONENT_TORI_AND_TIA, 0, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021 + trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021 msgbox Route113_Text_1BBFE2, 6 end diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 54a4ee59a..dd5ec1695 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -64,27 +64,27 @@ Route114_EventScript_1507E8:: @ 81507E8 end Route114_EventScript_1507F1:: @ 81507F1 - trainerbattle 0, OPPONENT_LENNY, 0, Route114_Text_1BC05B, Route114_Text_1BC0B5 + trainerbattle 0, TRAINER_LENNY, 0, Route114_Text_1BC05B, Route114_Text_1BC0B5 msgbox Route114_Text_1BC0C3, 6 end Route114_EventScript_150808:: @ 8150808 - trainerbattle 0, OPPONENT_LUCAS_1, 0, Route114_Text_1BC125, Route114_Text_1BC163 + trainerbattle 0, TRAINER_LUCAS_1, 0, Route114_Text_1BC125, Route114_Text_1BC163 msgbox Route114_Text_1BC184, 6 end Route114_EventScript_15081F:: @ 815081F - trainerbattle 0, OPPONENT_SHANE, 0, Route114_Text_1BC1C8, Route114_Text_1BC23F + trainerbattle 0, TRAINER_SHANE, 0, Route114_Text_1BC1C8, Route114_Text_1BC23F msgbox Route114_Text_1BC24F, 6 end Route114_EventScript_150836:: @ 8150836 - trainerbattle 0, OPPONENT_NANCY, 0, Route114_Text_1BC289, Route114_Text_1BC2BE + trainerbattle 0, TRAINER_NANCY, 0, Route114_Text_1BC289, Route114_Text_1BC2BE msgbox Route114_Text_1BC2C6, 6 end Route114_EventScript_15084D:: @ 815084D - trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 + trainerbattle 0, TRAINER_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route114_EventScript_150874 @@ -92,12 +92,12 @@ Route114_EventScript_15084D:: @ 815084D end Route114_EventScript_150874:: @ 8150874 - trainerbattle 5, OPPONENT_STEVE_1, 0, Route114_Text_1BC3B3, Route114_Text_1BC3E0 + trainerbattle 5, TRAINER_STEVE_1, 0, Route114_Text_1BC3B3, Route114_Text_1BC3E0 msgbox Route114_Text_1BC40F, 6 end Route114_EventScript_15088B:: @ 815088B - trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 + trainerbattle 0, TRAINER_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route114_EventScript_1508B2 @@ -105,26 +105,26 @@ Route114_EventScript_15088B:: @ 815088B end Route114_EventScript_1508B2:: @ 81508B2 - trainerbattle 5, OPPONENT_BERNIE_1, 0, Route114_Text_1BC525, Route114_Text_1BC559 + trainerbattle 5, TRAINER_BERNIE_1, 0, Route114_Text_1BC525, Route114_Text_1BC559 msgbox Route114_Text_1BC58C, 6 end Route114_EventScript_1508C9:: @ 81508C9 - trainerbattle 0, OPPONENT_CLAUDE, 0, Route114_Text_1BC5FC, Route114_Text_1BC653 + trainerbattle 0, TRAINER_CLAUDE, 0, Route114_Text_1BC5FC, Route114_Text_1BC653 msgbox Route114_Text_1BC679, 6 end Route114_EventScript_1508E0:: @ 81508E0 - trainerbattle 0, OPPONENT_NOLAN, 0, Route114_Text_1BC6EC, Route114_Text_1BC750 + trainerbattle 0, TRAINER_NOLAN, 0, Route114_Text_1BC6EC, Route114_Text_1BC750 msgbox Route114_Text_1BC78A, 6 end Route114_EventScript_1508F7:: @ 81508F7 - trainerbattle 4, OPPONENT_TYRA_AND_IVY, 0, Route114_Text_1BC7E3, Route114_Text_1BC834, Route114_Text_1BC88A + trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_1BC7E3, Route114_Text_1BC834, Route114_Text_1BC88A msgbox Route114_Text_1BC858, 6 end Route114_EventScript_150912:: @ 8150912 - trainerbattle 4, OPPONENT_TYRA_AND_IVY, 0, Route114_Text_1BC8D8, Route114_Text_1BC8FB, Route114_Text_1BC96A + trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_1BC8D8, Route114_Text_1BC8FB, Route114_Text_1BC96A msgbox Route114_Text_1BC91E, 6 end diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index f16c2088a..9cb3652f1 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -14,7 +14,7 @@ Route115_EventScript_150940:: @ 8150940 end Route115_EventScript_150949:: @ 8150949 - trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 + trainerbattle 0, TRAINER_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_150970 @@ -22,17 +22,17 @@ Route115_EventScript_150949:: @ 8150949 end Route115_EventScript_150970:: @ 8150970 - trainerbattle 5, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BCA6B, Route115_Text_1BCAB3 + trainerbattle 5, TRAINER_TIMOTHY_1, 0, Route115_Text_1BCA6B, Route115_Text_1BCAB3 msgbox Route115_Text_1BCAC6, 6 end Route115_EventScript_150987:: @ 8150987 - trainerbattle 0, OPPONENT_KOICHI, 0, Route115_Text_1BCB0D, Route115_Text_1BCB2E + trainerbattle 0, TRAINER_KOICHI, 0, Route115_Text_1BCB0D, Route115_Text_1BCB2E msgbox Route115_Text_1BCB40, 6 end Route115_EventScript_15099E:: @ 815099E - trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 + trainerbattle 0, TRAINER_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_1509C5 @@ -40,12 +40,12 @@ Route115_EventScript_15099E:: @ 815099E end Route115_EventScript_1509C5:: @ 81509C5 - trainerbattle 5, OPPONENT_NOB_1, 0, Route115_Text_1BCC4C, Route115_Text_1BCCA2 + trainerbattle 5, TRAINER_NOB_1, 0, Route115_Text_1BCC4C, Route115_Text_1BCCA2 msgbox Route115_Text_1BCCBA, 6 end Route115_EventScript_1509DC:: @ 81509DC - trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 + trainerbattle 0, TRAINER_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_150A03 @@ -53,16 +53,16 @@ Route115_EventScript_1509DC:: @ 81509DC end Route115_EventScript_150A03:: @ 8150A03 - trainerbattle 5, OPPONENT_CYNDY_1, 0, Route115_Text_1BCDB0, Route115_Text_1BCDD0 + trainerbattle 5, TRAINER_CYNDY_1, 0, Route115_Text_1BCDB0, Route115_Text_1BCDD0 msgbox Route115_Text_1BCDEF, 6 end Route115_EventScript_150A1A:: @ 8150A1A .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_514, 0, UnknownString_81BCE47, UnknownString_81BCE7D + trainerbattle 0, TRAINER_514, 0, UnknownString_81BCE47, UnknownString_81BCE7D msgbox UnknownString_81BCEA4, 6 .else - trainerbattle 0, OPPONENT_514, 0, Route115_Text_1BCEE0, Route115_Text_1BCF16 + trainerbattle 0, TRAINER_514, 0, Route115_Text_1BCEE0, Route115_Text_1BCF16 msgbox Route115_Text_1BCF3D, 6 .endc end diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 77fbf57a4..284ce3363 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -225,17 +225,17 @@ Route116_Movement_150C57:: @ 8150C57 end_movement Route116_EventScript_150C62:: @ 8150C62 - trainerbattle 0, OPPONENT_JOEY, 0, Route116_Text_1BD02B, Route116_Text_1BD04C + trainerbattle 0, TRAINER_JOEY, 0, Route116_Text_1BD02B, Route116_Text_1BD04C msgbox Route116_Text_1BD078, 6 end Route116_EventScript_150C79:: @ 8150C79 - trainerbattle 0, OPPONENT_JOSE, 0, Route116_Text_1BD0AF, Route116_Text_1BD0D7 + trainerbattle 0, TRAINER_JOSE, 0, Route116_Text_1BD0AF, Route116_Text_1BD0D7 msgbox Route116_Text_1BD0F4, 6 end Route116_EventScript_150C90:: @ 8150C90 - trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A + trainerbattle 0, TRAINER_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route116_EventScript_150CB7 @@ -243,22 +243,22 @@ Route116_EventScript_150C90:: @ 8150C90 end Route116_EventScript_150CB7:: @ 8150CB7 - trainerbattle 5, OPPONENT_JERRY_1, 0, Route116_Text_1BD2A5, Route116_Text_1BD2FE + trainerbattle 5, TRAINER_JERRY_1, 0, Route116_Text_1BD2A5, Route116_Text_1BD2FE msgbox Route116_Text_1BD31A, 6 end Route116_EventScript_150CCE:: @ 8150CCE - trainerbattle 0, OPPONENT_CLARK, 0, Route116_Text_1BCF79, Route116_Text_1BCFBB + trainerbattle 0, TRAINER_CLARK, 0, Route116_Text_1BCF79, Route116_Text_1BCFBB msgbox Route116_Text_1BCFE3, 6 end Route116_EventScript_150CE5:: @ 8150CE5 - trainerbattle 0, OPPONENT_JANICE, 0, Route116_Text_1BD131, Route116_Text_1BD165 + trainerbattle 0, TRAINER_JANICE, 0, Route116_Text_1BD131, Route116_Text_1BD165 msgbox Route116_Text_1BD180, 6 end Route116_EventScript_150CFC:: @ 8150CFC - trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC + trainerbattle 0, TRAINER_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route116_EventScript_150D23 @@ -266,6 +266,6 @@ Route116_EventScript_150CFC:: @ 8150CFC end Route116_EventScript_150D23:: @ 8150D23 - trainerbattle 5, OPPONENT_KAREN_1, 0, Route116_Text_1BD405, Route116_Text_1BD44A + trainerbattle 5, TRAINER_KAREN_1, 0, Route116_Text_1BD405, Route116_Text_1BD44A msgbox Route116_Text_1BD466, 6 end diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 9f42412ab..3c5bc8a66 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -38,7 +38,7 @@ Route117_EventScript_150D84:: @ 8150D84 end Route117_EventScript_150D8D:: @ 8150D8D - trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 + trainerbattle 0, TRAINER_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150DB4 @@ -46,12 +46,12 @@ Route117_EventScript_150D8D:: @ 8150D8D end Route117_EventScript_150DB4:: @ 8150DB4 - trainerbattle 5, OPPONENT_ISAAC_1, 0, Route117_Text_1BD569, Route117_Text_1BD5AB + trainerbattle 5, TRAINER_ISAAC_1, 0, Route117_Text_1BD569, Route117_Text_1BD5AB msgbox Route117_Text_1BD5F2, 6 end Route117_EventScript_150DCB:: @ 8150DCB - trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B + trainerbattle 0, TRAINER_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150DF2 @@ -59,12 +59,12 @@ Route117_EventScript_150DCB:: @ 8150DCB end Route117_EventScript_150DF2:: @ 8150DF2 - trainerbattle 5, OPPONENT_LYDIA_1, 0, Route117_Text_1BD6F2, Route117_Text_1BD733 + trainerbattle 5, TRAINER_LYDIA_1, 0, Route117_Text_1BD6F2, Route117_Text_1BD733 msgbox Route117_Text_1BD74F, 6 end Route117_EventScript_150E09:: @ 8150E09 - trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 + trainerbattle 0, TRAINER_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150E30 @@ -72,12 +72,12 @@ Route117_EventScript_150E09:: @ 8150E09 end Route117_EventScript_150E30:: @ 8150E30 - trainerbattle 5, OPPONENT_DYLAN_1, 0, Route117_Text_1BD83F, Route117_Text_1BD8A2 + trainerbattle 5, TRAINER_DYLAN_1, 0, Route117_Text_1BD83F, Route117_Text_1BD8A2 msgbox Route117_Text_1BD8BD, 6 end Route117_EventScript_150E47:: @ 8150E47 - trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 + trainerbattle 0, TRAINER_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150E6E @@ -85,17 +85,17 @@ Route117_EventScript_150E47:: @ 8150E47 end Route117_EventScript_150E6E:: @ 8150E6E - trainerbattle 5, OPPONENT_MARIA_1, 0, Route117_Text_1BD9F1, Route117_Text_1BDA41 + trainerbattle 5, TRAINER_MARIA_1, 0, Route117_Text_1BD9F1, Route117_Text_1BDA41 msgbox Route117_Text_1BDA6B, 6 end Route117_EventScript_150E85:: @ 8150E85 - trainerbattle 0, OPPONENT_DEREK, 0, Route117_Text_1BDAA7, Route117_Text_1BDAFC + trainerbattle 0, TRAINER_DEREK, 0, Route117_Text_1BDAA7, Route117_Text_1BDAFC msgbox Route117_Text_1BDB24, 6 end Route117_EventScript_150E9C:: @ 8150E9C - trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 + trainerbattle 4, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150EC7 @@ -103,12 +103,12 @@ Route117_EventScript_150E9C:: @ 8150E9C end Route117_EventScript_150EC7:: @ 8150EC7 - trainerbattle 7, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDDEF, Route117_Text_1BDE2F, Route117_Text_1BDEA7 + trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDDEF, Route117_Text_1BDE2F, Route117_Text_1BDEA7 msgbox Route117_Text_1BDE55, 6 end Route117_EventScript_150EE2:: @ 8150EE2 - trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B + trainerbattle 4, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150F0D @@ -116,6 +116,6 @@ Route117_EventScript_150EE2:: @ 8150EE2 end Route117_EventScript_150F0D:: @ 8150F0D - trainerbattle 7, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDEE3, Route117_Text_1BDF26, Route117_Text_1BDF90 + trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDEE3, Route117_Text_1BDF26, Route117_Text_1BDF90 msgbox Route117_Text_1BDF37, 6 end diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index b938d0cc2..850d9138d 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -159,7 +159,7 @@ Route118_Movement_151086:: @ 8151086 end_movement Route118_EventScript_15108F:: @ 815108F - trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C + trainerbattle 0, TRAINER_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route118_EventScript_1510B6 @@ -167,22 +167,22 @@ Route118_EventScript_15108F:: @ 815108F end Route118_EventScript_1510B6:: @ 81510B6 - trainerbattle 5, OPPONENT_ROSE_1, 0, Route118_Text_1BE0AB, Route118_Text_1BE0D3 + trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_1BE0AB, Route118_Text_1BE0D3 msgbox Route118_Text_1BE104, 6 end Route118_EventScript_1510CD:: @ 81510CD - trainerbattle 0, OPPONENT_BARNY, 0, Route118_Text_1BE24A, Route118_Text_1BE291 + trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_1BE24A, Route118_Text_1BE291 msgbox Route118_Text_1BE2BE, 6 end Route118_EventScript_1510E4:: @ 81510E4 - trainerbattle 0, OPPONENT_WADE, 0, Route118_Text_1BE318, Route118_Text_1BE385 + trainerbattle 0, TRAINER_WADE, 0, Route118_Text_1BE318, Route118_Text_1BE385 msgbox Route118_Text_1BE39C, 6 end Route118_EventScript_1510FB:: @ 81510FB - trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 + trainerbattle 0, TRAINER_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route118_EventScript_151122 @@ -190,16 +190,16 @@ Route118_EventScript_1510FB:: @ 81510FB end Route118_EventScript_151122:: @ 8151122 - trainerbattle 5, OPPONENT_DALTON_1, 0, Route118_Text_1BE489, Route118_Text_1BE4CC + trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_1BE489, Route118_Text_1BE4CC msgbox Route118_Text_1BE4D9, 6 end Route118_EventScript_151139:: @ 8151139 - trainerbattle 0, OPPONENT_PERRY, 0, Route118_Text_1BE148, Route118_Text_1BE188 + trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_1BE148, Route118_Text_1BE188 msgbox Route118_Text_1BE19D, 6 end Route118_EventScript_151150:: @ 8151150 - trainerbattle 0, OPPONENT_CHESTER, 0, Route118_Text_1BE1D7, Route118_Text_1BE1F5 + trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_1BE1D7, Route118_Text_1BE1F5 msgbox Route118_Text_1BE20D, 6 end diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index fe1ef4e45..9874d3098 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -95,17 +95,17 @@ Route119_EventScript_15125E:: @ 815125E end Route119_EventScript_15128D:: @ 815128D - trainerbattle 3, OPPONENT_MAY_6, 0, Route119_Text_171156 + trainerbattle 3, TRAINER_MAY_6, 0, Route119_Text_171156 goto Route119_EventScript_1512BD end Route119_EventScript_15129D:: @ 815129D - trainerbattle 3, OPPONENT_MAY_9, 0, Route119_Text_171156 + trainerbattle 3, TRAINER_MAY_9, 0, Route119_Text_171156 goto Route119_EventScript_1512BD end Route119_EventScript_1512AD:: @ 81512AD - trainerbattle 3, OPPONENT_MAY_3, 0, Route119_Text_171156 + trainerbattle 3, TRAINER_MAY_3, 0, Route119_Text_171156 goto Route119_EventScript_1512BD end @@ -125,17 +125,17 @@ Route119_EventScript_1512D8:: @ 81512D8 end Route119_EventScript_151307:: @ 8151307 - trainerbattle 3, OPPONENT_BRENDAN_6, 0, Route119_Text_1713E2 + trainerbattle 3, TRAINER_BRENDAN_6, 0, Route119_Text_1713E2 goto Route119_EventScript_151337 end Route119_EventScript_151317:: @ 8151317 - trainerbattle 3, OPPONENT_BRENDAN_9, 0, Route119_Text_1713E2 + trainerbattle 3, TRAINER_BRENDAN_9, 0, Route119_Text_1713E2 goto Route119_EventScript_151337 end Route119_EventScript_151327:: @ 8151327 - trainerbattle 3, OPPONENT_BRENDAN_3, 0, Route119_Text_1713E2 + trainerbattle 3, TRAINER_BRENDAN_3, 0, Route119_Text_1713E2 goto Route119_EventScript_151337 end @@ -264,37 +264,37 @@ Route119_EventScript_15142C:: @ 815142C end Route119_EventScript_151435:: @ 8151435 - trainerbattle 0, OPPONENT_BRENT, 0, Route119_Text_1BE521, Route119_Text_1BE54F + trainerbattle 0, TRAINER_BRENT, 0, Route119_Text_1BE521, Route119_Text_1BE54F msgbox Route119_Text_1BE561, 6 end Route119_EventScript_15144C:: @ 815144C - trainerbattle 0, OPPONENT_DONALD, 0, Route119_Text_1BE5A4, Route119_Text_1BE5DF + trainerbattle 0, TRAINER_DONALD, 0, Route119_Text_1BE5A4, Route119_Text_1BE5DF msgbox Route119_Text_1BE5F8, 6 end Route119_EventScript_151463:: @ 8151463 - trainerbattle 0, OPPONENT_TAYLOR, 0, Route119_Text_1BE632, Route119_Text_1BE67B + trainerbattle 0, TRAINER_TAYLOR, 0, Route119_Text_1BE632, Route119_Text_1BE67B msgbox Route119_Text_1BE695, 6 end Route119_EventScript_15147A:: @ 815147A - trainerbattle 0, OPPONENT_DOUG, 0, Route119_Text_1BE6EA, Route119_Text_1BE729 + trainerbattle 0, TRAINER_DOUG, 0, Route119_Text_1BE6EA, Route119_Text_1BE729 msgbox Route119_Text_1BE748, 6 end Route119_EventScript_151491:: @ 8151491 - trainerbattle 0, OPPONENT_GREG, 0, Route119_Text_1BE784, Route119_Text_1BE7D3 + trainerbattle 0, TRAINER_GREG, 0, Route119_Text_1BE784, Route119_Text_1BE7D3 msgbox Route119_Text_1BE7E9, 6 end Route119_EventScript_1514A8:: @ 81514A8 - trainerbattle 0, OPPONENT_KENT, 0, Route119_Text_1BE82F, Route119_Text_1BE88D + trainerbattle 0, TRAINER_KENT, 0, Route119_Text_1BE82F, Route119_Text_1BE88D msgbox Route119_Text_1BE89A, 6 end Route119_EventScript_1514BF:: @ 81514BF - trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E + trainerbattle 0, TRAINER_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route119_EventScript_1514E6 @@ -302,12 +302,12 @@ Route119_EventScript_1514BF:: @ 81514BF end Route119_EventScript_1514E6:: @ 81514E6 - trainerbattle 5, OPPONENT_JACKSON_1, 0, Route119_Text_1BE98D, Route119_Text_1BE9D0 + trainerbattle 5, TRAINER_JACKSON_1, 0, Route119_Text_1BE98D, Route119_Text_1BE9D0 msgbox Route119_Text_1BE9E8, 6 end Route119_EventScript_1514FD:: @ 81514FD - trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 + trainerbattle 0, TRAINER_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route119_EventScript_151524 @@ -315,37 +315,37 @@ Route119_EventScript_1514FD:: @ 81514FD end Route119_EventScript_151524:: @ 8151524 - trainerbattle 5, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEB22, Route119_Text_1BEB49 + trainerbattle 5, TRAINER_CATHERINE_1, 0, Route119_Text_1BEB22, Route119_Text_1BEB49 msgbox Route119_Text_1BEB68, 6 end Route119_EventScript_15153B:: @ 815153B - trainerbattle 0, OPPONENT_HUGH, 0, Route119_Text_1BEBC0, Route119_Text_1BEC1C + trainerbattle 0, TRAINER_HUGH, 0, Route119_Text_1BEBC0, Route119_Text_1BEC1C msgbox Route119_Text_1BEC2A, 6 end Route119_EventScript_151552:: @ 8151552 - trainerbattle 0, OPPONENT_PHIL, 0, Route119_Text_1BEC5E, Route119_Text_1BEC9A + trainerbattle 0, TRAINER_PHIL, 0, Route119_Text_1BEC5E, Route119_Text_1BEC9A msgbox Route119_Text_1BECB1, 6 end Route119_EventScript_151569:: @ 8151569 - trainerbattle 0, OPPONENT_YASU, 0, Route119_Text_1BECF1, Route119_Text_1BED4C + trainerbattle 0, TRAINER_YASU, 0, Route119_Text_1BECF1, Route119_Text_1BED4C msgbox Route119_Text_1BED5C, 6 end Route119_EventScript_151580:: @ 8151580 - trainerbattle 0, OPPONENT_TAKASHI, 0, Route119_Text_1BEDB6, Route119_Text_1BEDEC + trainerbattle 0, TRAINER_TAKASHI, 0, Route119_Text_1BEDB6, Route119_Text_1BEDEC msgbox Route119_Text_1BEE06, 6 end Route119_EventScript_151597:: @ 8151597 - trainerbattle 0, OPPONENT_HIDEO_2, 0, Route119_Text_1BEE2D, Route119_Text_1BEE4B + trainerbattle 0, TRAINER_HIDEO_2, 0, Route119_Text_1BEE2D, Route119_Text_1BEE4B msgbox Route119_Text_1BEE66, 6 end Route119_EventScript_1515AE:: @ 81515AE - trainerbattle 0, OPPONENT_EUGENE, 0, Route119_Text_1BEED0, Route119_Text_1BEF37 + trainerbattle 0, TRAINER_EUGENE, 0, Route119_Text_1BEED0, Route119_Text_1BEF37 msgbox Route119_Text_1BEF67, 6 end diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index e5ca6550b..547241940 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -45,11 +45,11 @@ Route119_WeatherInstitute_1F_EventScript_163C83:: @ 8163C83 end Route119_WeatherInstitute_1F_EventScript_163C94:: @ 8163C94 - trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_1, 0, Route119_WeatherInstitute_1F_Text_19EB8A, Route119_WeatherInstitute_1F_Text_19EBEE + trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_1, 0, Route119_WeatherInstitute_1F_Text_19EB8A, Route119_WeatherInstitute_1F_Text_19EBEE msgbox Route119_WeatherInstitute_1F_Text_19EC0E, 6 end Route119_WeatherInstitute_1F_EventScript_163CAB:: @ 8163CAB - trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_2, 0, Route119_WeatherInstitute_1F_Text_19EC6B, Route119_WeatherInstitute_1F_Text_19EC89 + trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_2, 0, Route119_WeatherInstitute_1F_Text_19EC6B, Route119_WeatherInstitute_1F_Text_19EC89 msgbox Route119_WeatherInstitute_1F_Text_19EC97, 6 end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 0a1a51562..8a8737dad 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -21,17 +21,17 @@ Route119_WeatherInstitute_2F_EventScript_163CF0:: @ 8163CF0 return Route119_WeatherInstitute_2F_EventScript_163CFC:: @ 8163CFC - trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_3, 0, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B + trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_3, 0, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B msgbox Route119_WeatherInstitute_2F_Text_19EF3E, 6 end Route119_WeatherInstitute_2F_EventScript_163D13:: @ 8163D13 - trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_4, 0, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD + trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_4, 0, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD msgbox Route119_WeatherInstitute_2F_Text_19EFE9, 6 end Route119_WeatherInstitute_2F_EventScript_163D2A:: @ 8163D2A - trainerbattle 2, OPPONENT_WEATHER_INSTITUTE_GRUNT_5, 0, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45 + trainerbattle 2, TRAINER_WEATHER_INSTITUTE_GRUNT_5, 0, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45 msgbox Route119_WeatherInstitute_2F_Text_19F11B, 6 end diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 6f561391f..f3081fc8c 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -280,12 +280,12 @@ Route120_EventScript_1519AA:: @ 81519AA end Route120_EventScript_1519B3:: @ 81519B3 - trainerbattle 0, OPPONENT_COLIN, 0, Route120_Text_1BEFC8, Route120_Text_1BF000 + trainerbattle 0, TRAINER_COLIN, 0, Route120_Text_1BEFC8, Route120_Text_1BF000 msgbox Route120_Text_1BF015, 6 end Route120_EventScript_1519CA:: @ 81519CA - trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 + trainerbattle 0, TRAINER_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route120_EventScript_1519F1 @@ -293,22 +293,22 @@ Route120_EventScript_1519CA:: @ 81519CA end Route120_EventScript_1519F1:: @ 81519F1 - trainerbattle 5, OPPONENT_ROBERT_1, 0, Route120_Text_1BF0FA, Route120_Text_1BF131 + trainerbattle 5, TRAINER_ROBERT_1, 0, Route120_Text_1BF0FA, Route120_Text_1BF131 msgbox Route120_Text_1BF154, 6 end Route120_EventScript_151A08:: @ 8151A08 - trainerbattle 0, OPPONENT_CARLOS, 0, Route120_Text_1BF193, Route120_Text_1BF1D4 + trainerbattle 0, TRAINER_CARLOS, 0, Route120_Text_1BF193, Route120_Text_1BF1D4 msgbox Route120_Text_1BF215, 6 end Route120_EventScript_151A1F:: @ 8151A1F - trainerbattle 0, OPPONENT_JENNA, 0, Route120_Text_1BF26E, Route120_Text_1BF2D2 + trainerbattle 0, TRAINER_JENNA, 0, Route120_Text_1BF26E, Route120_Text_1BF2D2 msgbox Route120_Text_1BF2EA, 6 end Route120_EventScript_151A36:: @ 8151A36 - trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B + trainerbattle 0, TRAINER_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route120_EventScript_151A5D @@ -316,36 +316,36 @@ Route120_EventScript_151A36:: @ 8151A36 end Route120_EventScript_151A5D:: @ 8151A5D - trainerbattle 5, OPPONENT_BRANDON_1, 0, Route120_Text_1BF3D0, Route120_Text_1BF416 + trainerbattle 5, TRAINER_BRANDON_1, 0, Route120_Text_1BF3D0, Route120_Text_1BF416 msgbox Route120_Text_1BF43E, 6 end Route120_EventScript_151A74:: @ 8151A74 - trainerbattle 0, OPPONENT_JENNIFER, 0, Route120_Text_1BF4A0, Route120_Text_1BF504 + trainerbattle 0, TRAINER_JENNIFER, 0, Route120_Text_1BF4A0, Route120_Text_1BF504 msgbox Route120_Text_1BF51F, 6 end Route120_EventScript_151A8B:: @ 8151A8B - trainerbattle 0, OPPONENT_CHIP, 0, Route120_Text_1BF560, Route120_Text_1BF5D6 + trainerbattle 0, TRAINER_CHIP, 0, Route120_Text_1BF560, Route120_Text_1BF5D6 msgbox Route120_Text_1BF5F4, 6 end Route120_EventScript_151AA2:: @ 8151AA2 - trainerbattle 0, OPPONENT_CLARISSA, 0, Route120_Text_1BF65B, Route120_Text_1BF6A4 + trainerbattle 0, TRAINER_CLARISSA, 0, Route120_Text_1BF65B, Route120_Text_1BF6A4 msgbox Route120_Text_1BF6D0, 6 end Route120_EventScript_151AB9:: @ 8151AB9 - trainerbattle 0, OPPONENT_ANGELICA, 0, Route120_Text_1BF728, Route120_Text_1BF78C + trainerbattle 0, TRAINER_ANGELICA, 0, Route120_Text_1BF728, Route120_Text_1BF78C msgbox Route120_Text_1BF7B2, 6 end Route120_EventScript_151AD0:: @ 8151AD0 - trainerbattle 0, OPPONENT_KEIGO, 0, Route120_Text_1BF80B, Route120_Text_1BF852 + trainerbattle 0, TRAINER_KEIGO, 0, Route120_Text_1BF80B, Route120_Text_1BF852 msgbox Route120_Text_1BF891, 6 end Route120_EventScript_151AE7:: @ 8151AE7 - trainerbattle 0, OPPONENT_TSUNAO, 0, Route120_Text_1BF8C5, Route120_Text_1BF920 + trainerbattle 0, TRAINER_TSUNAO, 0, Route120_Text_1BF8C5, Route120_Text_1BF920 msgbox Route120_Text_1BF946, 6 end diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 5fe7f6330..d154d3f6b 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -67,12 +67,12 @@ Route121_Movement_151B69:: @ 8151B69 end_movement Route121_EventScript_151B72:: @ 8151B72 - trainerbattle 0, OPPONENT_VANESSA, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1 + trainerbattle 0, TRAINER_VANESSA, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1 msgbox Route121_Text_1BF9BA, 6 end Route121_EventScript_151B89:: @ 8151B89 - trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C + trainerbattle 0, TRAINER_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route121_EventScript_151BB0 @@ -80,27 +80,27 @@ Route121_EventScript_151B89:: @ 8151B89 end Route121_EventScript_151BB0:: @ 8151BB0 - trainerbattle 5, OPPONENT_WALTER_1, 0, Route121_Text_1BFADA, Route121_Text_1BFB4B + trainerbattle 5, TRAINER_WALTER_1, 0, Route121_Text_1BFADA, Route121_Text_1BFB4B msgbox Route121_Text_1BFB5C, 6 end Route121_EventScript_151BC7:: @ 8151BC7 - trainerbattle 0, OPPONENT_TAMMY, 0, Route121_Text_1BFBB4, Route121_Text_1BFBEE + trainerbattle 0, TRAINER_TAMMY, 0, Route121_Text_1BFBB4, Route121_Text_1BFBEE msgbox Route121_Text_1BFBFD, 6 end Route121_EventScript_151BDE:: @ 8151BDE - trainerbattle 4, OPPONENT_KATE_AND_JOY, 0, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08 + trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08 msgbox Route121_Text_1BFCB3, 6 end Route121_EventScript_151BF9:: @ 8151BF9 - trainerbattle 4, OPPONENT_KATE_AND_JOY, 0, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D + trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D msgbox Route121_Text_1BFDC1, 6 end Route121_EventScript_151C14:: @ 8151C14 - trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 + trainerbattle 0, TRAINER_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route121_EventScript_151C3B @@ -108,6 +108,6 @@ Route121_EventScript_151C14:: @ 8151C14 end Route121_EventScript_151C3B:: @ 8151C3B - trainerbattle 5, OPPONENT_JESSICA_1, 0, Route121_Text_1BFEDE, Route121_Text_1BFF0A + trainerbattle 5, TRAINER_JESSICA_1, 0, Route121_Text_1BFEDE, Route121_Text_1BFF0A msgbox Route121_Text_1BFF3A, 6 end diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index d954bec1a..4dda69997 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -45,22 +45,22 @@ Route123_EventScript_151CC8:: @ 8151CC8 end Route123_EventScript_151CD1:: @ 8151CD1 - trainerbattle 0, OPPONENT_WENDY, 0, Route123_Text_1BFF6A, Route123_Text_1BFFA2 + trainerbattle 0, TRAINER_WENDY, 0, Route123_Text_1BFF6A, Route123_Text_1BFFA2 msgbox Route123_Text_1BFFC1, 6 end Route123_EventScript_151CE8:: @ 8151CE8 - trainerbattle 0, OPPONENT_CLYDE, 0, Route123_Text_1BFFF0, Route123_Text_1C0057 + trainerbattle 0, TRAINER_CLYDE, 0, Route123_Text_1BFFF0, Route123_Text_1C0057 msgbox Route123_Text_1C0075, 6 end Route123_EventScript_151CFF:: @ 8151CFF - trainerbattle 0, OPPONENT_VIOLET, 0, Route123_Text_1C009E, Route123_Text_1C00D4 + trainerbattle 0, TRAINER_VIOLET, 0, Route123_Text_1C009E, Route123_Text_1C00D4 msgbox Route123_Text_1C0100, 6 end Route123_EventScript_151D16:: @ 8151D16 - trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 + trainerbattle 0, TRAINER_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route123_EventScript_151D3D @@ -68,12 +68,12 @@ Route123_EventScript_151D16:: @ 8151D16 end Route123_EventScript_151D3D:: @ 8151D3D - trainerbattle 5, OPPONENT_CAMERON_1, 0, Route123_Text_1C01F9, Route123_Text_1C0240 + trainerbattle 5, TRAINER_CAMERON_1, 0, Route123_Text_1C01F9, Route123_Text_1C0240 msgbox Route123_Text_1C024E, 6 end Route123_EventScript_151D54:: @ 8151D54 - trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 + trainerbattle 0, TRAINER_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route123_EventScript_151D7B @@ -81,21 +81,21 @@ Route123_EventScript_151D54:: @ 8151D54 end Route123_EventScript_151D7B:: @ 8151D7B - trainerbattle 5, OPPONENT_JACKI_1, 0, Route123_Text_1C0351, Route123_Text_1C0380 + trainerbattle 5, TRAINER_JACKI_1, 0, Route123_Text_1C0351, Route123_Text_1C0380 msgbox Route123_Text_1C038C, 6 end Route123_EventScript_151D92:: @ 8151D92 - trainerbattle 4, OPPONENT_MIU_AND_YUKI, 0, Route123_Text_1C03CB, Route123_Text_1C040E, Route123_Text_1C0462 + trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_1C03CB, Route123_Text_1C040E, Route123_Text_1C0462 msgbox Route123_Text_1C0423, 6 end Route123_EventScript_151DAD:: @ 8151DAD - trainerbattle 4, OPPONENT_MIU_AND_YUKI, 0, Route123_Text_1C049C, Route123_Text_1C04CD, Route123_Text_1C0519 + trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_1C049C, Route123_Text_1C04CD, Route123_Text_1C0519 msgbox Route123_Text_1C04E3, 6 end Route123_EventScript_151DC8:: @ 8151DC8 - trainerbattle 0, OPPONENT_KINDRA, 0, Route123_Text_1C0554, Route123_Text_1C059F + trainerbattle 0, TRAINER_KINDRA, 0, Route123_Text_1C0554, Route123_Text_1C059F msgbox Route123_Text_1C05BC, 6 end diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 3f02fc6e3..cb42e1944 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -11,17 +11,17 @@ Route124_EventScript_151DEF:: @ 8151DEF end Route124_EventScript_151DF8:: @ 8151DF8 - trainerbattle 0, OPPONENT_SPENCER, 0, Route124_Text_1C0624, Route124_Text_1C0675 + trainerbattle 0, TRAINER_SPENCER, 0, Route124_Text_1C0624, Route124_Text_1C0675 msgbox Route124_Text_1C0693, 6 end Route124_EventScript_151E0F:: @ 8151E0F - trainerbattle 0, OPPONENT_ROLAND, 0, Route124_Text_1C06F7, Route124_Text_1C0741 + trainerbattle 0, TRAINER_ROLAND, 0, Route124_Text_1C06F7, Route124_Text_1C0741 msgbox Route124_Text_1C0750, 6 end Route124_EventScript_151E26:: @ 8151E26 - trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 + trainerbattle 0, TRAINER_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151E4D @@ -29,22 +29,22 @@ Route124_EventScript_151E26:: @ 8151E26 end Route124_EventScript_151E4D:: @ 8151E4D - trainerbattle 5, OPPONENT_JENNY_1, 0, Route124_Text_1C0888, Route124_Text_1C08C8 + trainerbattle 5, TRAINER_JENNY_1, 0, Route124_Text_1C0888, Route124_Text_1C08C8 msgbox Route124_Text_1C08EA, 6 end Route124_EventScript_151E64:: @ 8151E64 - trainerbattle 0, OPPONENT_GRACE, 0, Route124_Text_1C0936, Route124_Text_1C096B + trainerbattle 0, TRAINER_GRACE, 0, Route124_Text_1C0936, Route124_Text_1C096B msgbox Route124_Text_1C0994, 6 end Route124_EventScript_151E7B:: @ 8151E7B - trainerbattle 0, OPPONENT_CHAD, 0, Route124_Text_1C09CE, Route124_Text_1C0A2F + trainerbattle 0, TRAINER_CHAD, 0, Route124_Text_1C09CE, Route124_Text_1C0A2F msgbox Route124_Text_1C0A52, 6 end Route124_EventScript_151E92:: @ 8151E92 - trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 + trainerbattle 4, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151EBD @@ -52,12 +52,12 @@ Route124_EventScript_151E92:: @ 8151E92 end Route124_EventScript_151EBD:: @ 8151EBD - trainerbattle 7, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0D1F, Route124_Text_1C0DB5, Route124_Text_1C0E5C + trainerbattle 7, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0D1F, Route124_Text_1C0DB5, Route124_Text_1C0E5C msgbox Route124_Text_1C0E06, 6 end Route124_EventScript_151ED8:: @ 8151ED8 - trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 + trainerbattle 4, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151F03 @@ -65,6 +65,6 @@ Route124_EventScript_151ED8:: @ 8151ED8 end Route124_EventScript_151F03:: @ 8151F03 - trainerbattle 7, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0EA2, Route124_Text_1C0EE5, Route124_Text_1C0F90 + trainerbattle 7, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0EA2, Route124_Text_1C0EE5, Route124_Text_1C0F90 msgbox Route124_Text_1C0F19, 6 end diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index a1495ac83..4ff30f363 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -7,27 +7,27 @@ Route125_MapScript1_151F24:: @ 8151F24 end Route125_EventScript_151F2E:: @ 8151F2E - trainerbattle 0, OPPONENT_CODY, 0, Route125_Text_1C0FCF, Route125_Text_1C1002 + trainerbattle 0, TRAINER_CODY, 0, Route125_Text_1C0FCF, Route125_Text_1C1002 msgbox Route125_Text_1C1013, 6 end Route125_EventScript_151F45:: @ 8151F45 - trainerbattle 0, OPPONENT_STAN, 0, Route125_Text_1C104B, Route125_Text_1C1073 + trainerbattle 0, TRAINER_STAN, 0, Route125_Text_1C104B, Route125_Text_1C1073 msgbox Route125_Text_1C1083, 6 end Route125_EventScript_151F5C:: @ 8151F5C - trainerbattle 0, OPPONENT_TANYA, 0, Route125_Text_1C10C3, Route125_Text_1C10FB + trainerbattle 0, TRAINER_TANYA, 0, Route125_Text_1C10C3, Route125_Text_1C10FB msgbox Route125_Text_1C110C, 6 end Route125_EventScript_151F73:: @ 8151F73 - trainerbattle 0, OPPONENT_SHARON, 0, Route125_Text_1C1136, Route125_Text_1C1175 + trainerbattle 0, TRAINER_SHARON, 0, Route125_Text_1C1136, Route125_Text_1C1175 msgbox Route125_Text_1C117F, 6 end Route125_EventScript_151F8A:: @ 8151F8A - trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED + trainerbattle 0, TRAINER_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route125_EventScript_151FB1 @@ -35,16 +35,16 @@ Route125_EventScript_151F8A:: @ 8151F8A end Route125_EventScript_151FB1:: @ 8151FB1 - trainerbattle 5, OPPONENT_ERNEST_1, 0, Route125_Text_1C1282, Route125_Text_1C12C5 + trainerbattle 5, TRAINER_ERNEST_1, 0, Route125_Text_1C1282, Route125_Text_1C12C5 msgbox Route125_Text_1C12EE, 6 end Route125_EventScript_151FC8:: @ 8151FC8 - trainerbattle 4, OPPONENT_KIM_AND_IRIS, 0, Route125_Text_1C13A1, Route125_Text_1C13FF, Route125_Text_1C146E + trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_1C13A1, Route125_Text_1C13FF, Route125_Text_1C146E msgbox Route125_Text_1C141C, 6 end Route125_EventScript_151FE3:: @ 8151FE3 - trainerbattle 4, OPPONENT_KIM_AND_IRIS, 0, Route125_Text_1C14AB, Route125_Text_1C14E7, Route125_Text_1C154F + trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_1C14AB, Route125_Text_1C14E7, Route125_Text_1C154F msgbox Route125_Text_1C1508, 6 end diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 4a28abfb7..3eb68a1d1 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -7,21 +7,21 @@ Route126_MapScript1_152004:: @ 8152004 end Route126_EventScript_15200E:: @ 815200E - trainerbattle 0, OPPONENT_BARRY, 0, Route126_Text_1C1590, Route126_Text_1C15C3 + trainerbattle 0, TRAINER_BARRY, 0, Route126_Text_1C1590, Route126_Text_1C15C3 msgbox Route126_Text_1C15D8, 6 end Route126_EventScript_152025:: @ 8152025 - trainerbattle 0, OPPONENT_DEAN, 0, Route126_Text_1C1627, Route126_Text_1C1660 + trainerbattle 0, TRAINER_DEAN, 0, Route126_Text_1C1627, Route126_Text_1C1660 msgbox Route126_Text_1C166F, 6 end Route126_EventScript_15203C:: @ 815203C - trainerbattle 0, OPPONENT_NIKKI, 0, Route126_Text_1C16AB, Route126_Text_1C16C5 + trainerbattle 0, TRAINER_NIKKI, 0, Route126_Text_1C16AB, Route126_Text_1C16C5 msgbox Route126_Text_1C1702, 6 end Route126_EventScript_152053:: @ 8152053 - trainerbattle 0, OPPONENT_BRENDA, 0, Route126_Text_1C1741, Route126_Text_1C1766 + trainerbattle 0, TRAINER_BRENDA, 0, Route126_Text_1C1741, Route126_Text_1C1766 msgbox Route126_Text_1C1773, 6 end diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 7552f7c5d..51ff52501 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -7,36 +7,36 @@ Route127_MapScript1_152070:: @ 8152070 end Route127_EventScript_15207A:: @ 815207A - trainerbattle 0, OPPONENT_CALEB, 0, Route127_Text_1C17A8, Route127_Text_1C17DD + trainerbattle 0, TRAINER_CALEB, 0, Route127_Text_1C17A8, Route127_Text_1C17DD msgbox Route127_Text_1C17EC, 6 end Route127_EventScript_152091:: @ 8152091 - trainerbattle 0, OPPONENT_CONNOR, 0, Route127_Text_1C1828, Route127_Text_1C1860 + trainerbattle 0, TRAINER_CONNOR, 0, Route127_Text_1C1828, Route127_Text_1C1860 msgbox Route127_Text_1C1877, 6 end Route127_EventScript_1520A8:: @ 81520A8 - trainerbattle 0, OPPONENT_JONAH, 0, Route127_Text_1C18CC, Route127_Text_1C1930 + trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_1C18CC, Route127_Text_1C1930 msgbox Route127_Text_1C195D, 6 end Route127_EventScript_1520BF:: @ 81520BF - trainerbattle 0, OPPONENT_HENRY, 0, Route127_Text_1C19A3, Route127_Text_1C19D6 + trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_1C19A3, Route127_Text_1C19D6 msgbox Route127_Text_1C19E7, 6 end Route127_EventScript_1520D6:: @ 81520D6 - trainerbattle 0, OPPONENT_ROGER, 0, Route127_Text_1C1A2E, Route127_Text_1C1A73 + trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_1C1A2E, Route127_Text_1C1A73 msgbox Route127_Text_1C1AA0, 6 end Route127_EventScript_1520ED:: @ 81520ED - trainerbattle 0, OPPONENT_KOJI, 0, Route127_Text_1C1AE2, Route127_Text_1C1B2A + trainerbattle 0, TRAINER_KOJI, 0, Route127_Text_1C1AE2, Route127_Text_1C1B2A msgbox Route127_Text_1C1B39, 6 end Route127_EventScript_152104:: @ 8152104 - trainerbattle 0, OPPONENT_BYRON, 0, Route127_Text_1C1B92, Route127_Text_1C1BD9 + trainerbattle 0, TRAINER_BYRON, 0, Route127_Text_1C1B92, Route127_Text_1C1BD9 msgbox Route127_Text_1C1BEC, 6 end diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index ec4fb954e..12d9bace5 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -180,7 +180,7 @@ Route128_Movement_1522A1:: @ 81522A1 end_movement Route128_EventScript_1522A4:: @ 81522A4 - trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 + trainerbattle 0, TRAINER_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route128_EventScript_1522CB @@ -188,12 +188,12 @@ Route128_EventScript_1522A4:: @ 81522A4 end Route128_EventScript_1522CB:: @ 81522CB - trainerbattle 5, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1D02, Route128_Text_1C1D45 + trainerbattle 5, TRAINER_ISAIAH_1, 0, Route128_Text_1C1D02, Route128_Text_1C1D45 msgbox Route128_Text_1C1D6B, 6 end Route128_EventScript_1522E2:: @ 81522E2 - trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 + trainerbattle 0, TRAINER_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route128_EventScript_152309 @@ -201,21 +201,21 @@ Route128_EventScript_1522E2:: @ 81522E2 end Route128_EventScript_152309:: @ 8152309 - trainerbattle 5, OPPONENT_KATELYN_1, 0, Route128_Text_1C1E90, Route128_Text_1C1EFA + trainerbattle 5, TRAINER_KATELYN_1, 0, Route128_Text_1C1E90, Route128_Text_1C1EFA msgbox Route128_Text_1C1F2E, 6 end Route128_EventScript_152320:: @ 8152320 - trainerbattle 0, OPPONENT_ALEXA, 0, Route128_Text_1C1F6D, Route128_Text_1C1FCC + trainerbattle 0, TRAINER_ALEXA, 0, Route128_Text_1C1F6D, Route128_Text_1C1FCC msgbox Route128_Text_1C1FE8, 6 end Route128_EventScript_152337:: @ 8152337 - trainerbattle 0, OPPONENT_RUBEN, 0, Route128_Text_1C202C, Route128_Text_1C2051 + trainerbattle 0, TRAINER_RUBEN, 0, Route128_Text_1C202C, Route128_Text_1C2051 msgbox Route128_Text_1C2060, 6 end Route128_EventScript_15234E:: @ 815234E - trainerbattle 0, OPPONENT_WAYNE, 0, Route128_Text_1C2090, Route128_Text_1C20FC + trainerbattle 0, TRAINER_WAYNE, 0, Route128_Text_1C2090, Route128_Text_1C20FC msgbox Route128_Text_1C210D, 6 end diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index ea43c5eab..360c67e02 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -2,21 +2,21 @@ Route129_MapScripts:: @ 8152365 .byte 0 Route129_EventScript_152366:: @ 8152366 - trainerbattle 0, OPPONENT_CHASE, 0, Route129_Text_1C2161, Route129_Text_1C2198 + trainerbattle 0, TRAINER_CHASE, 0, Route129_Text_1C2161, Route129_Text_1C2198 msgbox Route129_Text_1C21B4, 6 end Route129_EventScript_15237D:: @ 815237D - trainerbattle 0, OPPONENT_ALLISON, 0, Route129_Text_1C21ED, Route129_Text_1C222F + trainerbattle 0, TRAINER_ALLISON, 0, Route129_Text_1C21ED, Route129_Text_1C222F msgbox Route129_Text_1C2243, 6 end Route129_EventScript_152394:: @ 8152394 - trainerbattle 0, OPPONENT_REED, 0, Route129_Text_1C22C8, Route129_Text_1C22EC + trainerbattle 0, TRAINER_REED, 0, Route129_Text_1C22C8, Route129_Text_1C22EC msgbox Route129_Text_1C230F, 6 end Route129_EventScript_1523AB:: @ 81523AB - trainerbattle 0, OPPONENT_TISHA, 0, Route129_Text_1C2349, Route129_Text_1C2378 + trainerbattle 0, TRAINER_TISHA, 0, Route129_Text_1C2349, Route129_Text_1C2378 msgbox Route129_Text_1C23A3, 6 end diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index b0381969d..70eace112 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -30,11 +30,11 @@ Route130_EventScript_15240C:: @ 815240C end Route130_EventScript_152410:: @ 8152410 - trainerbattle 0, OPPONENT_RODNEY, 0, Route130_Text_1C2401, Route130_Text_1C245D + trainerbattle 0, TRAINER_RODNEY, 0, Route130_Text_1C2401, Route130_Text_1C245D msgbox Route130_Text_1C2479, 6 end Route130_EventScript_152427:: @ 8152427 - trainerbattle 0, OPPONENT_KATIE, 0, Route130_Text_1C24DC, Route130_Text_1C2525 + trainerbattle 0, TRAINER_KATIE, 0, Route130_Text_1C24DC, Route130_Text_1C2525 msgbox Route130_Text_1C256E, 6 end diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index ffd204bb9..6aa6868f3 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -11,31 +11,31 @@ Route131_EventScript_15244E:: @ 815244E return Route131_EventScript_152452:: @ 8152452 - trainerbattle 0, OPPONENT_RICHARD, 0, Route131_Text_1C25B3, Route131_Text_1C25F8 + trainerbattle 0, TRAINER_RICHARD, 0, Route131_Text_1C25B3, Route131_Text_1C25F8 msgbox Route131_Text_1C262A, 6 end Route131_EventScript_152469:: @ 8152469 - trainerbattle 0, OPPONENT_HERMAN, 0, Route131_Text_1C26B9, Route131_Text_1C271F + trainerbattle 0, TRAINER_HERMAN, 0, Route131_Text_1C26B9, Route131_Text_1C271F msgbox Route131_Text_1C2726, 6 end Route131_EventScript_152480:: @ 8152480 - trainerbattle 0, OPPONENT_SUSIE, 0, Route131_Text_1C2774, Route131_Text_1C27A4 + trainerbattle 0, TRAINER_SUSIE, 0, Route131_Text_1C2774, Route131_Text_1C27A4 msgbox Route131_Text_1C27CF, 6 end Route131_EventScript_152497:: @ 8152497 - trainerbattle 0, OPPONENT_KARA, 0, Route131_Text_1C284A, Route131_Text_1C2883 + trainerbattle 0, TRAINER_KARA, 0, Route131_Text_1C284A, Route131_Text_1C2883 msgbox Route131_Text_1C2898, 6 end Route131_EventScript_1524AE:: @ 81524AE - trainerbattle 4, OPPONENT_RELI_AND_IAN, 0, Route131_Text_1C28E2, Route131_Text_1C2918, Route131_Text_1C29B2 + trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_1C28E2, Route131_Text_1C2918, Route131_Text_1C29B2 msgbox Route131_Text_1C2950, 6 end Route131_EventScript_1524C9:: @ 81524C9 - trainerbattle 4, OPPONENT_RELI_AND_IAN, 0, Route131_Text_1C29F3, Route131_Text_1C2A20, Route131_Text_1C2ACA + trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_1C29F3, Route131_Text_1C2A20, Route131_Text_1C2ACA msgbox Route131_Text_1C2A5D, 6 end diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc index 642330fd4..6d964aacf 100644 --- a/data/maps/Route132/scripts.inc +++ b/data/maps/Route132/scripts.inc @@ -2,21 +2,21 @@ Route132_MapScripts:: @ 81524E4 .byte 0 Route132_EventScript_1524E5:: @ 81524E5 - trainerbattle 0, OPPONENT_GILBERT, 0, Route132_Text_1C2AFB, Route132_Text_1C2B5B + trainerbattle 0, TRAINER_GILBERT, 0, Route132_Text_1C2AFB, Route132_Text_1C2B5B msgbox Route132_Text_1C2B71, 6 end Route132_EventScript_1524FC:: @ 81524FC - trainerbattle 0, OPPONENT_DANA, 0, Route132_Text_1C2BB5, Route132_Text_1C2BEA + trainerbattle 0, TRAINER_DANA, 0, Route132_Text_1C2BB5, Route132_Text_1C2BEA msgbox Route132_Text_1C2BFA, 6 end Route132_EventScript_152513:: @ 8152513 - trainerbattle 0, OPPONENT_RONALD, 0, Route132_Text_1C2C32, Route132_Text_1C2C60 + trainerbattle 0, TRAINER_RONALD, 0, Route132_Text_1C2C32, Route132_Text_1C2C60 msgbox Route132_Text_1C2C78, 6 end Route132_EventScript_15252A:: @ 815252A - trainerbattle 0, OPPONENT_KIYO, 0, Route132_Text_1C2CD9, Route132_Text_1C2D1F + trainerbattle 0, TRAINER_KIYO, 0, Route132_Text_1C2CD9, Route132_Text_1C2D1F msgbox Route132_Text_1C2D3E, 6 end diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc index 78bec4141..213be5562 100644 --- a/data/maps/Route133/scripts.inc +++ b/data/maps/Route133/scripts.inc @@ -2,26 +2,26 @@ Route133_MapScripts:: @ 8152541 .byte 0 Route133_EventScript_152542:: @ 8152542 - trainerbattle 0, OPPONENT_FRANKLIN, 0, Route133_Text_1C2DA5, Route133_Text_1C2DF4 + trainerbattle 0, TRAINER_FRANKLIN, 0, Route133_Text_1C2DA5, Route133_Text_1C2DF4 msgbox Route133_Text_1C2E09, 6 end Route133_EventScript_152559:: @ 8152559 - trainerbattle 0, OPPONENT_DEBRA, 0, Route133_Text_1C2E61, Route133_Text_1C2EBD + trainerbattle 0, TRAINER_DEBRA, 0, Route133_Text_1C2E61, Route133_Text_1C2EBD msgbox Route133_Text_1C2ECD, 6 end Route133_EventScript_152570:: @ 8152570 - trainerbattle 0, OPPONENT_LINDA, 0, Route133_Text_1C2EF7, Route133_Text_1C2F19 + trainerbattle 0, TRAINER_LINDA, 0, Route133_Text_1C2EF7, Route133_Text_1C2F19 msgbox Route133_Text_1C2F25, 6 end Route133_EventScript_152587:: @ 8152587 - trainerbattle 0, OPPONENT_WARREN, 0, Route133_Text_1C2F53, Route133_Text_1C2FA3 + trainerbattle 0, TRAINER_WARREN, 0, Route133_Text_1C2F53, Route133_Text_1C2FA3 msgbox Route133_Text_1C2FC7, 6 end Route133_EventScript_15259E:: @ 815259E - trainerbattle 0, OPPONENT_BECK, 0, Route133_Text_1C302D, Route133_Text_1C305F + trainerbattle 0, TRAINER_BECK, 0, Route133_Text_1C302D, Route133_Text_1C305F msgbox Route133_Text_1C307E, 6 end diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index 06b53ce31..e5c106899 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -7,26 +7,26 @@ Route134_MapScript1_1525BB:: @ 81525BB end Route134_EventScript_1525C4:: @ 81525C4 - trainerbattle 0, OPPONENT_JACK, 0, Route134_Text_1C30C6, Route134_Text_1C3110 + trainerbattle 0, TRAINER_JACK, 0, Route134_Text_1C30C6, Route134_Text_1C3110 msgbox Route134_Text_1C311A, 6 end Route134_EventScript_1525DB:: @ 81525DB - trainerbattle 0, OPPONENT_LAUREL, 0, Route134_Text_1C315E, Route134_Text_1C3198 + trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_1C315E, Route134_Text_1C3198 msgbox Route134_Text_1C31A0, 6 end Route134_EventScript_1525F2:: @ 81525F2 - trainerbattle 0, OPPONENT_ALEX, 0, Route134_Text_1C31D7, Route134_Text_1C3213 + trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_1C31D7, Route134_Text_1C3213 msgbox Route134_Text_1C3229, 6 end Route134_EventScript_152609:: @ 8152609 - trainerbattle 0, OPPONENT_AARON, 0, Route134_Text_1C3319, Route134_Text_1C335C + trainerbattle 0, TRAINER_AARON, 0, Route134_Text_1C3319, Route134_Text_1C335C msgbox Route134_Text_1C336E, 6 end Route134_EventScript_152620:: @ 8152620 - trainerbattle 0, OPPONENT_HITOSHI, 0, Route134_Text_1C3262, Route134_Text_1C329E + trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_1C3262, Route134_Text_1C329E msgbox Route134_Text_1C32D6, 6 end diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 307617e50..9c379107f 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -2,7 +2,7 @@ RustboroCity_Gym_MapScripts:: @ 81578D8 .byte 0 RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 - trainerbattle 1, OPPONENT_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE + trainerbattle 1, TRAINER_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_15793C msgbox RustboroCity_Gym_Text_184252, 4 release @@ -34,12 +34,12 @@ RustboroCity_Gym_EventScript_15793C:: @ 815793C end RustboroCity_Gym_EventScript_157960:: @ 8157960 - trainerbattle 0, OPPONENT_JOSH, 0, RustboroCity_Gym_Text_183D99, RustboroCity_Gym_Text_183DDD + trainerbattle 0, TRAINER_JOSH, 0, RustboroCity_Gym_Text_183D99, RustboroCity_Gym_Text_183DDD msgbox RustboroCity_Gym_Text_183DF9, 6 end RustboroCity_Gym_EventScript_157977:: @ 8157977 - trainerbattle 0, OPPONENT_TOMMY, 0, RustboroCity_Gym_Text_183E38, RustboroCity_Gym_Text_183E78 + trainerbattle 0, TRAINER_TOMMY, 0, RustboroCity_Gym_Text_183E38, RustboroCity_Gym_Text_183E78 msgbox RustboroCity_Gym_Text_183E98, 6 end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 13fb80043..6c3f759cc 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -310,7 +310,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA faceplayer playbgm MUS_EVIL_TEAM, FALSE msgbox RusturfTunnel_Text_19419B, 4 - trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 + trainerbattle 3, TRAINER_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 msgbox RusturfTunnel_Text_194274, 4 giveitem_std ITEM_DEVON_GOODS closemessage @@ -415,6 +415,6 @@ RusturfTunnel_Movement_15CAC3:: @ 815CAC3 end_movement RusturfTunnel_EventScript_15CACD:: @ 815CACD - trainerbattle 0, OPPONENT_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 + trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 msgbox RusturfTunnel_Text_1948C4, 6 end diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 7bc5a7fdd..57872a66a 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -173,14 +173,14 @@ SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A end SSTidalCorridor_EventScript_15FE84:: @ 815FE84 - goto_if_trainer_not_defeated OPPONENT_PHILLIP, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_LEONARD, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_COLTON, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_TUCKER, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_THOMAS, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_GARRET, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_ANETTE, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_PHILLIP, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_LEONARD, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_COLTON, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_TUCKER, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_THOMAS, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_GARRET, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_ANETTE, SSTidalCorridor_EventScript_15FED5 setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_15FE7A return diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc index e91c20625..9b19a2f3a 100644 --- a/data/maps/SSTidalLowerDeck/scripts.inc +++ b/data/maps/SSTidalLowerDeck/scripts.inc @@ -2,11 +2,11 @@ SSTidalLowerDeck_MapScripts:: @ 815FED6 .byte 0 SSTidalLowerDeck_EventScript_15FED7:: @ 815FED7 - trainerbattle 0, OPPONENT_PHILLIP, 0, SSTidalLowerDeck_Text_1993C1, SSTidalLowerDeck_Text_19941A + trainerbattle 0, TRAINER_PHILLIP, 0, SSTidalLowerDeck_Text_1993C1, SSTidalLowerDeck_Text_19941A msgbox SSTidalLowerDeck_Text_19942E, 6 end SSTidalLowerDeck_EventScript_15FEEE:: @ 815FEEE - trainerbattle 0, OPPONENT_LEONARD, 0, SSTidalLowerDeck_Text_199491, SSTidalLowerDeck_Text_1994F7 + trainerbattle 0, TRAINER_LEONARD, 0, SSTidalLowerDeck_Text_199491, SSTidalLowerDeck_Text_1994F7 msgbox SSTidalLowerDeck_Text_199508, 6 end diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index 89372bd84..52927d54e 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -29,36 +29,36 @@ SSTidalRooms_EventScript_15FF47:: @ 815FF47 end SSTidalRooms_EventScript_15FF5D:: @ 815FF5D - trainerbattle 0, OPPONENT_COLTON, 0, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613 + trainerbattle 0, TRAINER_COLTON, 0, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613 msgbox SSTidalRooms_Text_199630, 6 end SSTidalRooms_EventScript_15FF74:: @ 815FF74 - trainerbattle 0, OPPONENT_TUCKER, 0, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF + trainerbattle 0, TRAINER_TUCKER, 0, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF msgbox SSTidalRooms_Text_1996E1, 6 end SSTidalRooms_EventScript_15FF8B:: @ 815FF8B - trainerbattle 0, OPPONENT_THOMAS, 0, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747 + trainerbattle 0, TRAINER_THOMAS, 0, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747 msgbox SSTidalRooms_Text_199778, 6 end SSTidalRooms_EventScript_15FFA2:: @ 815FFA2 - trainerbattle 4, OPPONENT_LEA_AND_JED, 0, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887 + trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887 msgbox SSTidalRooms_Text_199820, 6 end SSTidalRooms_EventScript_15FFBD:: @ 815FFBD - trainerbattle 4, OPPONENT_LEA_AND_JED, 0, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975 + trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975 msgbox SSTidalRooms_Text_19991C, 6 end SSTidalRooms_EventScript_15FFD8:: @ 815FFD8 - trainerbattle 0, OPPONENT_GARRET, 0, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF + trainerbattle 0, TRAINER_GARRET, 0, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF msgbox SSTidalRooms_Text_199A10, 6 end SSTidalRooms_EventScript_15FFEF:: @ 815FFEF - trainerbattle 0, OPPONENT_ANETTE, 0, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF + trainerbattle 0, TRAINER_ANETTE, 0, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF msgbox SSTidalRooms_Text_199ADE, 6 end diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc index 6478efac1..cd1513ec1 100644 --- a/data/maps/SeafloorCavern_Room1/scripts.inc +++ b/data/maps/SeafloorCavern_Room1/scripts.inc @@ -7,11 +7,11 @@ SeafloorCavern_Room1_MapScript1_15DA67:: @ 815DA67 end SeafloorCavern_Room1_EventScript_15DA6D:: @ 815DA6D - trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_1, 0, SeafloorCavern_Room1_Text_1974BA, SeafloorCavern_Room1_Text_1974EA + trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_1, 0, SeafloorCavern_Room1_Text_1974BA, SeafloorCavern_Room1_Text_1974EA msgbox SeafloorCavern_Room1_Text_1974FF, 6 end SeafloorCavern_Room1_EventScript_15DA84:: @ 815DA84 - trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_2, 0, SeafloorCavern_Room1_Text_19753C, SeafloorCavern_Room1_Text_197573 + trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_2, 0, SeafloorCavern_Room1_Text_19753C, SeafloorCavern_Room1_Text_197573 msgbox SeafloorCavern_Room1_Text_197589, 6 end diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc index 2ff8c4b26..57f2bc20a 100644 --- a/data/maps/SeafloorCavern_Room3/scripts.inc +++ b/data/maps/SeafloorCavern_Room3/scripts.inc @@ -7,6 +7,6 @@ SeafloorCavern_Room3_MapScript1_15DAA2:: @ 815DAA2 end SeafloorCavern_Room3_EventScript_15DAA8:: @ 815DAA8 - trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_3, 0, SeafloorCavern_Room3_Text_1975DC, SeafloorCavern_Room3_Text_1976F3 + trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_3, 0, SeafloorCavern_Room3_Text_1975DC, SeafloorCavern_Room3_Text_1976F3 msgbox SeafloorCavern_Room3_Text_197704, 6 end diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc index cbed797c0..8f53d948c 100644 --- a/data/maps/SeafloorCavern_Room4/scripts.inc +++ b/data/maps/SeafloorCavern_Room4/scripts.inc @@ -7,6 +7,6 @@ SeafloorCavern_Room4_MapScript1_15DAC5:: @ 815DAC5 end SeafloorCavern_Room4_EventScript_15DACB:: @ 815DACB - trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_4, 0, SeafloorCavern_Room4_Text_1977B9, SeafloorCavern_Room4_Text_1977E2 + trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_4, 0, SeafloorCavern_Room4_Text_1977B9, SeafloorCavern_Room4_Text_1977E2 msgbox SeafloorCavern_Room4_Text_1977ED, 6 end diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 74d624141..d50a591f7 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -53,9 +53,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B491F, 4 .endif .ifdef SAPPHIRE - trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, UnknownString_81B4319 + trainerbattle 3, TRAINER_SEAFLOOR_CAVERN_GRUNT_5, 0, UnknownString_81B4319 .else - trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, SeafloorCavern_Room9_Text_1B49AE + trainerbattle 3, TRAINER_SEAFLOOR_CAVERN_GRUNT_5, 0, SeafloorCavern_Room9_Text_1B49AE .endif .ifdef SAPPHIRE msgbox UnknownString_81B432C, 4 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index ce0bc855f..58e4ba240 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -37,7 +37,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E78 compare FACING, 3 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E83 - trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E + trainerbattle 3, TRAINER_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF @@ -46,7 +46,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17EEA5, 4 savebgm 0 - trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6 + trainerbattle 3, TRAINER_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF waitmovement 0 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_1A0845 diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index a404013e0..a918c0568 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -86,7 +86,7 @@ SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD end_movement SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF - trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D + trainerbattle 1, TRAINER_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_15B056 goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_15B07A msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4 diff --git a/data/maps/SootopolisCity_Gym_B1F/scripts.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc index e54970701..06c7d33a3 100644 --- a/data/maps/SootopolisCity_Gym_B1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc @@ -2,41 +2,41 @@ SootopolisCity_Gym_B1F_MapScripts:: @ 815B0D7 .byte 0 SootopolisCity_Gym_B1F_EventScript_15B0D8:: @ 815B0D8 - trainerbattle 0, OPPONENT_ANDREA, 0, SootopolisCity_Gym_B1F_Text_18EA87, SootopolisCity_Gym_B1F_Text_18EACF + trainerbattle 0, TRAINER_ANDREA, 0, SootopolisCity_Gym_B1F_Text_18EA87, SootopolisCity_Gym_B1F_Text_18EACF msgbox SootopolisCity_Gym_B1F_Text_18EAED, 6 end SootopolisCity_Gym_B1F_EventScript_15B0EF:: @ 815B0EF - trainerbattle 0, OPPONENT_CRISSY, 0, SootopolisCity_Gym_B1F_Text_18EB22, SootopolisCity_Gym_B1F_Text_18EB81 + trainerbattle 0, TRAINER_CRISSY, 0, SootopolisCity_Gym_B1F_Text_18EB22, SootopolisCity_Gym_B1F_Text_18EB81 msgbox SootopolisCity_Gym_B1F_Text_18EBB1, 6 end SootopolisCity_Gym_B1F_EventScript_15B106:: @ 815B106 - trainerbattle 0, OPPONENT_BRIANNA_2, 0, SootopolisCity_Gym_B1F_Text_18EBFA, SootopolisCity_Gym_B1F_Text_18EC5E + trainerbattle 0, TRAINER_BRIANNA_2, 0, SootopolisCity_Gym_B1F_Text_18EBFA, SootopolisCity_Gym_B1F_Text_18EC5E msgbox SootopolisCity_Gym_B1F_Text_18EC92, 6 end SootopolisCity_Gym_B1F_EventScript_15B11D:: @ 815B11D - trainerbattle 0, OPPONENT_CONNIE, 0, SootopolisCity_Gym_B1F_Text_18ECEB, SootopolisCity_Gym_B1F_Text_18ED18 + trainerbattle 0, TRAINER_CONNIE, 0, SootopolisCity_Gym_B1F_Text_18ECEB, SootopolisCity_Gym_B1F_Text_18ED18 msgbox SootopolisCity_Gym_B1F_Text_18ED2B, 6 end SootopolisCity_Gym_B1F_EventScript_15B134:: @ 815B134 - trainerbattle 0, OPPONENT_BRIDGET, 0, SootopolisCity_Gym_B1F_Text_18ED91, SootopolisCity_Gym_B1F_Text_18EDE8 + trainerbattle 0, TRAINER_BRIDGET, 0, SootopolisCity_Gym_B1F_Text_18ED91, SootopolisCity_Gym_B1F_Text_18EDE8 msgbox SootopolisCity_Gym_B1F_Text_18EE03, 6 end SootopolisCity_Gym_B1F_EventScript_15B14B:: @ 815B14B - trainerbattle 0, OPPONENT_OLIVIA, 0, SootopolisCity_Gym_B1F_Text_18EE96, SootopolisCity_Gym_B1F_Text_18EEDC + trainerbattle 0, TRAINER_OLIVIA, 0, SootopolisCity_Gym_B1F_Text_18EE96, SootopolisCity_Gym_B1F_Text_18EEDC msgbox SootopolisCity_Gym_B1F_Text_18EEF7, 6 end SootopolisCity_Gym_B1F_EventScript_15B162:: @ 815B162 - trainerbattle 0, OPPONENT_TIFFANY, 0, SootopolisCity_Gym_B1F_Text_18EF39, SootopolisCity_Gym_B1F_Text_18EFB8 + trainerbattle 0, TRAINER_TIFFANY, 0, SootopolisCity_Gym_B1F_Text_18EF39, SootopolisCity_Gym_B1F_Text_18EFB8 msgbox SootopolisCity_Gym_B1F_Text_18EFCA, 6 end SootopolisCity_Gym_B1F_EventScript_15B179:: @ 815B179 - trainerbattle 0, OPPONENT_MARISSA, 0, SootopolisCity_Gym_B1F_Text_18F037, SootopolisCity_Gym_B1F_Text_18F07F + trainerbattle 0, TRAINER_MARISSA, 0, SootopolisCity_Gym_B1F_Text_18F037, SootopolisCity_Gym_B1F_Text_18F07F msgbox SootopolisCity_Gym_B1F_Text_18F085, 6 end diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 045189759..b4931325a 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -38,7 +38,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 applymovement 255, VictoryRoad_1F_Movement_1A083F waitmovement 0 msgbox VictoryRoad_1F_Text_19782B, 4 - trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943 + trainerbattle 3, TRAINER_WALLY_1, 0, VictoryRoad_1F_Text_197943 msgbox VictoryRoad_1F_Text_197967, 4 clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD moveobjectoffscreen 4 @@ -91,7 +91,7 @@ VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 end VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 - trainerbattle 0, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 + trainerbattle 0, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq VictoryRoad_1F_EventScript_15DF58 @@ -99,21 +99,21 @@ VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 end VictoryRoad_1F_EventScript_15DF58:: @ 815DF58 - trainerbattle 5, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 + trainerbattle 5, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 msgbox VictoryRoad_1F_Text_197A47, 6 end VictoryRoad_1F_EventScript_15DF6F:: @ 815DF6F - trainerbattle 0, OPPONENT_EDGAR, 0, VictoryRoad_1F_Text_197AD1, VictoryRoad_1F_Text_197B1A + trainerbattle 0, TRAINER_EDGAR, 0, VictoryRoad_1F_Text_197AD1, VictoryRoad_1F_Text_197B1A msgbox VictoryRoad_1F_Text_197B36, 6 end VictoryRoad_1F_EventScript_15DF86:: @ 815DF86 - trainerbattle 0, OPPONENT_ALBERT, 0, VictoryRoad_1F_Text_197B99, VictoryRoad_1F_Text_197BE1 + trainerbattle 0, TRAINER_ALBERT, 0, VictoryRoad_1F_Text_197B99, VictoryRoad_1F_Text_197BE1 msgbox VictoryRoad_1F_Text_197BF7, 6 end VictoryRoad_1F_EventScript_15DF9D:: @ 815DF9D - trainerbattle 0, OPPONENT_HOPE, 0, VictoryRoad_1F_Text_197C45, VictoryRoad_1F_Text_197C8D + trainerbattle 0, TRAINER_HOPE, 0, VictoryRoad_1F_Text_197C45, VictoryRoad_1F_Text_197C8D msgbox VictoryRoad_1F_Text_197CAF, 6 end diff --git a/data/maps/VictoryRoad_B1F/scripts.inc b/data/maps/VictoryRoad_B1F/scripts.inc index e07cd4286..5667866d7 100644 --- a/data/maps/VictoryRoad_B1F/scripts.inc +++ b/data/maps/VictoryRoad_B1F/scripts.inc @@ -2,16 +2,16 @@ VictoryRoad_B1F_MapScripts:: @ 815DFB4 .byte 0 VictoryRoad_B1F_EventScript_15DFB5:: @ 815DFB5 - trainerbattle 0, OPPONENT_SAMUEL, 0, VictoryRoad_B1F_Text_197CE9, VictoryRoad_B1F_Text_197D42 + trainerbattle 0, TRAINER_SAMUEL, 0, VictoryRoad_B1F_Text_197CE9, VictoryRoad_B1F_Text_197D42 msgbox VictoryRoad_B1F_Text_197D5B, 6 end VictoryRoad_B1F_EventScript_15DFCC:: @ 815DFCC - trainerbattle 0, OPPONENT_SHANNON, 0, VictoryRoad_B1F_Text_197D98, VictoryRoad_B1F_Text_197DE8 + trainerbattle 0, TRAINER_SHANNON, 0, VictoryRoad_B1F_Text_197D98, VictoryRoad_B1F_Text_197DE8 msgbox VictoryRoad_B1F_Text_197E13, 6 end VictoryRoad_B1F_EventScript_15DFE3:: @ 815DFE3 - trainerbattle 0, OPPONENT_MICHELLE, 0, VictoryRoad_B1F_Text_197E5D, VictoryRoad_B1F_Text_197EA6 + trainerbattle 0, TRAINER_MICHELLE, 0, VictoryRoad_B1F_Text_197E5D, VictoryRoad_B1F_Text_197EA6 msgbox VictoryRoad_B1F_Text_197EB6, 6 end diff --git a/data/maps/VictoryRoad_B2F/scripts.inc b/data/maps/VictoryRoad_B2F/scripts.inc index 6b8fe2569..929af39e8 100644 --- a/data/maps/VictoryRoad_B2F/scripts.inc +++ b/data/maps/VictoryRoad_B2F/scripts.inc @@ -2,21 +2,21 @@ VictoryRoad_B2F_MapScripts:: @ 815DFFA .byte 0 VictoryRoad_B2F_EventScript_15DFFB:: @ 815DFFB - trainerbattle 0, OPPONENT_VITO, 0, VictoryRoad_B2F_Text_197EF2, VictoryRoad_B2F_Text_197F46 + trainerbattle 0, TRAINER_VITO, 0, VictoryRoad_B2F_Text_197EF2, VictoryRoad_B2F_Text_197F46 msgbox VictoryRoad_B2F_Text_197F71, 6 end VictoryRoad_B2F_EventScript_15E012:: @ 815E012 - trainerbattle 0, OPPONENT_OWEN, 0, VictoryRoad_B2F_Text_197FE5, VictoryRoad_B2F_Text_19802B + trainerbattle 0, TRAINER_OWEN, 0, VictoryRoad_B2F_Text_197FE5, VictoryRoad_B2F_Text_19802B msgbox VictoryRoad_B2F_Text_198047, 6 end VictoryRoad_B2F_EventScript_15E029:: @ 815E029 - trainerbattle 0, OPPONENT_CAROLINE, 0, VictoryRoad_B2F_Text_198089, VictoryRoad_B2F_Text_1980AD + trainerbattle 0, TRAINER_CAROLINE, 0, VictoryRoad_B2F_Text_198089, VictoryRoad_B2F_Text_1980AD msgbox VictoryRoad_B2F_Text_1980C8, 6 end VictoryRoad_B2F_EventScript_15E040:: @ 815E040 - trainerbattle 0, OPPONENT_JULIE, 0, VictoryRoad_B2F_Text_198121, VictoryRoad_B2F_Text_1981A3 + trainerbattle 0, TRAINER_JULIE, 0, VictoryRoad_B2F_Text_198121, VictoryRoad_B2F_Text_1981A3 msgbox VictoryRoad_B2F_Text_1981BA, 6 end diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 957d56609..b1c47fa62 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -1,7 +1,7 @@ Route111_EventScript_1AE313:: @ 81AE313 Route118_EventScript_1AE313:: @ 81AE313 Route120_EventScript_1AE313:: @ 81AE313 - cleartrainerflag OPPONENT_GABBY_AND_TY_6 + cleartrainerflag TRAINER_GABBY_AND_TY_6 specialvar RESULT, GabbyAndTyGetBattleNum switch RESULT case 0, Route111_EventScript_1AE384 @@ -124,61 +124,61 @@ Route111_EventScript_1AE41E:: @ 81AE41E return Route111_EventScript_1AE422:: @ 81AE422 - trainerbattle 6, OPPONENT_GABBY_AND_TY_1, 0, Route111_Text_1ABED8, Route111_Text_1ABFD3, Route111_Text_1AC5CA, Route111_EventScript_1AE5A2 + trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_1ABED8, Route111_Text_1ABFD3, Route111_Text_1AC5CA, Route111_EventScript_1AE5A2 msgbox Route111_Text_1AC59E, 4 release end Route111_EventScript_1AE442:: @ 81AE442 - trainerbattle 6, OPPONENT_GABBY_AND_TY_1, 0, Route111_Text_1AC73B, Route111_Text_1AC892, Route111_Text_1AC820, Route111_EventScript_1AE5A2 + trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_1AC73B, Route111_Text_1AC892, Route111_Text_1AC820, Route111_EventScript_1AE5A2 msgbox Route111_Text_1AC7E4, 4 release end Route118_EventScript_1AE462:: @ 81AE462 - trainerbattle 6, OPPONENT_GABBY_AND_TY_2, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F msgbox Route118_Text_1AC59E, 4 release end Route118_EventScript_1AE482:: @ 81AE482 - trainerbattle 6, OPPONENT_GABBY_AND_TY_2, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F msgbox Route118_Text_1AC7E4, 4 release end Route120_EventScript_1AE4A2:: @ 81AE4A2 - trainerbattle 6, OPPONENT_GABBY_AND_TY_3, 0, Route120_Text_1ABF50, Route120_Text_1AC6F8, Route120_Text_1AC5CA, Route120_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_1ABF50, Route120_Text_1AC6F8, Route120_Text_1AC5CA, Route120_EventScript_1AE60F msgbox Route120_Text_1AC59E, 4 release end Route120_EventScript_1AE4C2:: @ 81AE4C2 - trainerbattle 6, OPPONENT_GABBY_AND_TY_3, 0, Route120_Text_1AC790, Route120_Text_1AC8D7, Route120_Text_1AC820, Route120_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_1AC790, Route120_Text_1AC8D7, Route120_Text_1AC820, Route120_EventScript_1AE60F msgbox Route120_Text_1AC7E4, 4 release end Route111_EventScript_1AE4E2:: @ 81AE4E2 - trainerbattle 6, OPPONENT_GABBY_AND_TY_4, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F msgbox Route111_Text_1AC59E, 4 release end Route111_EventScript_1AE502:: @ 81AE502 - trainerbattle 6, OPPONENT_GABBY_AND_TY_4, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F msgbox Route111_Text_1AC7E4, 4 release end Route118_EventScript_1AE522:: @ 81AE522 - trainerbattle 6, OPPONENT_GABBY_AND_TY_5, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F msgbox Route118_Text_1AC59E, 4 release end Route118_EventScript_1AE542:: @ 81AE542 - trainerbattle 6, OPPONENT_GABBY_AND_TY_5, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F msgbox Route118_Text_1AC7E4, 4 release end @@ -186,7 +186,7 @@ Route118_EventScript_1AE542:: @ 81AE542 Route111_EventScript_1AE562:: @ 81AE562 Route118_EventScript_1AE562:: @ 81AE562 Route120_EventScript_1AE562:: @ 81AE562 - trainerbattle 6, OPPONENT_GABBY_AND_TY_6, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F msgbox Route111_Text_1AC59E, 4 release end @@ -194,7 +194,7 @@ Route120_EventScript_1AE562:: @ 81AE562 Route111_EventScript_1AE582:: @ 81AE582 Route118_EventScript_1AE582:: @ 81AE582 Route120_EventScript_1AE582:: @ 81AE582 - trainerbattle 6, OPPONENT_GABBY_AND_TY_6, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F msgbox Route111_Text_1AC7E4, 4 release end diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index ed81e6628..daa8c96db 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -46,9 +46,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB msgbox MtChimney_Text_1B38B3, 4 .endif .ifdef SAPPHIRE - trainerbattle 3, OPPONENT_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099 + trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099 .else - trainerbattle 3, OPPONENT_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68 + trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68 .endif .ifdef SAPPHIRE msgbox MtChimney_Text_1B30C2, 4 diff --git a/data/scripts/magma_summit.inc b/data/scripts/magma_summit.inc index ac71b038f..0992a62c0 100644 --- a/data/scripts/magma_summit.inc +++ b/data/scripts/magma_summit.inc @@ -1,29 +1,29 @@ MtPyre_Summit_EventScript_1B2DA9:: @ 81B2DA9 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5 msgbox UnknownString_81B5131, 6 .else - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, 0, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30 msgbox MtPyre_Summit_Text_1B5D6D, 6 .endif end MtPyre_Summit_EventScript_1B2DC0:: @ 81B2DC0 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F msgbox UnknownString_81B51B5, 6 .else - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, 0, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB msgbox MtPyre_Summit_Text_1B5DF1, 6 .endif end MtPyre_Summit_EventScript_1B2DD7:: @ 81B2DD7 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224 msgbox UnknownString_81B5248, 6 .else - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60 msgbox MtPyre_Summit_Text_1B5E84, 6 .endif end diff --git a/include/constants/opponents.h b/include/constants/opponents.h index d907153bd..11dd87ec4 100644 --- a/include/constants/opponents.h +++ b/include/constants/opponents.h @@ -1,699 +1,699 @@ #ifndef GUARD_CONSTANTS_OPPONENTS_H #define GUARD_CONSTANTS_OPPONENTS_H -#define OPPONENT_NONE 0 -#define OPPONENT_ARCHIE_1 1 -#define OPPONENT_GRUNT_1 2 -#define OPPONENT_GRUNT_2 3 -#define OPPONENT_GRUNT_3 4 -#define OPPONENT_GRUNT_4 5 -#define OPPONENT_GRUNT_5 6 -#define OPPONENT_GRUNT_6 7 -#define OPPONENT_GRUNT_7 8 -#define OPPONENT_GRUNT_8 9 -#define OPPONENT_GRUNT_9 10 -#define OPPONENT_GRUNT_10 11 -#define OPPONENT_GRUNT_11 12 -#define OPPONENT_GRUNT_12 13 -#define OPPONENT_GRUNT_13 14 -#define OPPONENT_GRUNT_14 15 -#define OPPONENT_GRUNT_15 16 -#define OPPONENT_GRUNT_16 17 -#define OPPONENT_GRUNT_17 18 -#define OPPONENT_GRUNT_18 19 -#define OPPONENT_GRUNT_19 20 -#define OPPONENT_GRUNT_20 21 -#define OPPONENT_GRUNT_21 22 -#define OPPONENT_GRUNT_22 23 -#define OPPONENT_GRUNT_23 24 -#define OPPONENT_GRUNT_24 25 -#define OPPONENT_GRUNT_25 26 -#define OPPONENT_GRUNT_26 27 -#define OPPONENT_GRUNT_27 28 -#define OPPONENT_ANONYMOUS_1 29 -#define OPPONENT_MATT_1 30 -#define OPPONENT_MATT_2 31 -#define OPPONENT_SHELLY_1 32 -#define OPPONENT_SHELLY_2 33 -#define OPPONENT_ARCHIE_2 34 -#define OPPONENT_ARCHIE_3 35 -#define OPPONENT_DAISY 36 -#define OPPONENT_ROSE_1 37 -#define OPPONENT_LILY 38 -#define OPPONENT_VIOLET 39 -#define OPPONENT_ROSE_2 40 -#define OPPONENT_ROSE_3 41 -#define OPPONENT_ROSE_4 42 -#define OPPONENT_ROSE_5 43 -#define OPPONENT_DUSTY_1 44 -#define OPPONENT_CHIP 45 -#define OPPONENT_FOSTER 46 -#define OPPONENT_DUSTY_2 47 -#define OPPONENT_DUSTY_3 48 -#define OPPONENT_DUSTY_4 49 -#define OPPONENT_DUSTY_5 50 -#define OPPONENT_GABBY_AND_TY_1 51 -#define OPPONENT_GABBY_AND_TY_2 52 -#define OPPONENT_GABBY_AND_TY_3 53 -#define OPPONENT_GABBY_AND_TY_4 54 -#define OPPONENT_GABBY_AND_TY_5 55 -#define OPPONENT_GABBY_AND_TY_6 56 -#define OPPONENT_LOLA_1 57 -#define OPPONENT_CARMEN 58 -#define OPPONENT_GWEN 59 -#define OPPONENT_LOLA_2 60 -#define OPPONENT_LOLA_3 61 -#define OPPONENT_LOLA_4 62 -#define OPPONENT_LOLA_5 63 -#define OPPONENT_RICKY_1 64 -#define OPPONENT_SIMON 65 -#define OPPONENT_CHARLIE 66 -#define OPPONENT_RICKY_2 67 -#define OPPONENT_RICKY_3 68 -#define OPPONENT_RICKY_4 69 -#define OPPONENT_RICKY_5 70 -#define OPPONENT_RANDALL 71 -#define OPPONENT_PARKER 72 -#define OPPONENT_GEORGE 73 -#define OPPONENT_BERKE 74 -#define OPPONENT_CLYDE 75 -#define OPPONENT_VINCENT 76 -#define OPPONENT_LEROY 77 -#define OPPONENT_WILTON_1 78 -#define OPPONENT_EDGAR 79 -#define OPPONENT_ALBERT 80 -#define OPPONENT_SAMUEL 81 -#define OPPONENT_VITO 82 -#define OPPONENT_OWEN 83 -#define OPPONENT_WILTON_2 84 -#define OPPONENT_WILTON_3 85 -#define OPPONENT_WILTON_4 86 -#define OPPONENT_WILTON_5 87 -#define OPPONENT_WARREN 88 -#define OPPONENT_MARY 89 -#define OPPONENT_LORI 90 -#define OPPONENT_JODY 91 -#define OPPONENT_WENDY 92 -#define OPPONENT_ELAINE 93 -#define OPPONENT_BROOKE_1 94 -#define OPPONENT_JENNIFER 95 -#define OPPONENT_HOPE 96 -#define OPPONENT_SHANNON 97 -#define OPPONENT_MICHELLE 98 -#define OPPONENT_CAROLINE 99 -#define OPPONENT_JULIE 100 -#define OPPONENT_BROOKE_2 101 -#define OPPONENT_BROOKE_3 102 -#define OPPONENT_BROOKE_4 103 -#define OPPONENT_BROOKE_5 104 -#define OPPONENT_PATRICIA 105 -#define OPPONENT_KINDRA 106 -#define OPPONENT_TAMMY 107 -#define OPPONENT_VALERIE_1 108 -#define OPPONENT_TASHA 109 -#define OPPONENT_VALERIE_2 110 -#define OPPONENT_VALERIE_3 111 -#define OPPONENT_VALERIE_4 112 -#define OPPONENT_VALERIE_5 113 -#define OPPONENT_CINDY_1 114 -#define OPPONENT_ANONYMOUS_2 115 -#define OPPONENT_BRIANNA_1 116 -#define OPPONENT_CINDY_2 117 -#define OPPONENT_BRIANNA_2 118 -#define OPPONENT_ANETTE 119 -#define OPPONENT_CINDY_3 120 -#define OPPONENT_CINDY_4 121 -#define OPPONENT_CINDY_5 122 -#define OPPONENT_CINDY_6 123 -#define OPPONENT_MELISSA 124 -#define OPPONENT_SHEILA 125 -#define OPPONENT_SHIRLEY 126 -#define OPPONENT_JESSICA_1 127 -#define OPPONENT_CONNIE 128 -#define OPPONENT_BRIDGET 129 -#define OPPONENT_OLIVIA 130 -#define OPPONENT_TIFFANY 131 -#define OPPONENT_JESSICA_2 132 -#define OPPONENT_JESSICA_3 133 -#define OPPONENT_JESSICA_4 134 -#define OPPONENT_JESSICA_5 135 -#define OPPONENT_WINSTON_1 136 -#define OPPONENT_ANONYMOUS_3 137 -#define OPPONENT_GARRET 138 -#define OPPONENT_WINSTON_2 139 -#define OPPONENT_WINSTON_3 140 -#define OPPONENT_WINSTON_4 141 -#define OPPONENT_WINSTON_5 142 -#define OPPONENT_STEVE_1 143 -#define OPPONENT_CHRIS 144 -#define OPPONENT_MARK 145 -#define OPPONENT_KENN 146 -#define OPPONENT_STEVE_2 147 -#define OPPONENT_STEVE_3 148 -#define OPPONENT_STEVE_4 149 -#define OPPONENT_STEVE_5 150 -#define OPPONENT_LUIS 151 -#define OPPONENT_AUSTIN 152 -#define OPPONENT_DOUGLAS 153 -#define OPPONENT_DARRIN 154 -#define OPPONENT_TONY_1 155 -#define OPPONENT_JEROME 156 -#define OPPONENT_MATTHEW 157 -#define OPPONENT_DAVID 158 -#define OPPONENT_SPENCER 159 -#define OPPONENT_ROLAND 160 -#define OPPONENT_CODY 161 -#define OPPONENT_STAN 162 -#define OPPONENT_BARRY 163 -#define OPPONENT_DEAN 164 -#define OPPONENT_RODNEY 165 -#define OPPONENT_RICHARD 166 -#define OPPONENT_HERMAN 167 -#define OPPONENT_ANONYMOUS_4 168 -#define OPPONENT_GILBERT 169 -#define OPPONENT_FRANKLIN 170 -#define OPPONENT_DANNY 171 -#define OPPONENT_JACK 172 -#define OPPONENT_DUDLEY 173 -#define OPPONENT_CHAD 174 -#define OPPONENT_TONY_2 175 -#define OPPONENT_TONY_3 176 -#define OPPONENT_TONY_4 177 -#define OPPONENT_TONY_5 178 -#define OPPONENT_HIDEKI 179 -#define OPPONENT_HITOSHI 180 -#define OPPONENT_KIYO 181 -#define OPPONENT_KOICHI 182 -#define OPPONENT_NOB_1 183 -#define OPPONENT_NOB_2 184 -#define OPPONENT_NOB_3 185 -#define OPPONENT_NOB_4 186 -#define OPPONENT_NOB_5 187 -#define OPPONENT_YUJI 188 -#define OPPONENT_DAISUKE 189 -#define OPPONENT_ATSUSHI 190 -#define OPPONENT_KIRK 191 -#define OPPONENT_SCOTT 192 -#define OPPONENT_HARVEY 193 -#define OPPONENT_SHAWN 194 -#define OPPONENT_RANDY 195 -#define OPPONENT_DALTON_1 196 -#define OPPONENT_DALTON_2 197 -#define OPPONENT_DALTON_3 198 -#define OPPONENT_DALTON_4 199 -#define OPPONENT_DALTON_5 200 -#define OPPONENT_COLE 201 -#define OPPONENT_FLINT 202 -#define OPPONENT_AXLE 203 -#define OPPONENT_JAKE 204 -#define OPPONENT_ANDY 205 -#define OPPONENT_BERNIE_1 206 -#define OPPONENT_BERNIE_2 207 -#define OPPONENT_BERNIE_3 208 -#define OPPONENT_BERNIE_4 209 -#define OPPONENT_BERNIE_5 210 -#define OPPONENT_DREW 211 -#define OPPONENT_CLIFF 212 -#define OPPONENT_LARRY 213 -#define OPPONENT_SHANE 214 -#define OPPONENT_JUSTIN 215 -#define OPPONENT_ETHAN_1 216 -#define OPPONENT_JEFF 217 -#define OPPONENT_TRAVIS 218 -#define OPPONENT_ETHAN_2 219 -#define OPPONENT_ETHAN_3 220 -#define OPPONENT_ETHAN_4 221 -#define OPPONENT_ETHAN_5 222 -#define OPPONENT_BRENT 223 -#define OPPONENT_DONALD 224 -#define OPPONENT_TAYLOR 225 -#define OPPONENT_BRANDON_1 226 -#define OPPONENT_DEREK 227 -#define OPPONENT_BRANDON_2 228 -#define OPPONENT_BRANDON_3 229 -#define OPPONENT_BRANDON_4 230 -#define OPPONENT_BRANDON_5 231 -#define OPPONENT_EDWARD 232 -#define OPPONENT_PRESTON 233 -#define OPPONENT_VIRGIL 234 -#define OPPONENT_FRITZ 235 -#define OPPONENT_WILLIAM 236 -#define OPPONENT_JOSHUA 237 -#define OPPONENT_CAMERON_1 238 -#define OPPONENT_CAMERON_2 239 -#define OPPONENT_CAMERON_3 240 -#define OPPONENT_CAMERON_4 241 -#define OPPONENT_CAMERON_5 242 -#define OPPONENT_JACLYN 243 -#define OPPONENT_HANNAH 244 -#define OPPONENT_SAMANTHA 245 -#define OPPONENT_MAURA 246 -#define OPPONENT_KAYLA 247 -#define OPPONENT_ALEXIS 248 -#define OPPONENT_JACKI_1 249 -#define OPPONENT_JACKI_2 250 -#define OPPONENT_JACKI_3 251 -#define OPPONENT_JACKI_4 252 -#define OPPONENT_JACKI_5 253 -#define OPPONENT_WALTER_1 254 -#define OPPONENT_TUCKER 255 -#define OPPONENT_THOMAS 256 -#define OPPONENT_WALTER_2 257 -#define OPPONENT_WALTER_3 258 -#define OPPONENT_WALTER_4 259 -#define OPPONENT_WALTER_5 260 -#define OPPONENT_SIDNEY 261 -#define OPPONENT_PHOEBE 262 -#define OPPONENT_GLACIA 263 -#define OPPONENT_DRAKE 264 -#define OPPONENT_ROXANNE 265 -#define OPPONENT_BRAWLY 266 -#define OPPONENT_WATTSON 267 -#define OPPONENT_FLANNERY 268 -#define OPPONENT_NORMAN 269 -#define OPPONENT_WINONA 270 -#define OPPONENT_TATE_AND_LIZA 271 -#define OPPONENT_WALLACE 272 -#define OPPONENT_JERRY_1 273 -#define OPPONENT_TED 274 -#define OPPONENT_PAUL 275 -#define OPPONENT_JERRY_2 276 -#define OPPONENT_JERRY_3 277 -#define OPPONENT_JERRY_4 278 -#define OPPONENT_JERRY_5 279 -#define OPPONENT_KAREN_1 280 -#define OPPONENT_GEORGIA 281 -#define OPPONENT_KAREN_2 282 -#define OPPONENT_KAREN_3 283 -#define OPPONENT_KAREN_4 284 -#define OPPONENT_KAREN_5 285 -#define OPPONENT_KATE_AND_JOY 286 -#define OPPONENT_ANNA_AND_MEG_1 287 -#define OPPONENT_ANNA_AND_MEG_2 288 -#define OPPONENT_ANNA_AND_MEG_3 289 -#define OPPONENT_ANNA_AND_MEG_4 290 -#define OPPONENT_ANNA_AND_MEG_5 291 -#define OPPONENT_VICTOR 292 -#define OPPONENT_MIGUEL_1 293 -#define OPPONENT_COLTON 294 -#define OPPONENT_MIGUEL_2 295 -#define OPPONENT_MIGUEL_3 296 -#define OPPONENT_MIGUEL_4 297 -#define OPPONENT_MIGUEL_5 298 -#define OPPONENT_VICTORIA 299 -#define OPPONENT_VANESSA 300 -#define OPPONENT_MARISSA 301 -#define OPPONENT_ISABEL_1 302 -#define OPPONENT_ISABEL_2 303 -#define OPPONENT_ISABEL_3 304 -#define OPPONENT_ISABEL_4 305 -#define OPPONENT_ISABEL_5 306 -#define OPPONENT_TIMOTHY_1 307 -#define OPPONENT_TIMOTHY_2 308 -#define OPPONENT_TIMOTHY_3 309 -#define OPPONENT_TIMOTHY_4 310 -#define OPPONENT_TIMOTHY_5 311 -#define OPPONENT_VICKY 312 -#define OPPONENT_SHELBY_1 313 -#define OPPONENT_SHELBY_2 314 -#define OPPONENT_SHELBY_3 315 -#define OPPONENT_SHELBY_4 316 -#define OPPONENT_SHELBY_5 317 -#define OPPONENT_CALVIN_1 318 -#define OPPONENT_BILLY 319 -#define OPPONENT_JOSH 320 -#define OPPONENT_TOMMY 321 -#define OPPONENT_JOEY 322 -#define OPPONENT_BEN 323 -#define OPPONENT_ANONYMOUS_5 324 -#define OPPONENT_KEVIN 325 -#define OPPONENT_NEAL 326 -#define OPPONENT_DILLON 327 -#define OPPONENT_CALVIN_2 328 -#define OPPONENT_CALVIN_3 329 -#define OPPONENT_CALVIN_4 330 -#define OPPONENT_CALVIN_5 331 -#define OPPONENT_EDDIE 332 -#define OPPONENT_ALLEN 333 -#define OPPONENT_TIMMY 334 -#define OPPONENT_STEVEN 335 -#define OPPONENT_ANDREW 336 -#define OPPONENT_IVAN 337 -#define OPPONENT_CLAUDE 338 -#define OPPONENT_ELLIOT_1 339 -#define OPPONENT_NED 340 -#define OPPONENT_DALE 341 -#define OPPONENT_NOLAN 342 -#define OPPONENT_BARNY 343 -#define OPPONENT_WADE 344 -#define OPPONENT_CARTER 345 -#define OPPONENT_ELLIOT_2 346 -#define OPPONENT_ELLIOT_3 347 -#define OPPONENT_ELLIOT_4 348 -#define OPPONENT_ELLIOT_5 349 -#define OPPONENT_RONALD 350 -#define OPPONENT_JACOB 351 -#define OPPONENT_ANTHONY 352 -#define OPPONENT_BENJAMIN_1 353 -#define OPPONENT_BENJAMIN_2 354 -#define OPPONENT_BENJAMIN_3 355 -#define OPPONENT_BENJAMIN_4 356 -#define OPPONENT_BENJAMIN_5 357 -#define OPPONENT_ABIGAIL_1 358 -#define OPPONENT_JASMINE 359 -#define OPPONENT_ABIGAIL_2 360 -#define OPPONENT_ABIGAIL_3 361 -#define OPPONENT_ABIGAIL_4 362 -#define OPPONENT_ABIGAIL_5 363 -#define OPPONENT_DYLAN_1 364 -#define OPPONENT_DYLAN_2 365 -#define OPPONENT_DYLAN_3 366 -#define OPPONENT_DYLAN_4 367 -#define OPPONENT_DYLAN_5 368 -#define OPPONENT_MARIA_1 369 -#define OPPONENT_MARIA_2 370 -#define OPPONENT_MARIA_3 371 -#define OPPONENT_MARIA_4 372 -#define OPPONENT_MARIA_5 373 -#define OPPONENT_CALEB 374 -#define OPPONENT_ANONYMOUS_6 375 -#define OPPONENT_ISAIAH_1 376 -#define OPPONENT_ANONYMOUS_7 377 -#define OPPONENT_CHASE 378 -#define OPPONENT_ISAIAH_2 379 -#define OPPONENT_ISAIAH_3 380 -#define OPPONENT_ISAIAH_4 381 -#define OPPONENT_ISAIAH_5 382 -#define OPPONENT_ANONYMOUS_8 383 -#define OPPONENT_CONNOR 384 -#define OPPONENT_ANONYMOUS_9 385 -#define OPPONENT_KATELYN_1 386 -#define OPPONENT_ALLISON 387 -#define OPPONENT_KATELYN_2 388 -#define OPPONENT_KATELYN_3 389 -#define OPPONENT_KATELYN_4 390 -#define OPPONENT_KATELYN_5 391 -#define OPPONENT_NICOLAS_1 392 -#define OPPONENT_NICOLAS_2 393 -#define OPPONENT_NICOLAS_3 394 -#define OPPONENT_NICOLAS_4 395 -#define OPPONENT_NICOLAS_5 396 -#define OPPONENT_AARON 397 -#define OPPONENT_PERRY 398 -#define OPPONENT_HUGH 399 -#define OPPONENT_PHIL 400 -#define OPPONENT_JARED 401 -#define OPPONENT_ANONYMOUS_10 402 -#define OPPONENT_TANNER 403 -#define OPPONENT_WILL 404 -#define OPPONENT_COLIN 405 -#define OPPONENT_ROBERT_1 406 -#define OPPONENT_BENNY 407 -#define OPPONENT_CHESTER 408 -#define OPPONENT_ROBERT_2 409 -#define OPPONENT_ROBERT_3 410 -#define OPPONENT_ROBERT_4 411 -#define OPPONENT_ROBERT_5 412 -#define OPPONENT_ALEX 413 -#define OPPONENT_BECK 414 -#define OPPONENT_YASU 415 -#define OPPONENT_TAKASHI 416 -#define OPPONENT_MAKOTO 417 -#define OPPONENT_HIDEO_1 418 -#define OPPONENT_LAO_1 419 -#define OPPONENT_LUNG 420 -#define OPPONENT_LAO_2 421 -#define OPPONENT_LAO_3 422 -#define OPPONENT_LAO_4 423 -#define OPPONENT_LAO_5 424 -#define OPPONENT_TESSA 425 -#define OPPONENT_LAURA 426 -#define OPPONENT_CYNDY_1 427 -#define OPPONENT_CORA 428 -#define OPPONENT_JILL 429 -#define OPPONENT_CYNDY_2 430 -#define OPPONENT_CYNDY_3 431 -#define OPPONENT_CYNDY_4 432 -#define OPPONENT_CYNDY_5 433 -#define OPPONENT_MADELINE_1 434 -#define OPPONENT_CLARISSA 435 -#define OPPONENT_ANGELICA 436 -#define OPPONENT_MADELINE_2 437 -#define OPPONENT_MADELINE_3 438 -#define OPPONENT_MADELINE_4 439 -#define OPPONENT_MADELINE_5 440 -#define OPPONENT_BEVERLY 441 -#define OPPONENT_DAWN 442 -#define OPPONENT_NICOLE 443 -#define OPPONENT_DENISE 444 -#define OPPONENT_BETH 445 -#define OPPONENT_TARA 446 -#define OPPONENT_MISSY 447 -#define OPPONENT_ALICE 448 -#define OPPONENT_JENNY_1 449 -#define OPPONENT_GRACE 450 -#define OPPONENT_TANYA 451 -#define OPPONENT_SHARON 452 -#define OPPONENT_NIKKI 453 -#define OPPONENT_BRENDA 454 -#define OPPONENT_KATIE 455 -#define OPPONENT_SUSIE 456 -#define OPPONENT_KARA 457 -#define OPPONENT_DANA 458 -#define OPPONENT_ERIN 459 -#define OPPONENT_DEBRA 460 -#define OPPONENT_LINDA 461 -#define OPPONENT_KAYLEE 462 -#define OPPONENT_LAUREL 463 -#define OPPONENT_DARCY 464 -#define OPPONENT_JENNY_2 465 -#define OPPONENT_JENNY_3 466 -#define OPPONENT_JENNY_4 467 -#define OPPONENT_JENNY_5 468 -#define OPPONENT_HEIDI 469 -#define OPPONENT_BECKY 470 -#define OPPONENT_CAROL 471 -#define OPPONENT_NANCY 472 -#define OPPONENT_MARTHA 473 -#define OPPONENT_DIANA_1 474 -#define OPPONENT_NINA 475 -#define OPPONENT_IRENE 476 -#define OPPONENT_DIANA_2 477 -#define OPPONENT_DIANA_3 478 -#define OPPONENT_DIANA_4 479 -#define OPPONENT_DIANA_5 480 -#define OPPONENT_AMY_AND_LIV_1 481 -#define OPPONENT_AMY_AND_LIV_2 482 -#define OPPONENT_GINA_AND_MIA_1 483 -#define OPPONENT_MIU_AND_YUKI 484 -#define OPPONENT_AMY_AND_LIV_3 485 -#define OPPONENT_GINA_AND_MIA_2 486 -#define OPPONENT_AMY_AND_LIV_4 487 -#define OPPONENT_AMY_AND_LIV_5 488 -#define OPPONENT_AMY_AND_LIV_6 489 -#define OPPONENT_HUEY 490 -#define OPPONENT_EDMOND 491 -#define OPPONENT_ERNEST_1 492 -#define OPPONENT_DWAYNE 493 -#define OPPONENT_PHILLIP 494 -#define OPPONENT_LEONARD 495 -#define OPPONENT_DUNCAN 496 -#define OPPONENT_ERNEST_2 497 -#define OPPONENT_ERNEST_3 498 -#define OPPONENT_ERNEST_4 499 -#define OPPONENT_ERNEST_5 500 -#define OPPONENT_ANONYMOUS_11 501 -#define OPPONENT_ANONYMOUS_12 502 -#define OPPONENT_ANONYMOUS_13 503 -#define OPPONENT_SONNY 504 -#define OPPONENT_DONOVAN 505 -#define OPPONENT_GERALD 506 -#define OPPONENT_KELVIN 507 -#define OPPONENT_KODY 508 -#define OPPONENT_TEVIN 509 -#define OPPONENT_DAMON 510 -#define OPPONENT_PABLO 511 -#define OPPONENT_EDWIN_1 512 -#define OPPONENT_HECTOR_1 513 -#define OPPONENT_HECTOR_2 514 -#define OPPONENT_EDWIN_2 515 -#define OPPONENT_EDWIN_3 516 -#define OPPONENT_EDWIN_4 517 -#define OPPONENT_EDWIN_5 518 -#define OPPONENT_WALLY_1 519 -#define OPPONENT_BRENDAN_1 520 -#define OPPONENT_BRENDAN_2 521 -#define OPPONENT_BRENDAN_3 522 -#define OPPONENT_BRENDAN_4 523 -#define OPPONENT_BRENDAN_5 524 -#define OPPONENT_BRENDAN_6 525 -#define OPPONENT_BRENDAN_7 526 -#define OPPONENT_BRENDAN_8 527 -#define OPPONENT_BRENDAN_9 528 -#define OPPONENT_MAY_1 529 -#define OPPONENT_MAY_2 530 -#define OPPONENT_MAY_3 531 -#define OPPONENT_MAY_4 532 -#define OPPONENT_MAY_5 533 -#define OPPONENT_MAY_6 534 -#define OPPONENT_MAY_7 535 -#define OPPONENT_MAY_8 536 -#define OPPONENT_MAY_9 537 -#define OPPONENT_ISAAC_1 538 -#define OPPONENT_RILEY 539 -#define OPPONENT_AIDAN 540 -#define OPPONENT_ISAAC_2 541 -#define OPPONENT_ISAAC_3 542 -#define OPPONENT_ISAAC_4 543 -#define OPPONENT_ISAAC_5 544 -#define OPPONENT_LYDIA_1 545 -#define OPPONENT_ALEXIA 546 -#define OPPONENT_DANIELLE 547 -#define OPPONENT_LYDIA_2 548 -#define OPPONENT_LYDIA_3 549 -#define OPPONENT_LYDIA_4 550 -#define OPPONENT_LYDIA_5 551 -#define OPPONENT_JACKSON_1 552 -#define OPPONENT_CARLOS 553 -#define OPPONENT_SEBASTIAN 554 -#define OPPONENT_JACKSON_2 555 -#define OPPONENT_JACKSON_3 556 -#define OPPONENT_JACKSON_4 557 -#define OPPONENT_JACKSON_5 558 -#define OPPONENT_CATHERINE_1 559 -#define OPPONENT_JENNA 560 -#define OPPONENT_SOPHIA 561 -#define OPPONENT_CATHERINE_2 562 -#define OPPONENT_CATHERINE_3 563 -#define OPPONENT_CATHERINE_4 564 -#define OPPONENT_CATHERINE_5 565 -#define OPPONENT_MAXIE_1 566 -#define OPPONENT_GRUNT_28 567 -#define OPPONENT_GRUNT_29 568 -#define OPPONENT_GRUNT_30 569 -#define OPPONENT_GRUNT_31 570 -#define OPPONENT_GRUNT_32 571 -#define OPPONENT_GRUNT_33 572 -#define OPPONENT_GRUNT_34 573 -#define OPPONENT_GRUNT_35 574 -#define OPPONENT_GRUNT_36 575 -#define OPPONENT_GRUNT_37 576 -#define OPPONENT_GRUNT_38 577 -#define OPPONENT_GRUNT_39 578 -#define OPPONENT_GRUNT_40 579 -#define OPPONENT_GRUNT_41 580 -#define OPPONENT_GRUNT_42 581 -#define OPPONENT_GRUNT_43 582 -#define OPPONENT_GRUNT_44 583 -#define OPPONENT_GRUNT_45 584 -#define OPPONENT_GRUNT_46 585 -#define OPPONENT_GRUNT_47 586 -#define OPPONENT_GRUNT_48 587 -#define OPPONENT_GRUNT_49 588 -#define OPPONENT_GRUNT_50 589 -#define OPPONENT_GRUNT_51 590 -#define OPPONENT_GRUNT_52 591 -#define OPPONENT_GRUNT_53 592 -#define OPPONENT_GRUNT_54 593 -#define OPPONENT_ANONYMOUS_14 594 -#define OPPONENT_ANONYMOUS_15 595 -#define OPPONENT_TABITHA_1 596 -#define OPPONENT_TABITHA_2 597 -#define OPPONENT_ANONYMOUS_16 598 -#define OPPONENT_COURTNEY_1 599 -#define OPPONENT_COURTNEY_2 600 -#define OPPONENT_MAXIE_2 601 -#define OPPONENT_MAXIE_3 602 -#define OPPONENT_TIANA 603 -#define OPPONENT_HALEY_1 604 -#define OPPONENT_JANICE 605 -#define OPPONENT_VIVI 606 -#define OPPONENT_HALEY_2 607 -#define OPPONENT_HALEY_3 608 -#define OPPONENT_HALEY_4 609 -#define OPPONENT_HALEY_5 610 -#define OPPONENT_SALLY 611 -#define OPPONENT_ROBIN 612 -#define OPPONENT_ANDREA 613 -#define OPPONENT_CRISSY 614 -#define OPPONENT_RICK 615 -#define OPPONENT_LYLE 616 -#define OPPONENT_JOSE 617 -#define OPPONENT_DOUG 618 -#define OPPONENT_GREG 619 -#define OPPONENT_KENT 620 -#define OPPONENT_JAMES_1 621 -#define OPPONENT_JAMES_2 622 -#define OPPONENT_JAMES_3 623 -#define OPPONENT_JAMES_4 624 -#define OPPONENT_JAMES_5 625 -#define OPPONENT_BRICE 626 -#define OPPONENT_TRENT_1 627 -#define OPPONENT_LENNY 628 -#define OPPONENT_LUCAS_1 629 -#define OPPONENT_ALAN 630 -#define OPPONENT_CLARK 631 -#define OPPONENT_ERIC 632 -#define OPPONENT_LUCAS_2 633 -#define OPPONENT_MIKE_1 634 -#define OPPONENT_MIKE_2 635 -#define OPPONENT_TRENT_2 636 -#define OPPONENT_TRENT_3 637 -#define OPPONENT_TRENT_4 638 -#define OPPONENT_TRENT_5 639 -#define OPPONENT_DEZ_AND_LUKE 640 -#define OPPONENT_LEA_AND_JED 641 -#define OPPONENT_LOIS_AND_HAL_1 642 -#define OPPONENT_LOIS_AND_HAL_2 643 -#define OPPONENT_LOIS_AND_HAL_3 644 -#define OPPONENT_LOIS_AND_HAL_4 645 -#define OPPONENT_LOIS_AND_HAL_5 646 -#define OPPONENT_JOHANNA 647 -#define OPPONENT_ZANE 648 -#define OPPONENT_VIVIAN 649 -#define OPPONENT_SADIE 650 -#define OPPONENT_HIDEO_2 651 -#define OPPONENT_KEIGO 652 -#define OPPONENT_TSUNAO 653 -#define OPPONENT_TERRELL 654 -#define OPPONENT_KYLEE 655 -#define OPPONENT_WALLY_2 656 -#define OPPONENT_WALLY_3 657 -#define OPPONENT_WALLY_4 658 -#define OPPONENT_WALLY_5 659 -#define OPPONENT_WALLY_6 660 -#define OPPONENT_BRENDAN_10 661 -#define OPPONENT_BRENDAN_11 662 -#define OPPONENT_BRENDAN_12 663 -#define OPPONENT_MAY_10 664 -#define OPPONENT_MAY_11 665 -#define OPPONENT_MAY_12 666 -#define OPPONENT_JONAH 667 -#define OPPONENT_HENRY 668 -#define OPPONENT_ROGER 669 -#define OPPONENT_ALEXA 670 -#define OPPONENT_RUBEN 671 -#define OPPONENT_KOJI 672 -#define OPPONENT_WAYNE 673 -#define OPPONENT_BYRON 674 -#define OPPONENT_REED 675 -#define OPPONENT_TISHA 676 -#define OPPONENT_TORI_AND_TIA 677 -#define OPPONENT_KIM_AND_IRIS 678 -#define OPPONENT_TYRA_AND_IVY 679 -#define OPPONENT_MEL_AND_PAUL 680 -#define OPPONENT_JOHN_AND_JAY_1 681 -#define OPPONENT_JOHN_AND_JAY_2 682 -#define OPPONENT_JOHN_AND_JAY_3 683 -#define OPPONENT_JOHN_AND_JAY_4 684 -#define OPPONENT_JOHN_AND_JAY_5 685 -#define OPPONENT_RELI_AND_IAN 686 -#define OPPONENT_RITA_AND_SAM_1 687 -#define OPPONENT_RITA_AND_SAM_2 688 -#define OPPONENT_RITA_AND_SAM_3 689 -#define OPPONENT_RITA_AND_SAM_4 690 -#define OPPONENT_RITA_AND_SAM_5 691 -#define OPPONENT_LISA_AND_RAY 692 -#define OPPONENT_EUGENE 693 +#define TRAINER_NONE 0 +#define TRAINER_ARCHIE_1 1 +#define TRAINER_GRUNT_1 2 +#define TRAINER_GRUNT_2 3 +#define TRAINER_GRUNT_3 4 +#define TRAINER_GRUNT_4 5 +#define TRAINER_GRUNT_5 6 +#define TRAINER_GRUNT_6 7 +#define TRAINER_GRUNT_7 8 +#define TRAINER_GRUNT_8 9 +#define TRAINER_GRUNT_9 10 +#define TRAINER_GRUNT_10 11 +#define TRAINER_GRUNT_11 12 +#define TRAINER_GRUNT_12 13 +#define TRAINER_GRUNT_13 14 +#define TRAINER_GRUNT_14 15 +#define TRAINER_GRUNT_15 16 +#define TRAINER_GRUNT_16 17 +#define TRAINER_GRUNT_17 18 +#define TRAINER_GRUNT_18 19 +#define TRAINER_GRUNT_19 20 +#define TRAINER_GRUNT_20 21 +#define TRAINER_GRUNT_21 22 +#define TRAINER_GRUNT_22 23 +#define TRAINER_GRUNT_23 24 +#define TRAINER_GRUNT_24 25 +#define TRAINER_GRUNT_25 26 +#define TRAINER_GRUNT_26 27 +#define TRAINER_GRUNT_27 28 +#define TRAINER_ANONYMOUS_1 29 +#define TRAINER_MATT_1 30 +#define TRAINER_MATT_2 31 +#define TRAINER_SHELLY_1 32 +#define TRAINER_SHELLY_2 33 +#define TRAINER_ARCHIE_2 34 +#define TRAINER_ARCHIE_3 35 +#define TRAINER_DAISY 36 +#define TRAINER_ROSE_1 37 +#define TRAINER_LILY 38 +#define TRAINER_VIOLET 39 +#define TRAINER_ROSE_2 40 +#define TRAINER_ROSE_3 41 +#define TRAINER_ROSE_4 42 +#define TRAINER_ROSE_5 43 +#define TRAINER_DUSTY_1 44 +#define TRAINER_CHIP 45 +#define TRAINER_FOSTER 46 +#define TRAINER_DUSTY_2 47 +#define TRAINER_DUSTY_3 48 +#define TRAINER_DUSTY_4 49 +#define TRAINER_DUSTY_5 50 +#define TRAINER_GABBY_AND_TY_1 51 +#define TRAINER_GABBY_AND_TY_2 52 +#define TRAINER_GABBY_AND_TY_3 53 +#define TRAINER_GABBY_AND_TY_4 54 +#define TRAINER_GABBY_AND_TY_5 55 +#define TRAINER_GABBY_AND_TY_6 56 +#define TRAINER_LOLA_1 57 +#define TRAINER_CARMEN 58 +#define TRAINER_GWEN 59 +#define TRAINER_LOLA_2 60 +#define TRAINER_LOLA_3 61 +#define TRAINER_LOLA_4 62 +#define TRAINER_LOLA_5 63 +#define TRAINER_RICKY_1 64 +#define TRAINER_SIMON 65 +#define TRAINER_CHARLIE 66 +#define TRAINER_RICKY_2 67 +#define TRAINER_RICKY_3 68 +#define TRAINER_RICKY_4 69 +#define TRAINER_RICKY_5 70 +#define TRAINER_RANDALL 71 +#define TRAINER_PARKER 72 +#define TRAINER_GEORGE 73 +#define TRAINER_BERKE 74 +#define TRAINER_CLYDE 75 +#define TRAINER_VINCENT 76 +#define TRAINER_LEROY 77 +#define TRAINER_WILTON_1 78 +#define TRAINER_EDGAR 79 +#define TRAINER_ALBERT 80 +#define TRAINER_SAMUEL 81 +#define TRAINER_VITO 82 +#define TRAINER_OWEN 83 +#define TRAINER_WILTON_2 84 +#define TRAINER_WILTON_3 85 +#define TRAINER_WILTON_4 86 +#define TRAINER_WILTON_5 87 +#define TRAINER_WARREN 88 +#define TRAINER_MARY 89 +#define TRAINER_LORI 90 +#define TRAINER_JODY 91 +#define TRAINER_WENDY 92 +#define TRAINER_ELAINE 93 +#define TRAINER_BROOKE_1 94 +#define TRAINER_JENNIFER 95 +#define TRAINER_HOPE 96 +#define TRAINER_SHANNON 97 +#define TRAINER_MICHELLE 98 +#define TRAINER_CAROLINE 99 +#define TRAINER_JULIE 100 +#define TRAINER_BROOKE_2 101 +#define TRAINER_BROOKE_3 102 +#define TRAINER_BROOKE_4 103 +#define TRAINER_BROOKE_5 104 +#define TRAINER_PATRICIA 105 +#define TRAINER_KINDRA 106 +#define TRAINER_TAMMY 107 +#define TRAINER_VALERIE_1 108 +#define TRAINER_TASHA 109 +#define TRAINER_VALERIE_2 110 +#define TRAINER_VALERIE_3 111 +#define TRAINER_VALERIE_4 112 +#define TRAINER_VALERIE_5 113 +#define TRAINER_CINDY_1 114 +#define TRAINER_ANONYMOUS_2 115 +#define TRAINER_BRIANNA_1 116 +#define TRAINER_CINDY_2 117 +#define TRAINER_BRIANNA_2 118 +#define TRAINER_ANETTE 119 +#define TRAINER_CINDY_3 120 +#define TRAINER_CINDY_4 121 +#define TRAINER_CINDY_5 122 +#define TRAINER_CINDY_6 123 +#define TRAINER_MELISSA 124 +#define TRAINER_SHEILA 125 +#define TRAINER_SHIRLEY 126 +#define TRAINER_JESSICA_1 127 +#define TRAINER_CONNIE 128 +#define TRAINER_BRIDGET 129 +#define TRAINER_OLIVIA 130 +#define TRAINER_TIFFANY 131 +#define TRAINER_JESSICA_2 132 +#define TRAINER_JESSICA_3 133 +#define TRAINER_JESSICA_4 134 +#define TRAINER_JESSICA_5 135 +#define TRAINER_WINSTON_1 136 +#define TRAINER_ANONYMOUS_3 137 +#define TRAINER_GARRET 138 +#define TRAINER_WINSTON_2 139 +#define TRAINER_WINSTON_3 140 +#define TRAINER_WINSTON_4 141 +#define TRAINER_WINSTON_5 142 +#define TRAINER_STEVE_1 143 +#define TRAINER_CHRIS 144 +#define TRAINER_MARK 145 +#define TRAINER_KENN 146 +#define TRAINER_STEVE_2 147 +#define TRAINER_STEVE_3 148 +#define TRAINER_STEVE_4 149 +#define TRAINER_STEVE_5 150 +#define TRAINER_LUIS 151 +#define TRAINER_AUSTIN 152 +#define TRAINER_DOUGLAS 153 +#define TRAINER_DARRIN 154 +#define TRAINER_TONY_1 155 +#define TRAINER_JEROME 156 +#define TRAINER_MATTHEW 157 +#define TRAINER_DAVID 158 +#define TRAINER_SPENCER 159 +#define TRAINER_ROLAND 160 +#define TRAINER_CODY 161 +#define TRAINER_STAN 162 +#define TRAINER_BARRY 163 +#define TRAINER_DEAN 164 +#define TRAINER_RODNEY 165 +#define TRAINER_RICHARD 166 +#define TRAINER_HERMAN 167 +#define TRAINER_ANONYMOUS_4 168 +#define TRAINER_GILBERT 169 +#define TRAINER_FRANKLIN 170 +#define TRAINER_DANNY 171 +#define TRAINER_JACK 172 +#define TRAINER_DUDLEY 173 +#define TRAINER_CHAD 174 +#define TRAINER_TONY_2 175 +#define TRAINER_TONY_3 176 +#define TRAINER_TONY_4 177 +#define TRAINER_TONY_5 178 +#define TRAINER_HIDEKI 179 +#define TRAINER_HITOSHI 180 +#define TRAINER_KIYO 181 +#define TRAINER_KOICHI 182 +#define TRAINER_NOB_1 183 +#define TRAINER_NOB_2 184 +#define TRAINER_NOB_3 185 +#define TRAINER_NOB_4 186 +#define TRAINER_NOB_5 187 +#define TRAINER_YUJI 188 +#define TRAINER_DAISUKE 189 +#define TRAINER_ATSUSHI 190 +#define TRAINER_KIRK 191 +#define TRAINER_SCOTT 192 +#define TRAINER_HARVEY 193 +#define TRAINER_SHAWN 194 +#define TRAINER_RANDY 195 +#define TRAINER_DALTON_1 196 +#define TRAINER_DALTON_2 197 +#define TRAINER_DALTON_3 198 +#define TRAINER_DALTON_4 199 +#define TRAINER_DALTON_5 200 +#define TRAINER_COLE 201 +#define TRAINER_FLINT 202 +#define TRAINER_AXLE 203 +#define TRAINER_JAKE 204 +#define TRAINER_ANDY 205 +#define TRAINER_BERNIE_1 206 +#define TRAINER_BERNIE_2 207 +#define TRAINER_BERNIE_3 208 +#define TRAINER_BERNIE_4 209 +#define TRAINER_BERNIE_5 210 +#define TRAINER_DREW 211 +#define TRAINER_CLIFF 212 +#define TRAINER_LARRY 213 +#define TRAINER_SHANE 214 +#define TRAINER_JUSTIN 215 +#define TRAINER_ETHAN_1 216 +#define TRAINER_JEFF 217 +#define TRAINER_TRAVIS 218 +#define TRAINER_ETHAN_2 219 +#define TRAINER_ETHAN_3 220 +#define TRAINER_ETHAN_4 221 +#define TRAINER_ETHAN_5 222 +#define TRAINER_BRENT 223 +#define TRAINER_DONALD 224 +#define TRAINER_TAYLOR 225 +#define TRAINER_BRANDON_1 226 +#define TRAINER_DEREK 227 +#define TRAINER_BRANDON_2 228 +#define TRAINER_BRANDON_3 229 +#define TRAINER_BRANDON_4 230 +#define TRAINER_BRANDON_5 231 +#define TRAINER_EDWARD 232 +#define TRAINER_PRESTON 233 +#define TRAINER_VIRGIL 234 +#define TRAINER_FRITZ 235 +#define TRAINER_WILLIAM 236 +#define TRAINER_JOSHUA 237 +#define TRAINER_CAMERON_1 238 +#define TRAINER_CAMERON_2 239 +#define TRAINER_CAMERON_3 240 +#define TRAINER_CAMERON_4 241 +#define TRAINER_CAMERON_5 242 +#define TRAINER_JACLYN 243 +#define TRAINER_HANNAH 244 +#define TRAINER_SAMANTHA 245 +#define TRAINER_MAURA 246 +#define TRAINER_KAYLA 247 +#define TRAINER_ALEXIS 248 +#define TRAINER_JACKI_1 249 +#define TRAINER_JACKI_2 250 +#define TRAINER_JACKI_3 251 +#define TRAINER_JACKI_4 252 +#define TRAINER_JACKI_5 253 +#define TRAINER_WALTER_1 254 +#define TRAINER_TUCKER 255 +#define TRAINER_THOMAS 256 +#define TRAINER_WALTER_2 257 +#define TRAINER_WALTER_3 258 +#define TRAINER_WALTER_4 259 +#define TRAINER_WALTER_5 260 +#define TRAINER_SIDNEY 261 +#define TRAINER_PHOEBE 262 +#define TRAINER_GLACIA 263 +#define TRAINER_DRAKE 264 +#define TRAINER_ROXANNE 265 +#define TRAINER_BRAWLY 266 +#define TRAINER_WATTSON 267 +#define TRAINER_FLANNERY 268 +#define TRAINER_NORMAN 269 +#define TRAINER_WINONA 270 +#define TRAINER_TATE_AND_LIZA 271 +#define TRAINER_WALLACE 272 +#define TRAINER_JERRY_1 273 +#define TRAINER_TED 274 +#define TRAINER_PAUL 275 +#define TRAINER_JERRY_2 276 +#define TRAINER_JERRY_3 277 +#define TRAINER_JERRY_4 278 +#define TRAINER_JERRY_5 279 +#define TRAINER_KAREN_1 280 +#define TRAINER_GEORGIA 281 +#define TRAINER_KAREN_2 282 +#define TRAINER_KAREN_3 283 +#define TRAINER_KAREN_4 284 +#define TRAINER_KAREN_5 285 +#define TRAINER_KATE_AND_JOY 286 +#define TRAINER_ANNA_AND_MEG_1 287 +#define TRAINER_ANNA_AND_MEG_2 288 +#define TRAINER_ANNA_AND_MEG_3 289 +#define TRAINER_ANNA_AND_MEG_4 290 +#define TRAINER_ANNA_AND_MEG_5 291 +#define TRAINER_VICTOR 292 +#define TRAINER_MIGUEL_1 293 +#define TRAINER_COLTON 294 +#define TRAINER_MIGUEL_2 295 +#define TRAINER_MIGUEL_3 296 +#define TRAINER_MIGUEL_4 297 +#define TRAINER_MIGUEL_5 298 +#define TRAINER_VICTORIA 299 +#define TRAINER_VANESSA 300 +#define TRAINER_MARISSA 301 +#define TRAINER_ISABEL_1 302 +#define TRAINER_ISABEL_2 303 +#define TRAINER_ISABEL_3 304 +#define TRAINER_ISABEL_4 305 +#define TRAINER_ISABEL_5 306 +#define TRAINER_TIMOTHY_1 307 +#define TRAINER_TIMOTHY_2 308 +#define TRAINER_TIMOTHY_3 309 +#define TRAINER_TIMOTHY_4 310 +#define TRAINER_TIMOTHY_5 311 +#define TRAINER_VICKY 312 +#define TRAINER_SHELBY_1 313 +#define TRAINER_SHELBY_2 314 +#define TRAINER_SHELBY_3 315 +#define TRAINER_SHELBY_4 316 +#define TRAINER_SHELBY_5 317 +#define TRAINER_CALVIN_1 318 +#define TRAINER_BILLY 319 +#define TRAINER_JOSH 320 +#define TRAINER_TOMMY 321 +#define TRAINER_JOEY 322 +#define TRAINER_BEN 323 +#define TRAINER_ANONYMOUS_5 324 +#define TRAINER_KEVIN 325 +#define TRAINER_NEAL 326 +#define TRAINER_DILLON 327 +#define TRAINER_CALVIN_2 328 +#define TRAINER_CALVIN_3 329 +#define TRAINER_CALVIN_4 330 +#define TRAINER_CALVIN_5 331 +#define TRAINER_EDDIE 332 +#define TRAINER_ALLEN 333 +#define TRAINER_TIMMY 334 +#define TRAINER_STEVEN 335 +#define TRAINER_ANDREW 336 +#define TRAINER_IVAN 337 +#define TRAINER_CLAUDE 338 +#define TRAINER_ELLIOT_1 339 +#define TRAINER_NED 340 +#define TRAINER_DALE 341 +#define TRAINER_NOLAN 342 +#define TRAINER_BARNY 343 +#define TRAINER_WADE 344 +#define TRAINER_CARTER 345 +#define TRAINER_ELLIOT_2 346 +#define TRAINER_ELLIOT_3 347 +#define TRAINER_ELLIOT_4 348 +#define TRAINER_ELLIOT_5 349 +#define TRAINER_RONALD 350 +#define TRAINER_JACOB 351 +#define TRAINER_ANTHONY 352 +#define TRAINER_BENJAMIN_1 353 +#define TRAINER_BENJAMIN_2 354 +#define TRAINER_BENJAMIN_3 355 +#define TRAINER_BENJAMIN_4 356 +#define TRAINER_BENJAMIN_5 357 +#define TRAINER_ABIGAIL_1 358 +#define TRAINER_JASMINE 359 +#define TRAINER_ABIGAIL_2 360 +#define TRAINER_ABIGAIL_3 361 +#define TRAINER_ABIGAIL_4 362 +#define TRAINER_ABIGAIL_5 363 +#define TRAINER_DYLAN_1 364 +#define TRAINER_DYLAN_2 365 +#define TRAINER_DYLAN_3 366 +#define TRAINER_DYLAN_4 367 +#define TRAINER_DYLAN_5 368 +#define TRAINER_MARIA_1 369 +#define TRAINER_MARIA_2 370 +#define TRAINER_MARIA_3 371 +#define TRAINER_MARIA_4 372 +#define TRAINER_MARIA_5 373 +#define TRAINER_CALEB 374 +#define TRAINER_ANONYMOUS_6 375 +#define TRAINER_ISAIAH_1 376 +#define TRAINER_ANONYMOUS_7 377 +#define TRAINER_CHASE 378 +#define TRAINER_ISAIAH_2 379 +#define TRAINER_ISAIAH_3 380 +#define TRAINER_ISAIAH_4 381 +#define TRAINER_ISAIAH_5 382 +#define TRAINER_ANONYMOUS_8 383 +#define TRAINER_CONNOR 384 +#define TRAINER_ANONYMOUS_9 385 +#define TRAINER_KATELYN_1 386 +#define TRAINER_ALLISON 387 +#define TRAINER_KATELYN_2 388 +#define TRAINER_KATELYN_3 389 +#define TRAINER_KATELYN_4 390 +#define TRAINER_KATELYN_5 391 +#define TRAINER_NICOLAS_1 392 +#define TRAINER_NICOLAS_2 393 +#define TRAINER_NICOLAS_3 394 +#define TRAINER_NICOLAS_4 395 +#define TRAINER_NICOLAS_5 396 +#define TRAINER_AARON 397 +#define TRAINER_PERRY 398 +#define TRAINER_HUGH 399 +#define TRAINER_PHIL 400 +#define TRAINER_JARED 401 +#define TRAINER_ANONYMOUS_10 402 +#define TRAINER_TANNER 403 +#define TRAINER_WILL 404 +#define TRAINER_COLIN 405 +#define TRAINER_ROBERT_1 406 +#define TRAINER_BENNY 407 +#define TRAINER_CHESTER 408 +#define TRAINER_ROBERT_2 409 +#define TRAINER_ROBERT_3 410 +#define TRAINER_ROBERT_4 411 +#define TRAINER_ROBERT_5 412 +#define TRAINER_ALEX 413 +#define TRAINER_BECK 414 +#define TRAINER_YASU 415 +#define TRAINER_TAKASHI 416 +#define TRAINER_MAKOTO 417 +#define TRAINER_HIDEO_1 418 +#define TRAINER_LAO_1 419 +#define TRAINER_LUNG 420 +#define TRAINER_LAO_2 421 +#define TRAINER_LAO_3 422 +#define TRAINER_LAO_4 423 +#define TRAINER_LAO_5 424 +#define TRAINER_TESSA 425 +#define TRAINER_LAURA 426 +#define TRAINER_CYNDY_1 427 +#define TRAINER_CORA 428 +#define TRAINER_JILL 429 +#define TRAINER_CYNDY_2 430 +#define TRAINER_CYNDY_3 431 +#define TRAINER_CYNDY_4 432 +#define TRAINER_CYNDY_5 433 +#define TRAINER_MADELINE_1 434 +#define TRAINER_CLARISSA 435 +#define TRAINER_ANGELICA 436 +#define TRAINER_MADELINE_2 437 +#define TRAINER_MADELINE_3 438 +#define TRAINER_MADELINE_4 439 +#define TRAINER_MADELINE_5 440 +#define TRAINER_BEVERLY 441 +#define TRAINER_DAWN 442 +#define TRAINER_NICOLE 443 +#define TRAINER_DENISE 444 +#define TRAINER_BETH 445 +#define TRAINER_TARA 446 +#define TRAINER_MISSY 447 +#define TRAINER_ALICE 448 +#define TRAINER_JENNY_1 449 +#define TRAINER_GRACE 450 +#define TRAINER_TANYA 451 +#define TRAINER_SHARON 452 +#define TRAINER_NIKKI 453 +#define TRAINER_BRENDA 454 +#define TRAINER_KATIE 455 +#define TRAINER_SUSIE 456 +#define TRAINER_KARA 457 +#define TRAINER_DANA 458 +#define TRAINER_ERIN 459 +#define TRAINER_DEBRA 460 +#define TRAINER_LINDA 461 +#define TRAINER_KAYLEE 462 +#define TRAINER_LAUREL 463 +#define TRAINER_DARCY 464 +#define TRAINER_JENNY_2 465 +#define TRAINER_JENNY_3 466 +#define TRAINER_JENNY_4 467 +#define TRAINER_JENNY_5 468 +#define TRAINER_HEIDI 469 +#define TRAINER_BECKY 470 +#define TRAINER_CAROL 471 +#define TRAINER_NANCY 472 +#define TRAINER_MARTHA 473 +#define TRAINER_DIANA_1 474 +#define TRAINER_NINA 475 +#define TRAINER_IRENE 476 +#define TRAINER_DIANA_2 477 +#define TRAINER_DIANA_3 478 +#define TRAINER_DIANA_4 479 +#define TRAINER_DIANA_5 480 +#define TRAINER_AMY_AND_LIV_1 481 +#define TRAINER_AMY_AND_LIV_2 482 +#define TRAINER_GINA_AND_MIA_1 483 +#define TRAINER_MIU_AND_YUKI 484 +#define TRAINER_AMY_AND_LIV_3 485 +#define TRAINER_GINA_AND_MIA_2 486 +#define TRAINER_AMY_AND_LIV_4 487 +#define TRAINER_AMY_AND_LIV_5 488 +#define TRAINER_AMY_AND_LIV_6 489 +#define TRAINER_HUEY 490 +#define TRAINER_EDMOND 491 +#define TRAINER_ERNEST_1 492 +#define TRAINER_DWAYNE 493 +#define TRAINER_PHILLIP 494 +#define TRAINER_LEONARD 495 +#define TRAINER_DUNCAN 496 +#define TRAINER_ERNEST_2 497 +#define TRAINER_ERNEST_3 498 +#define TRAINER_ERNEST_4 499 +#define TRAINER_ERNEST_5 500 +#define TRAINER_ANONYMOUS_11 501 +#define TRAINER_ANONYMOUS_12 502 +#define TRAINER_ANONYMOUS_13 503 +#define TRAINER_SONNY 504 +#define TRAINER_DONOVAN 505 +#define TRAINER_GERALD 506 +#define TRAINER_KELVIN 507 +#define TRAINER_KODY 508 +#define TRAINER_TEVIN 509 +#define TRAINER_DAMON 510 +#define TRAINER_PABLO 511 +#define TRAINER_EDWIN_1 512 +#define TRAINER_HECTOR_1 513 +#define TRAINER_HECTOR_2 514 +#define TRAINER_EDWIN_2 515 +#define TRAINER_EDWIN_3 516 +#define TRAINER_EDWIN_4 517 +#define TRAINER_EDWIN_5 518 +#define TRAINER_WALLY_1 519 +#define TRAINER_BRENDAN_1 520 +#define TRAINER_BRENDAN_2 521 +#define TRAINER_BRENDAN_3 522 +#define TRAINER_BRENDAN_4 523 +#define TRAINER_BRENDAN_5 524 +#define TRAINER_BRENDAN_6 525 +#define TRAINER_BRENDAN_7 526 +#define TRAINER_BRENDAN_8 527 +#define TRAINER_BRENDAN_9 528 +#define TRAINER_MAY_1 529 +#define TRAINER_MAY_2 530 +#define TRAINER_MAY_3 531 +#define TRAINER_MAY_4 532 +#define TRAINER_MAY_5 533 +#define TRAINER_MAY_6 534 +#define TRAINER_MAY_7 535 +#define TRAINER_MAY_8 536 +#define TRAINER_MAY_9 537 +#define TRAINER_ISAAC_1 538 +#define TRAINER_RILEY 539 +#define TRAINER_AIDAN 540 +#define TRAINER_ISAAC_2 541 +#define TRAINER_ISAAC_3 542 +#define TRAINER_ISAAC_4 543 +#define TRAINER_ISAAC_5 544 +#define TRAINER_LYDIA_1 545 +#define TRAINER_ALEXIA 546 +#define TRAINER_DANIELLE 547 +#define TRAINER_LYDIA_2 548 +#define TRAINER_LYDIA_3 549 +#define TRAINER_LYDIA_4 550 +#define TRAINER_LYDIA_5 551 +#define TRAINER_JACKSON_1 552 +#define TRAINER_CARLOS 553 +#define TRAINER_SEBASTIAN 554 +#define TRAINER_JACKSON_2 555 +#define TRAINER_JACKSON_3 556 +#define TRAINER_JACKSON_4 557 +#define TRAINER_JACKSON_5 558 +#define TRAINER_CATHERINE_1 559 +#define TRAINER_JENNA 560 +#define TRAINER_SOPHIA 561 +#define TRAINER_CATHERINE_2 562 +#define TRAINER_CATHERINE_3 563 +#define TRAINER_CATHERINE_4 564 +#define TRAINER_CATHERINE_5 565 +#define TRAINER_MAXIE_1 566 +#define TRAINER_GRUNT_28 567 +#define TRAINER_GRUNT_29 568 +#define TRAINER_GRUNT_30 569 +#define TRAINER_GRUNT_31 570 +#define TRAINER_GRUNT_32 571 +#define TRAINER_GRUNT_33 572 +#define TRAINER_GRUNT_34 573 +#define TRAINER_GRUNT_35 574 +#define TRAINER_GRUNT_36 575 +#define TRAINER_GRUNT_37 576 +#define TRAINER_GRUNT_38 577 +#define TRAINER_GRUNT_39 578 +#define TRAINER_GRUNT_40 579 +#define TRAINER_GRUNT_41 580 +#define TRAINER_GRUNT_42 581 +#define TRAINER_GRUNT_43 582 +#define TRAINER_GRUNT_44 583 +#define TRAINER_GRUNT_45 584 +#define TRAINER_GRUNT_46 585 +#define TRAINER_GRUNT_47 586 +#define TRAINER_GRUNT_48 587 +#define TRAINER_GRUNT_49 588 +#define TRAINER_GRUNT_50 589 +#define TRAINER_GRUNT_51 590 +#define TRAINER_GRUNT_52 591 +#define TRAINER_GRUNT_53 592 +#define TRAINER_GRUNT_54 593 +#define TRAINER_ANONYMOUS_14 594 +#define TRAINER_ANONYMOUS_15 595 +#define TRAINER_TABITHA_1 596 +#define TRAINER_TABITHA_2 597 +#define TRAINER_ANONYMOUS_16 598 +#define TRAINER_COURTNEY_1 599 +#define TRAINER_COURTNEY_2 600 +#define TRAINER_MAXIE_2 601 +#define TRAINER_MAXIE_3 602 +#define TRAINER_TIANA 603 +#define TRAINER_HALEY_1 604 +#define TRAINER_JANICE 605 +#define TRAINER_VIVI 606 +#define TRAINER_HALEY_2 607 +#define TRAINER_HALEY_3 608 +#define TRAINER_HALEY_4 609 +#define TRAINER_HALEY_5 610 +#define TRAINER_SALLY 611 +#define TRAINER_ROBIN 612 +#define TRAINER_ANDREA 613 +#define TRAINER_CRISSY 614 +#define TRAINER_RICK 615 +#define TRAINER_LYLE 616 +#define TRAINER_JOSE 617 +#define TRAINER_DOUG 618 +#define TRAINER_GREG 619 +#define TRAINER_KENT 620 +#define TRAINER_JAMES_1 621 +#define TRAINER_JAMES_2 622 +#define TRAINER_JAMES_3 623 +#define TRAINER_JAMES_4 624 +#define TRAINER_JAMES_5 625 +#define TRAINER_BRICE 626 +#define TRAINER_TRENT_1 627 +#define TRAINER_LENNY 628 +#define TRAINER_LUCAS_1 629 +#define TRAINER_ALAN 630 +#define TRAINER_CLARK 631 +#define TRAINER_ERIC 632 +#define TRAINER_LUCAS_2 633 +#define TRAINER_MIKE_1 634 +#define TRAINER_MIKE_2 635 +#define TRAINER_TRENT_2 636 +#define TRAINER_TRENT_3 637 +#define TRAINER_TRENT_4 638 +#define TRAINER_TRENT_5 639 +#define TRAINER_DEZ_AND_LUKE 640 +#define TRAINER_LEA_AND_JED 641 +#define TRAINER_LOIS_AND_HAL_1 642 +#define TRAINER_LOIS_AND_HAL_2 643 +#define TRAINER_LOIS_AND_HAL_3 644 +#define TRAINER_LOIS_AND_HAL_4 645 +#define TRAINER_LOIS_AND_HAL_5 646 +#define TRAINER_JOHANNA 647 +#define TRAINER_ZANE 648 +#define TRAINER_VIVIAN 649 +#define TRAINER_SADIE 650 +#define TRAINER_HIDEO_2 651 +#define TRAINER_KEIGO 652 +#define TRAINER_TSUNAO 653 +#define TRAINER_TERRELL 654 +#define TRAINER_KYLEE 655 +#define TRAINER_WALLY_2 656 +#define TRAINER_WALLY_3 657 +#define TRAINER_WALLY_4 658 +#define TRAINER_WALLY_5 659 +#define TRAINER_WALLY_6 660 +#define TRAINER_BRENDAN_10 661 +#define TRAINER_BRENDAN_11 662 +#define TRAINER_BRENDAN_12 663 +#define TRAINER_MAY_10 664 +#define TRAINER_MAY_11 665 +#define TRAINER_MAY_12 666 +#define TRAINER_JONAH 667 +#define TRAINER_HENRY 668 +#define TRAINER_ROGER 669 +#define TRAINER_ALEXA 670 +#define TRAINER_RUBEN 671 +#define TRAINER_KOJI 672 +#define TRAINER_WAYNE 673 +#define TRAINER_BYRON 674 +#define TRAINER_REED 675 +#define TRAINER_TISHA 676 +#define TRAINER_TORI_AND_TIA 677 +#define TRAINER_KIM_AND_IRIS 678 +#define TRAINER_TYRA_AND_IVY 679 +#define TRAINER_MEL_AND_PAUL 680 +#define TRAINER_JOHN_AND_JAY_1 681 +#define TRAINER_JOHN_AND_JAY_2 682 +#define TRAINER_JOHN_AND_JAY_3 683 +#define TRAINER_JOHN_AND_JAY_4 684 +#define TRAINER_JOHN_AND_JAY_5 685 +#define TRAINER_RELI_AND_IAN 686 +#define TRAINER_RITA_AND_SAM_1 687 +#define TRAINER_RITA_AND_SAM_2 688 +#define TRAINER_RITA_AND_SAM_3 689 +#define TRAINER_RITA_AND_SAM_4 690 +#define TRAINER_RITA_AND_SAM_5 691 +#define TRAINER_LISA_AND_RAY 692 +#define TRAINER_EUGENE 693 #endif // GUARD_CONSTANTS_OPPONENTS_H diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index e8a3ef451..c1d486bd1 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -160,282 +160,282 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_4[] = const struct TrainerEyeTrainer gTrainerEyeTrainers[] = { { - {OPPONENT_ROSE_1, OPPONENT_ROSE_2, OPPONENT_ROSE_3, OPPONENT_ROSE_4, OPPONENT_ROSE_5}, + {TRAINER_ROSE_1, TRAINER_ROSE_2, TRAINER_ROSE_3, TRAINER_ROSE_4, TRAINER_ROSE_5}, MAP_GROUP(ROUTE118), MAP_NUM(ROUTE118), }, { - {OPPONENT_DUSTY_1, OPPONENT_DUSTY_2, OPPONENT_DUSTY_3, OPPONENT_DUSTY_4, OPPONENT_DUSTY_5}, + {TRAINER_DUSTY_1, TRAINER_DUSTY_2, TRAINER_DUSTY_3, TRAINER_DUSTY_4, TRAINER_DUSTY_5}, MAP_GROUP(ROUTE111), MAP_NUM(ROUTE111), }, { - {OPPONENT_LOLA_1, OPPONENT_LOLA_2, OPPONENT_LOLA_3, OPPONENT_LOLA_4, OPPONENT_LOLA_5}, + {TRAINER_LOLA_1, TRAINER_LOLA_2, TRAINER_LOLA_3, TRAINER_LOLA_4, TRAINER_LOLA_5}, MAP_GROUP(ROUTE109), MAP_NUM(ROUTE109), }, { - {OPPONENT_RICKY_1, OPPONENT_RICKY_2, OPPONENT_RICKY_3, OPPONENT_RICKY_4, OPPONENT_RICKY_5}, + {TRAINER_RICKY_1, TRAINER_RICKY_2, TRAINER_RICKY_3, TRAINER_RICKY_4, TRAINER_RICKY_5}, MAP_GROUP(ROUTE109), MAP_NUM(ROUTE109), }, { - {OPPONENT_RITA_AND_SAM_1, OPPONENT_RITA_AND_SAM_2, OPPONENT_RITA_AND_SAM_3, OPPONENT_RITA_AND_SAM_4, OPPONENT_RITA_AND_SAM_5}, + {TRAINER_RITA_AND_SAM_1, TRAINER_RITA_AND_SAM_2, TRAINER_RITA_AND_SAM_3, TRAINER_RITA_AND_SAM_4, TRAINER_RITA_AND_SAM_5}, MAP_GROUP(ROUTE124), MAP_NUM(ROUTE124), }, { - {OPPONENT_BROOKE_1, OPPONENT_BROOKE_2, OPPONENT_BROOKE_3, OPPONENT_BROOKE_4, OPPONENT_BROOKE_5}, + {TRAINER_BROOKE_1, TRAINER_BROOKE_2, TRAINER_BROOKE_3, TRAINER_BROOKE_4, TRAINER_BROOKE_5}, MAP_GROUP(ROUTE111), MAP_NUM(ROUTE111), }, { - {OPPONENT_WILTON_1, OPPONENT_WILTON_2, OPPONENT_WILTON_3, OPPONENT_WILTON_4, OPPONENT_WILTON_5}, + {TRAINER_WILTON_1, TRAINER_WILTON_2, TRAINER_WILTON_3, TRAINER_WILTON_4, TRAINER_WILTON_5}, MAP_GROUP(ROUTE111), MAP_NUM(ROUTE111), }, { - {OPPONENT_VALERIE_1, OPPONENT_VALERIE_2, OPPONENT_VALERIE_3, OPPONENT_VALERIE_4, OPPONENT_VALERIE_5}, + {TRAINER_VALERIE_1, TRAINER_VALERIE_2, TRAINER_VALERIE_3, TRAINER_VALERIE_4, TRAINER_VALERIE_5}, MAP_GROUP(MT_PYRE_6F), MAP_NUM(MT_PYRE_6F), }, { - {OPPONENT_CINDY_1, OPPONENT_CINDY_3, OPPONENT_CINDY_4, OPPONENT_CINDY_5, OPPONENT_CINDY_6}, + {TRAINER_CINDY_1, TRAINER_CINDY_3, TRAINER_CINDY_4, TRAINER_CINDY_5, TRAINER_CINDY_6}, MAP_GROUP(ROUTE104), MAP_NUM(ROUTE104), }, { - {OPPONENT_JESSICA_1, OPPONENT_JESSICA_2, OPPONENT_JESSICA_3, OPPONENT_JESSICA_4, OPPONENT_JESSICA_5}, + {TRAINER_JESSICA_1, TRAINER_JESSICA_2, TRAINER_JESSICA_3, TRAINER_JESSICA_4, TRAINER_JESSICA_5}, MAP_GROUP(ROUTE121), MAP_NUM(ROUTE121), }, { - {OPPONENT_WINSTON_1, OPPONENT_WINSTON_2, OPPONENT_WINSTON_3, OPPONENT_WINSTON_4, OPPONENT_WINSTON_5}, + {TRAINER_WINSTON_1, TRAINER_WINSTON_2, TRAINER_WINSTON_3, TRAINER_WINSTON_4, TRAINER_WINSTON_5}, MAP_GROUP(ROUTE104), MAP_NUM(ROUTE104), }, { - {OPPONENT_STEVE_1, OPPONENT_STEVE_2, OPPONENT_STEVE_3, OPPONENT_STEVE_4, OPPONENT_STEVE_5}, + {TRAINER_STEVE_1, TRAINER_STEVE_2, TRAINER_STEVE_3, TRAINER_STEVE_4, TRAINER_STEVE_5}, MAP_GROUP(ROUTE114), MAP_NUM(ROUTE114), }, { - {OPPONENT_TONY_1, OPPONENT_TONY_2, OPPONENT_TONY_3, OPPONENT_TONY_4, OPPONENT_TONY_5}, + {TRAINER_TONY_1, TRAINER_TONY_2, TRAINER_TONY_3, TRAINER_TONY_4, TRAINER_TONY_5}, MAP_GROUP(ROUTE107), MAP_NUM(ROUTE107), }, { - {OPPONENT_NOB_1, OPPONENT_NOB_2, OPPONENT_NOB_3, OPPONENT_NOB_4, OPPONENT_NOB_5}, + {TRAINER_NOB_1, TRAINER_NOB_2, TRAINER_NOB_3, TRAINER_NOB_4, TRAINER_NOB_5}, MAP_GROUP(ROUTE115), MAP_NUM(ROUTE115), }, { - {OPPONENT_DALTON_1, OPPONENT_DALTON_2, OPPONENT_DALTON_3, OPPONENT_DALTON_4, OPPONENT_DALTON_5}, + {TRAINER_DALTON_1, TRAINER_DALTON_2, TRAINER_DALTON_3, TRAINER_DALTON_4, TRAINER_DALTON_5}, MAP_GROUP(ROUTE118), MAP_NUM(ROUTE118), }, { - {OPPONENT_BERNIE_1, OPPONENT_BERNIE_2, OPPONENT_BERNIE_3, OPPONENT_BERNIE_4, OPPONENT_BERNIE_5}, + {TRAINER_BERNIE_1, TRAINER_BERNIE_2, TRAINER_BERNIE_3, TRAINER_BERNIE_4, TRAINER_BERNIE_5}, MAP_GROUP(ROUTE114), MAP_NUM(ROUTE114), }, { - {OPPONENT_ETHAN_1, OPPONENT_ETHAN_2, OPPONENT_ETHAN_3, OPPONENT_ETHAN_4, OPPONENT_ETHAN_5}, + {TRAINER_ETHAN_1, TRAINER_ETHAN_2, TRAINER_ETHAN_3, TRAINER_ETHAN_4, TRAINER_ETHAN_5}, MAP_GROUP(JAGGED_PASS), MAP_NUM(JAGGED_PASS), }, { - {OPPONENT_JOHN_AND_JAY_1, OPPONENT_JOHN_AND_JAY_2, OPPONENT_JOHN_AND_JAY_3, OPPONENT_JOHN_AND_JAY_4, OPPONENT_JOHN_AND_JAY_5}, + {TRAINER_JOHN_AND_JAY_1, TRAINER_JOHN_AND_JAY_2, TRAINER_JOHN_AND_JAY_3, TRAINER_JOHN_AND_JAY_4, TRAINER_JOHN_AND_JAY_5}, MAP_GROUP(METEOR_FALLS_1F_2R), MAP_NUM(METEOR_FALLS_1F_2R), }, { - {OPPONENT_BRANDON_1, OPPONENT_BRANDON_2, OPPONENT_BRANDON_3, OPPONENT_BRANDON_4, OPPONENT_BRANDON_5}, + {TRAINER_BRANDON_1, TRAINER_BRANDON_2, TRAINER_BRANDON_3, TRAINER_BRANDON_4, TRAINER_BRANDON_5}, MAP_GROUP(ROUTE120), MAP_NUM(ROUTE120), }, { - {OPPONENT_CAMERON_1, OPPONENT_CAMERON_2, OPPONENT_CAMERON_3, OPPONENT_CAMERON_4, OPPONENT_CAMERON_5}, + {TRAINER_CAMERON_1, TRAINER_CAMERON_2, TRAINER_CAMERON_3, TRAINER_CAMERON_4, TRAINER_CAMERON_5}, MAP_GROUP(ROUTE123), MAP_NUM(ROUTE123), }, { - {OPPONENT_JACKI_1, OPPONENT_JACKI_2, OPPONENT_JACKI_3, OPPONENT_JACKI_4, OPPONENT_JACKI_5}, + {TRAINER_JACKI_1, TRAINER_JACKI_2, TRAINER_JACKI_3, TRAINER_JACKI_4, TRAINER_JACKI_5}, MAP_GROUP(ROUTE123), MAP_NUM(ROUTE123), }, { - {OPPONENT_WALTER_1, OPPONENT_WALTER_2, OPPONENT_WALTER_3, OPPONENT_WALTER_4, OPPONENT_WALTER_5}, + {TRAINER_WALTER_1, TRAINER_WALTER_2, TRAINER_WALTER_3, TRAINER_WALTER_4, TRAINER_WALTER_5}, MAP_GROUP(ROUTE121), MAP_NUM(ROUTE121), }, { - {OPPONENT_KAREN_1, OPPONENT_KAREN_2, OPPONENT_KAREN_3, OPPONENT_KAREN_4, OPPONENT_KAREN_5}, + {TRAINER_KAREN_1, TRAINER_KAREN_2, TRAINER_KAREN_3, TRAINER_KAREN_4, TRAINER_KAREN_5}, MAP_GROUP(ROUTE116), MAP_NUM(ROUTE116), }, { - {OPPONENT_JERRY_1, OPPONENT_JERRY_2, OPPONENT_JERRY_3, OPPONENT_JERRY_4, OPPONENT_JERRY_5}, + {TRAINER_JERRY_1, TRAINER_JERRY_2, TRAINER_JERRY_3, TRAINER_JERRY_4, TRAINER_JERRY_5}, MAP_GROUP(ROUTE116), MAP_NUM(ROUTE116), }, { - {OPPONENT_ANNA_AND_MEG_1, OPPONENT_ANNA_AND_MEG_2, OPPONENT_ANNA_AND_MEG_3, OPPONENT_ANNA_AND_MEG_4, OPPONENT_ANNA_AND_MEG_5}, + {TRAINER_ANNA_AND_MEG_1, TRAINER_ANNA_AND_MEG_2, TRAINER_ANNA_AND_MEG_3, TRAINER_ANNA_AND_MEG_4, TRAINER_ANNA_AND_MEG_5}, MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), }, { - {OPPONENT_ISABEL_1, OPPONENT_ISABEL_2, OPPONENT_ISABEL_3, OPPONENT_ISABEL_4, OPPONENT_ISABEL_5}, + {TRAINER_ISABEL_1, TRAINER_ISABEL_2, TRAINER_ISABEL_3, TRAINER_ISABEL_4, TRAINER_ISABEL_5}, MAP_GROUP(ROUTE110), MAP_NUM(ROUTE110), }, { - {OPPONENT_MIGUEL_1, OPPONENT_MIGUEL_2, OPPONENT_MIGUEL_3, OPPONENT_MIGUEL_4, OPPONENT_MIGUEL_5}, + {TRAINER_MIGUEL_1, TRAINER_MIGUEL_2, TRAINER_MIGUEL_3, TRAINER_MIGUEL_4, TRAINER_MIGUEL_5}, MAP_GROUP(ROUTE103), MAP_NUM(ROUTE103), }, { - {OPPONENT_TIMOTHY_1, OPPONENT_TIMOTHY_2, OPPONENT_TIMOTHY_3, OPPONENT_TIMOTHY_4, OPPONENT_TIMOTHY_5}, + {TRAINER_TIMOTHY_1, TRAINER_TIMOTHY_2, TRAINER_TIMOTHY_3, TRAINER_TIMOTHY_4, TRAINER_TIMOTHY_5}, MAP_GROUP(ROUTE115), MAP_NUM(ROUTE115), }, { - {OPPONENT_SHELBY_1, OPPONENT_SHELBY_2, OPPONENT_SHELBY_3, OPPONENT_SHELBY_4, OPPONENT_SHELBY_5}, + {TRAINER_SHELBY_1, TRAINER_SHELBY_2, TRAINER_SHELBY_3, TRAINER_SHELBY_4, TRAINER_SHELBY_5}, MAP_GROUP(MT_CHIMNEY), MAP_NUM(MT_CHIMNEY), }, { - {OPPONENT_CALVIN_1, OPPONENT_CALVIN_2, OPPONENT_CALVIN_3, OPPONENT_CALVIN_4, OPPONENT_CALVIN_5}, + {TRAINER_CALVIN_1, TRAINER_CALVIN_2, TRAINER_CALVIN_3, TRAINER_CALVIN_4, TRAINER_CALVIN_5}, MAP_GROUP(ROUTE102), MAP_NUM(ROUTE102), }, { - {OPPONENT_ELLIOT_1, OPPONENT_ELLIOT_2, OPPONENT_ELLIOT_3, OPPONENT_ELLIOT_4, OPPONENT_ELLIOT_5}, + {TRAINER_ELLIOT_1, TRAINER_ELLIOT_2, TRAINER_ELLIOT_3, TRAINER_ELLIOT_4, TRAINER_ELLIOT_5}, MAP_GROUP(ROUTE106), MAP_NUM(ROUTE106), }, { - {OPPONENT_ABIGAIL_1, OPPONENT_ABIGAIL_2, OPPONENT_ABIGAIL_3, OPPONENT_ABIGAIL_4, OPPONENT_ABIGAIL_5}, + {TRAINER_ABIGAIL_1, TRAINER_ABIGAIL_2, TRAINER_ABIGAIL_3, TRAINER_ABIGAIL_4, TRAINER_ABIGAIL_5}, MAP_GROUP(ROUTE110), MAP_NUM(ROUTE110), }, { - {OPPONENT_BENJAMIN_1, OPPONENT_BENJAMIN_2, OPPONENT_BENJAMIN_3, OPPONENT_BENJAMIN_4, OPPONENT_BENJAMIN_5}, + {TRAINER_BENJAMIN_1, TRAINER_BENJAMIN_2, TRAINER_BENJAMIN_3, TRAINER_BENJAMIN_4, TRAINER_BENJAMIN_5}, MAP_GROUP(ROUTE110), MAP_NUM(ROUTE110), }, { - {OPPONENT_ISAIAH_1, OPPONENT_ISAIAH_2, OPPONENT_ISAIAH_3, OPPONENT_ISAIAH_4, OPPONENT_ISAIAH_5}, + {TRAINER_ISAIAH_1, TRAINER_ISAIAH_2, TRAINER_ISAIAH_3, TRAINER_ISAIAH_4, TRAINER_ISAIAH_5}, MAP_GROUP(ROUTE128), MAP_NUM(ROUTE128), }, { - {OPPONENT_KATELYN_1, OPPONENT_KATELYN_2, OPPONENT_KATELYN_3, OPPONENT_KATELYN_4, OPPONENT_KATELYN_5}, + {TRAINER_KATELYN_1, TRAINER_KATELYN_2, TRAINER_KATELYN_3, TRAINER_KATELYN_4, TRAINER_KATELYN_5}, MAP_GROUP(ROUTE128), MAP_NUM(ROUTE128), }, { - {OPPONENT_MARIA_1, OPPONENT_MARIA_2, OPPONENT_MARIA_3, OPPONENT_MARIA_4, OPPONENT_MARIA_5}, + {TRAINER_MARIA_1, TRAINER_MARIA_2, TRAINER_MARIA_3, TRAINER_MARIA_4, TRAINER_MARIA_5}, MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), }, { - {OPPONENT_DYLAN_1, OPPONENT_DYLAN_2, OPPONENT_DYLAN_3, OPPONENT_DYLAN_4, OPPONENT_DYLAN_5}, + {TRAINER_DYLAN_1, TRAINER_DYLAN_2, TRAINER_DYLAN_3, TRAINER_DYLAN_4, TRAINER_DYLAN_5}, MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), }, { - {OPPONENT_NICOLAS_1, OPPONENT_NICOLAS_2, OPPONENT_NICOLAS_3, OPPONENT_NICOLAS_4, OPPONENT_NICOLAS_5}, + {TRAINER_NICOLAS_1, TRAINER_NICOLAS_2, TRAINER_NICOLAS_3, TRAINER_NICOLAS_4, TRAINER_NICOLAS_5}, MAP_GROUP(METEOR_FALLS_1F_2R), MAP_NUM(METEOR_FALLS_1F_2R), }, { - {OPPONENT_ROBERT_1, OPPONENT_ROBERT_2, OPPONENT_ROBERT_3, OPPONENT_ROBERT_4, OPPONENT_ROBERT_5}, + {TRAINER_ROBERT_1, TRAINER_ROBERT_2, TRAINER_ROBERT_3, TRAINER_ROBERT_4, TRAINER_ROBERT_5}, MAP_GROUP(ROUTE120), MAP_NUM(ROUTE120), }, { - {OPPONENT_LAO_1, OPPONENT_LAO_2, OPPONENT_LAO_3, OPPONENT_LAO_4, OPPONENT_LAO_5}, + {TRAINER_LAO_1, TRAINER_LAO_2, TRAINER_LAO_3, TRAINER_LAO_4, TRAINER_LAO_5}, MAP_GROUP(ROUTE113), MAP_NUM(ROUTE113), }, { - {OPPONENT_CYNDY_1, OPPONENT_CYNDY_2, OPPONENT_CYNDY_3, OPPONENT_CYNDY_4, OPPONENT_CYNDY_5}, + {TRAINER_CYNDY_1, TRAINER_CYNDY_2, TRAINER_CYNDY_3, TRAINER_CYNDY_4, TRAINER_CYNDY_5}, MAP_GROUP(ROUTE115), MAP_NUM(ROUTE115), }, { - {OPPONENT_MADELINE_1, OPPONENT_MADELINE_2, OPPONENT_MADELINE_3, OPPONENT_MADELINE_4, OPPONENT_MADELINE_5}, + {TRAINER_MADELINE_1, TRAINER_MADELINE_2, TRAINER_MADELINE_3, TRAINER_MADELINE_4, TRAINER_MADELINE_5}, MAP_GROUP(ROUTE113), MAP_NUM(ROUTE113), }, { - {OPPONENT_JENNY_1, OPPONENT_JENNY_2, OPPONENT_JENNY_3, OPPONENT_JENNY_4, OPPONENT_JENNY_5}, + {TRAINER_JENNY_1, TRAINER_JENNY_2, TRAINER_JENNY_3, TRAINER_JENNY_4, TRAINER_JENNY_5}, MAP_GROUP(ROUTE124), MAP_NUM(ROUTE124), }, { - {OPPONENT_DIANA_1, OPPONENT_DIANA_2, OPPONENT_DIANA_3, OPPONENT_DIANA_4, OPPONENT_DIANA_5}, + {TRAINER_DIANA_1, TRAINER_DIANA_2, TRAINER_DIANA_3, TRAINER_DIANA_4, TRAINER_DIANA_5}, MAP_GROUP(JAGGED_PASS), MAP_NUM(JAGGED_PASS), }, { - {OPPONENT_AMY_AND_LIV_1, OPPONENT_AMY_AND_LIV_2, OPPONENT_AMY_AND_LIV_4, OPPONENT_AMY_AND_LIV_5, OPPONENT_AMY_AND_LIV_6}, + {TRAINER_AMY_AND_LIV_1, TRAINER_AMY_AND_LIV_2, TRAINER_AMY_AND_LIV_4, TRAINER_AMY_AND_LIV_5, TRAINER_AMY_AND_LIV_6}, MAP_GROUP(ROUTE103), MAP_NUM(ROUTE103), }, { - {OPPONENT_ERNEST_1, OPPONENT_ERNEST_2, OPPONENT_ERNEST_3, OPPONENT_ERNEST_4, OPPONENT_ERNEST_5}, + {TRAINER_ERNEST_1, TRAINER_ERNEST_2, TRAINER_ERNEST_3, TRAINER_ERNEST_4, TRAINER_ERNEST_5}, MAP_GROUP(ROUTE125), MAP_NUM(ROUTE125), }, { - {OPPONENT_EDWIN_1, OPPONENT_EDWIN_2, OPPONENT_EDWIN_3, OPPONENT_EDWIN_4, OPPONENT_EDWIN_5}, + {TRAINER_EDWIN_1, TRAINER_EDWIN_2, TRAINER_EDWIN_3, TRAINER_EDWIN_4, TRAINER_EDWIN_5}, MAP_GROUP(ROUTE110), MAP_NUM(ROUTE110), }, { - {OPPONENT_LYDIA_1, OPPONENT_LYDIA_2, OPPONENT_LYDIA_3, OPPONENT_LYDIA_4, OPPONENT_LYDIA_5}, + {TRAINER_LYDIA_1, TRAINER_LYDIA_2, TRAINER_LYDIA_3, TRAINER_LYDIA_4, TRAINER_LYDIA_5}, MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), }, { - {OPPONENT_ISAAC_1, OPPONENT_ISAAC_2, OPPONENT_ISAAC_3, OPPONENT_ISAAC_4, OPPONENT_ISAAC_5}, + {TRAINER_ISAAC_1, TRAINER_ISAAC_2, TRAINER_ISAAC_3, TRAINER_ISAAC_4, TRAINER_ISAAC_5}, MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), }, { - {OPPONENT_CATHERINE_1, OPPONENT_CATHERINE_2, OPPONENT_CATHERINE_3, OPPONENT_CATHERINE_4, OPPONENT_CATHERINE_5}, + {TRAINER_CATHERINE_1, TRAINER_CATHERINE_2, TRAINER_CATHERINE_3, TRAINER_CATHERINE_4, TRAINER_CATHERINE_5}, MAP_GROUP(ROUTE119), MAP_NUM(ROUTE119), }, { - {OPPONENT_JACKSON_1, OPPONENT_JACKSON_2, OPPONENT_JACKSON_3, OPPONENT_JACKSON_4, OPPONENT_JACKSON_5}, + {TRAINER_JACKSON_1, TRAINER_JACKSON_2, TRAINER_JACKSON_3, TRAINER_JACKSON_4, TRAINER_JACKSON_5}, MAP_GROUP(ROUTE119), MAP_NUM(ROUTE119), }, { - {OPPONENT_HALEY_1, OPPONENT_HALEY_2, OPPONENT_HALEY_3, OPPONENT_HALEY_4, OPPONENT_HALEY_5}, + {TRAINER_HALEY_1, TRAINER_HALEY_2, TRAINER_HALEY_3, TRAINER_HALEY_4, TRAINER_HALEY_5}, MAP_GROUP(ROUTE104), MAP_NUM(ROUTE104), }, { - {OPPONENT_JAMES_1, OPPONENT_JAMES_2, OPPONENT_JAMES_3, OPPONENT_JAMES_4, OPPONENT_JAMES_5}, + {TRAINER_JAMES_1, TRAINER_JAMES_2, TRAINER_JAMES_3, TRAINER_JAMES_4, TRAINER_JAMES_5}, MAP_GROUP(PETALBURG_WOODS), MAP_NUM(PETALBURG_WOODS), }, { - {OPPONENT_TRENT_1, OPPONENT_TRENT_2, OPPONENT_TRENT_3, OPPONENT_TRENT_4, OPPONENT_TRENT_5}, + {TRAINER_TRENT_1, TRAINER_TRENT_2, TRAINER_TRENT_3, TRAINER_TRENT_4, TRAINER_TRENT_5}, MAP_GROUP(ROUTE112), MAP_NUM(ROUTE112), }, { - {OPPONENT_LOIS_AND_HAL_1, OPPONENT_LOIS_AND_HAL_2, OPPONENT_LOIS_AND_HAL_3, OPPONENT_LOIS_AND_HAL_4, OPPONENT_LOIS_AND_HAL_5}, + {TRAINER_LOIS_AND_HAL_1, TRAINER_LOIS_AND_HAL_2, TRAINER_LOIS_AND_HAL_3, TRAINER_LOIS_AND_HAL_4, TRAINER_LOIS_AND_HAL_5}, MAP_GROUP(ABANDONED_SHIP_ROOMS2_1F), MAP_NUM(ABANDONED_SHIP_ROOMS2_1F), }, { - {OPPONENT_WALLY_3, OPPONENT_WALLY_4, OPPONENT_WALLY_5, OPPONENT_WALLY_6, OPPONENT_NONE}, + {TRAINER_WALLY_3, TRAINER_WALLY_4, TRAINER_WALLY_5, TRAINER_WALLY_6, TRAINER_NONE}, MAP_GROUP(VICTORY_ROAD_1F), MAP_NUM(VICTORY_ROAD_1F), }, @@ -809,13 +809,13 @@ static u8 GetTrainerBattleTransition(void) if (trainer[gTrainerBattleOpponent].trainerClass == TRAINER_CLASS_ELITE_FOUR) { - if (gTrainerBattleOpponent == OPPONENT_SIDNEY) + if (gTrainerBattleOpponent == TRAINER_SIDNEY) return B_TRANSITION_SYDNEY; - if (gTrainerBattleOpponent == OPPONENT_PHOEBE) + if (gTrainerBattleOpponent == TRAINER_PHOEBE) return B_TRANSITION_PHOEBE; - if (gTrainerBattleOpponent == OPPONENT_GLACIA) + if (gTrainerBattleOpponent == TRAINER_GLACIA) return B_TRANSITION_GLACIA; - if (gTrainerBattleOpponent == OPPONENT_DRAKE) + if (gTrainerBattleOpponent == TRAINER_DRAKE) return B_TRANSITION_DRAKE; return B_TRANSITION_STEVEN; } diff --git a/src/data/trainers_de.h b/src/data/trainers_de.h index c7a0e7744..7344347e1 100644 --- a/src/data/trainers_de.h +++ b/src/data/trainers_de.h @@ -1,5 +1,5 @@ const struct Trainer gTrainers[] = { - [OPPONENT_NONE] = + [TRAINER_NONE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_1, @@ -13,7 +13,7 @@ const struct Trainer gTrainers[] = { .party = NULL }, - [OPPONENT_ARCHIE_1] = + [TRAINER_ARCHIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_LEADER, @@ -27,7 +27,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Archie1 }, - [OPPONENT_GRUNT_1] = + [TRAINER_GRUNT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -41,7 +41,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt1 }, - [OPPONENT_GRUNT_2] = + [TRAINER_GRUNT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -55,7 +55,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt2 }, - [OPPONENT_GRUNT_3] = + [TRAINER_GRUNT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -69,7 +69,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt3 }, - [OPPONENT_GRUNT_4] = + [TRAINER_GRUNT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -83,7 +83,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt4 }, - [OPPONENT_GRUNT_5] = + [TRAINER_GRUNT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -97,7 +97,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt5 }, - [OPPONENT_GRUNT_6] = + [TRAINER_GRUNT_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -111,7 +111,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt6 }, - [OPPONENT_GRUNT_7] = + [TRAINER_GRUNT_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -125,7 +125,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt7 }, - [OPPONENT_GRUNT_8] = + [TRAINER_GRUNT_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -139,7 +139,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt8 }, - [OPPONENT_GRUNT_9] = + [TRAINER_GRUNT_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -153,7 +153,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt9 }, - [OPPONENT_GRUNT_10] = + [TRAINER_GRUNT_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -167,7 +167,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt10 }, - [OPPONENT_GRUNT_11] = + [TRAINER_GRUNT_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -181,7 +181,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt11 }, - [OPPONENT_GRUNT_12] = + [TRAINER_GRUNT_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -195,7 +195,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt12 }, - [OPPONENT_GRUNT_13] = + [TRAINER_GRUNT_13] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -209,7 +209,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt13 }, - [OPPONENT_GRUNT_14] = + [TRAINER_GRUNT_14] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -223,7 +223,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt14 }, - [OPPONENT_GRUNT_15] = + [TRAINER_GRUNT_15] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -237,7 +237,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt15 }, - [OPPONENT_GRUNT_16] = + [TRAINER_GRUNT_16] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -251,7 +251,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt16 }, - [OPPONENT_GRUNT_17] = + [TRAINER_GRUNT_17] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -265,7 +265,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt17 }, - [OPPONENT_GRUNT_18] = + [TRAINER_GRUNT_18] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -279,7 +279,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt18 }, - [OPPONENT_GRUNT_19] = + [TRAINER_GRUNT_19] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -293,7 +293,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt19 }, - [OPPONENT_GRUNT_20] = + [TRAINER_GRUNT_20] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -307,7 +307,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt20 }, - [OPPONENT_GRUNT_21] = + [TRAINER_GRUNT_21] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -321,7 +321,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt21 }, - [OPPONENT_GRUNT_22] = + [TRAINER_GRUNT_22] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -335,7 +335,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt22 }, - [OPPONENT_GRUNT_23] = + [TRAINER_GRUNT_23] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -349,7 +349,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt23 }, - [OPPONENT_GRUNT_24] = + [TRAINER_GRUNT_24] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -363,7 +363,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt24 }, - [OPPONENT_GRUNT_25] = + [TRAINER_GRUNT_25] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -377,7 +377,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt25 }, - [OPPONENT_GRUNT_26] = + [TRAINER_GRUNT_26] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -391,7 +391,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt26 }, - [OPPONENT_GRUNT_27] = + [TRAINER_GRUNT_27] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -405,7 +405,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt27 }, - [OPPONENT_ANONYMOUS_1] = + [TRAINER_ANONYMOUS_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -419,7 +419,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous1 }, - [OPPONENT_MATT_1] = + [TRAINER_MATT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -433,7 +433,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Matt1 }, - [OPPONENT_MATT_2] = + [TRAINER_MATT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -447,7 +447,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Matt2 }, - [OPPONENT_SHELLY_1] = + [TRAINER_SHELLY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -461,7 +461,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelly1 }, - [OPPONENT_SHELLY_2] = + [TRAINER_SHELLY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -475,7 +475,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelly2 }, - [OPPONENT_ARCHIE_2] = + [TRAINER_ARCHIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_LEADER, @@ -489,7 +489,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Archie2 }, - [OPPONENT_ARCHIE_3] = + [TRAINER_ARCHIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_LEADER, @@ -503,7 +503,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Archie3 }, - [OPPONENT_DAISY] = + [TRAINER_DAISY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -517,7 +517,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Daisy }, - [OPPONENT_ROSE_1] = + [TRAINER_ROSE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -531,7 +531,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose1 }, - [OPPONENT_LILY] = + [TRAINER_LILY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -545,7 +545,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lily }, - [OPPONENT_VIOLET] = + [TRAINER_VIOLET] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -559,7 +559,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Violet }, - [OPPONENT_ROSE_2] = + [TRAINER_ROSE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -573,7 +573,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose2 }, - [OPPONENT_ROSE_3] = + [TRAINER_ROSE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -587,7 +587,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose3 }, - [OPPONENT_ROSE_4] = + [TRAINER_ROSE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -601,7 +601,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose4 }, - [OPPONENT_ROSE_5] = + [TRAINER_ROSE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -615,7 +615,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose5 }, - [OPPONENT_DUSTY_1] = + [TRAINER_DUSTY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -629,7 +629,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty1 }, - [OPPONENT_CHIP] = + [TRAINER_CHIP] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -643,7 +643,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chip }, - [OPPONENT_FOSTER] = + [TRAINER_FOSTER] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -657,7 +657,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Foster }, - [OPPONENT_DUSTY_2] = + [TRAINER_DUSTY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -671,7 +671,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty2 }, - [OPPONENT_DUSTY_3] = + [TRAINER_DUSTY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -685,7 +685,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty3 }, - [OPPONENT_DUSTY_4] = + [TRAINER_DUSTY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -699,7 +699,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty4 }, - [OPPONENT_DUSTY_5] = + [TRAINER_DUSTY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -713,7 +713,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty5 }, - [OPPONENT_GABBY_AND_TY_1] = + [TRAINER_GABBY_AND_TY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -727,7 +727,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy1 }, - [OPPONENT_GABBY_AND_TY_2] = + [TRAINER_GABBY_AND_TY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -741,7 +741,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy2 }, - [OPPONENT_GABBY_AND_TY_3] = + [TRAINER_GABBY_AND_TY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -755,7 +755,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy3 }, - [OPPONENT_GABBY_AND_TY_4] = + [TRAINER_GABBY_AND_TY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -769,7 +769,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy4 }, - [OPPONENT_GABBY_AND_TY_5] = + [TRAINER_GABBY_AND_TY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -783,7 +783,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy5 }, - [OPPONENT_GABBY_AND_TY_6] = + [TRAINER_GABBY_AND_TY_6] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -797,7 +797,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy6 }, - [OPPONENT_LOLA_1] = + [TRAINER_LOLA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -811,7 +811,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola1 }, - [OPPONENT_CARMEN] = + [TRAINER_CARMEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -825,7 +825,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Carmen }, - [OPPONENT_GWEN] = + [TRAINER_GWEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -839,7 +839,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Gwen }, - [OPPONENT_LOLA_2] = + [TRAINER_LOLA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -853,7 +853,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola2 }, - [OPPONENT_LOLA_3] = + [TRAINER_LOLA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -867,7 +867,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola3 }, - [OPPONENT_LOLA_4] = + [TRAINER_LOLA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -881,7 +881,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola4 }, - [OPPONENT_LOLA_5] = + [TRAINER_LOLA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -895,7 +895,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola5 }, - [OPPONENT_RICKY_1] = + [TRAINER_RICKY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -909,7 +909,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky1 }, - [OPPONENT_SIMON] = + [TRAINER_SIMON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -923,7 +923,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Simon }, - [OPPONENT_CHARLIE] = + [TRAINER_CHARLIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -937,7 +937,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Charlie }, - [OPPONENT_RICKY_2] = + [TRAINER_RICKY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -951,7 +951,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky2 }, - [OPPONENT_RICKY_3] = + [TRAINER_RICKY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -965,7 +965,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky3 }, - [OPPONENT_RICKY_4] = + [TRAINER_RICKY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -979,7 +979,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky4 }, - [OPPONENT_RICKY_5] = + [TRAINER_RICKY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -993,7 +993,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky5 }, - [OPPONENT_RANDALL] = + [TRAINER_RANDALL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1007,7 +1007,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Randall }, - [OPPONENT_PARKER] = + [TRAINER_PARKER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1021,7 +1021,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Parker }, - [OPPONENT_GEORGE] = + [TRAINER_GEORGE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1035,7 +1035,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_George }, - [OPPONENT_BERKE] = + [TRAINER_BERKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1049,7 +1049,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Berke }, - [OPPONENT_CLYDE] = + [TRAINER_CLYDE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1063,7 +1063,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Clyde }, - [OPPONENT_VINCENT] = + [TRAINER_VINCENT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1077,7 +1077,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vincent }, - [OPPONENT_LEROY] = + [TRAINER_LEROY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1091,7 +1091,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Leroy }, - [OPPONENT_WILTON_1] = + [TRAINER_WILTON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1105,7 +1105,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton1 }, - [OPPONENT_EDGAR] = + [TRAINER_EDGAR] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1119,7 +1119,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edgar }, - [OPPONENT_ALBERT] = + [TRAINER_ALBERT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1133,7 +1133,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Albert }, - [OPPONENT_SAMUEL] = + [TRAINER_SAMUEL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1147,7 +1147,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Samuel }, - [OPPONENT_VITO] = + [TRAINER_VITO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1161,7 +1161,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vito }, - [OPPONENT_OWEN] = + [TRAINER_OWEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1175,7 +1175,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Owen }, - [OPPONENT_WILTON_2] = + [TRAINER_WILTON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1189,7 +1189,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton2 }, - [OPPONENT_WILTON_3] = + [TRAINER_WILTON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1203,7 +1203,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton3 }, - [OPPONENT_WILTON_4] = + [TRAINER_WILTON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1217,7 +1217,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton4 }, - [OPPONENT_WILTON_5] = + [TRAINER_WILTON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1231,7 +1231,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton5 }, - [OPPONENT_WARREN] = + [TRAINER_WARREN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1245,7 +1245,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Warren }, - [OPPONENT_MARY] = + [TRAINER_MARY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1259,7 +1259,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Mary }, - [OPPONENT_LORI] = + [TRAINER_LORI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1273,7 +1273,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lori }, - [OPPONENT_JODY] = + [TRAINER_JODY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1287,7 +1287,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jody }, - [OPPONENT_WENDY] = + [TRAINER_WENDY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1301,7 +1301,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wendy }, - [OPPONENT_ELAINE] = + [TRAINER_ELAINE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1315,7 +1315,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elaine }, - [OPPONENT_BROOKE_1] = + [TRAINER_BROOKE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1329,7 +1329,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke1 }, - [OPPONENT_JENNIFER] = + [TRAINER_JENNIFER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1343,7 +1343,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jennifer }, - [OPPONENT_HOPE] = + [TRAINER_HOPE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1357,7 +1357,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hope }, - [OPPONENT_SHANNON] = + [TRAINER_SHANNON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1371,7 +1371,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shannon }, - [OPPONENT_MICHELLE] = + [TRAINER_MICHELLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1385,7 +1385,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Michelle }, - [OPPONENT_CAROLINE] = + [TRAINER_CAROLINE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1399,7 +1399,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Caroline }, - [OPPONENT_JULIE] = + [TRAINER_JULIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1413,7 +1413,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Julie }, - [OPPONENT_BROOKE_2] = + [TRAINER_BROOKE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1427,7 +1427,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke2 }, - [OPPONENT_BROOKE_3] = + [TRAINER_BROOKE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1441,7 +1441,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke3 }, - [OPPONENT_BROOKE_4] = + [TRAINER_BROOKE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1455,7 +1455,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke4 }, - [OPPONENT_BROOKE_5] = + [TRAINER_BROOKE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1469,7 +1469,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke5 }, - [OPPONENT_PATRICIA] = + [TRAINER_PATRICIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1483,7 +1483,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Patricia }, - [OPPONENT_KINDRA] = + [TRAINER_KINDRA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1497,7 +1497,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kindra }, - [OPPONENT_TAMMY] = + [TRAINER_TAMMY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1511,7 +1511,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tammy }, - [OPPONENT_VALERIE_1] = + [TRAINER_VALERIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1525,7 +1525,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie1 }, - [OPPONENT_TASHA] = + [TRAINER_TASHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1539,7 +1539,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tasha }, - [OPPONENT_VALERIE_2] = + [TRAINER_VALERIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1553,7 +1553,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie2 }, - [OPPONENT_VALERIE_3] = + [TRAINER_VALERIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1567,7 +1567,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie3 }, - [OPPONENT_VALERIE_4] = + [TRAINER_VALERIE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1581,7 +1581,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie4 }, - [OPPONENT_VALERIE_5] = + [TRAINER_VALERIE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1595,7 +1595,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie5 }, - [OPPONENT_CINDY_1] = + [TRAINER_CINDY_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1609,7 +1609,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy1 }, - [OPPONENT_ANONYMOUS_2] = + [TRAINER_ANONYMOUS_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LADY, @@ -1623,7 +1623,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous2 }, - [OPPONENT_BRIANNA_1] = + [TRAINER_BRIANNA_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LADY, @@ -1637,7 +1637,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brianna1 }, - [OPPONENT_CINDY_2] = + [TRAINER_CINDY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LADY, @@ -1651,7 +1651,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy2 }, - [OPPONENT_BRIANNA_2] = + [TRAINER_BRIANNA_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1665,7 +1665,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brianna2 }, - [OPPONENT_ANETTE] = + [TRAINER_ANETTE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1679,7 +1679,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anette }, - [OPPONENT_CINDY_3] = + [TRAINER_CINDY_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1693,7 +1693,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy3 }, - [OPPONENT_CINDY_4] = + [TRAINER_CINDY_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1707,7 +1707,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy4 }, - [OPPONENT_CINDY_5] = + [TRAINER_CINDY_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1721,7 +1721,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy5 }, - [OPPONENT_CINDY_6] = + [TRAINER_CINDY_6] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LADY, @@ -1735,7 +1735,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy6 }, - [OPPONENT_MELISSA] = + [TRAINER_MELISSA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1749,7 +1749,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Melissa }, - [OPPONENT_SHEILA] = + [TRAINER_SHEILA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1763,7 +1763,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sheila }, - [OPPONENT_SHIRLEY] = + [TRAINER_SHIRLEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1777,7 +1777,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shirley }, - [OPPONENT_JESSICA_1] = + [TRAINER_JESSICA_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1791,7 +1791,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica1 }, - [OPPONENT_CONNIE] = + [TRAINER_CONNIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1805,7 +1805,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Connie }, - [OPPONENT_BRIDGET] = + [TRAINER_BRIDGET] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1819,7 +1819,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bridget }, - [OPPONENT_OLIVIA] = + [TRAINER_OLIVIA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1833,7 +1833,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Olivia }, - [OPPONENT_TIFFANY] = + [TRAINER_TIFFANY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1847,7 +1847,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tiffany }, - [OPPONENT_JESSICA_2] = + [TRAINER_JESSICA_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1861,7 +1861,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica2 }, - [OPPONENT_JESSICA_3] = + [TRAINER_JESSICA_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1875,7 +1875,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica3 }, - [OPPONENT_JESSICA_4] = + [TRAINER_JESSICA_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1889,7 +1889,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica4 }, - [OPPONENT_JESSICA_5] = + [TRAINER_JESSICA_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1903,7 +1903,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica5 }, - [OPPONENT_WINSTON_1] = + [TRAINER_WINSTON_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1917,7 +1917,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston1 }, - [OPPONENT_ANONYMOUS_3] = + [TRAINER_ANONYMOUS_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1931,7 +1931,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous3 }, - [OPPONENT_GARRET] = + [TRAINER_GARRET] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1945,7 +1945,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Garret }, - [OPPONENT_WINSTON_2] = + [TRAINER_WINSTON_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1959,7 +1959,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston2 }, - [OPPONENT_WINSTON_3] = + [TRAINER_WINSTON_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1973,7 +1973,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston3 }, - [OPPONENT_WINSTON_4] = + [TRAINER_WINSTON_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1987,7 +1987,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston4 }, - [OPPONENT_WINSTON_5] = + [TRAINER_WINSTON_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -2001,7 +2001,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston5 }, - [OPPONENT_STEVE_1] = + [TRAINER_STEVE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2015,7 +2015,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve1 }, - [OPPONENT_CHRIS] = + [TRAINER_CHRIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2029,7 +2029,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chris }, - [OPPONENT_MARK] = + [TRAINER_MARK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2043,7 +2043,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Mark }, - [OPPONENT_KENN] = + [TRAINER_KENN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2057,7 +2057,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kenn }, - [OPPONENT_STEVE_2] = + [TRAINER_STEVE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2071,7 +2071,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve2 }, - [OPPONENT_STEVE_3] = + [TRAINER_STEVE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2085,7 +2085,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve3 }, - [OPPONENT_STEVE_4] = + [TRAINER_STEVE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2099,7 +2099,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve4 }, - [OPPONENT_STEVE_5] = + [TRAINER_STEVE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2113,7 +2113,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve5 }, - [OPPONENT_LUIS] = + [TRAINER_LUIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2127,7 +2127,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Luis }, - [OPPONENT_AUSTIN] = + [TRAINER_AUSTIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2141,7 +2141,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Austin }, - [OPPONENT_DOUGLAS] = + [TRAINER_DOUGLAS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2155,7 +2155,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Douglas }, - [OPPONENT_DARRIN] = + [TRAINER_DARRIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2169,7 +2169,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Darrin }, - [OPPONENT_TONY_1] = + [TRAINER_TONY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2183,7 +2183,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony1 }, - [OPPONENT_JEROME] = + [TRAINER_JEROME] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2197,7 +2197,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerome }, - [OPPONENT_MATTHEW] = + [TRAINER_MATTHEW] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2211,7 +2211,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Matthew }, - [OPPONENT_DAVID] = + [TRAINER_DAVID] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2225,7 +2225,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_David }, - [OPPONENT_SPENCER] = + [TRAINER_SPENCER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2239,7 +2239,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Spencer }, - [OPPONENT_ROLAND] = + [TRAINER_ROLAND] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2253,7 +2253,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Roland }, - [OPPONENT_CODY] = + [TRAINER_CODY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2267,7 +2267,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cody }, - [OPPONENT_STAN] = + [TRAINER_STAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2281,7 +2281,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Stan }, - [OPPONENT_BARRY] = + [TRAINER_BARRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2295,7 +2295,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Barry }, - [OPPONENT_DEAN] = + [TRAINER_DEAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2309,7 +2309,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dean }, - [OPPONENT_RODNEY] = + [TRAINER_RODNEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2323,7 +2323,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rodney }, - [OPPONENT_RICHARD] = + [TRAINER_RICHARD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2337,7 +2337,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Richard }, - [OPPONENT_HERMAN] = + [TRAINER_HERMAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2351,7 +2351,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Herman }, - [OPPONENT_ANONYMOUS_4] = + [TRAINER_ANONYMOUS_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2365,7 +2365,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous4 }, - [OPPONENT_GILBERT] = + [TRAINER_GILBERT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2379,7 +2379,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Gilbert }, - [OPPONENT_FRANKLIN] = + [TRAINER_FRANKLIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2393,7 +2393,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Franklin }, - [OPPONENT_DANNY] = + [TRAINER_DANNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2407,7 +2407,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Danny }, - [OPPONENT_JACK] = + [TRAINER_JACK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2421,7 +2421,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jack }, - [OPPONENT_DUDLEY] = + [TRAINER_DUDLEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2435,7 +2435,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dudley }, - [OPPONENT_CHAD] = + [TRAINER_CHAD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2449,7 +2449,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chad }, - [OPPONENT_TONY_2] = + [TRAINER_TONY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2463,7 +2463,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony2 }, - [OPPONENT_TONY_3] = + [TRAINER_TONY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2477,7 +2477,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony3 }, - [OPPONENT_TONY_4] = + [TRAINER_TONY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2491,7 +2491,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony4 }, - [OPPONENT_TONY_5] = + [TRAINER_TONY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2505,7 +2505,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony5 }, - [OPPONENT_HIDEKI] = + [TRAINER_HIDEKI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2519,7 +2519,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hideki }, - [OPPONENT_HITOSHI] = + [TRAINER_HITOSHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2533,7 +2533,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hitoshi }, - [OPPONENT_KIYO] = + [TRAINER_KIYO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2547,7 +2547,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kiyo }, - [OPPONENT_KOICHI] = + [TRAINER_KOICHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2561,7 +2561,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Koichi }, - [OPPONENT_NOB_1] = + [TRAINER_NOB_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2575,7 +2575,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob1 }, - [OPPONENT_NOB_2] = + [TRAINER_NOB_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2589,7 +2589,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob2 }, - [OPPONENT_NOB_3] = + [TRAINER_NOB_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2603,7 +2603,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob3 }, - [OPPONENT_NOB_4] = + [TRAINER_NOB_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2617,7 +2617,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob4 }, - [OPPONENT_NOB_5] = + [TRAINER_NOB_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2631,7 +2631,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob5 }, - [OPPONENT_YUJI] = + [TRAINER_YUJI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2645,7 +2645,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Yuji }, - [OPPONENT_DAISUKE] = + [TRAINER_DAISUKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2659,7 +2659,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Daisuke }, - [OPPONENT_ATSUSHI] = + [TRAINER_ATSUSHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2673,7 +2673,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Atsushi }, - [OPPONENT_KIRK] = + [TRAINER_KIRK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2687,7 +2687,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kirk }, - [OPPONENT_SCOTT] = + [TRAINER_SCOTT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2701,7 +2701,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Scott }, - [OPPONENT_HARVEY] = + [TRAINER_HARVEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2715,7 +2715,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Harvey }, - [OPPONENT_SHAWN] = + [TRAINER_SHAWN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2729,7 +2729,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shawn }, - [OPPONENT_RANDY] = + [TRAINER_RANDY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2743,7 +2743,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Randy }, - [OPPONENT_DALTON_1] = + [TRAINER_DALTON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2757,7 +2757,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton1 }, - [OPPONENT_DALTON_2] = + [TRAINER_DALTON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2771,7 +2771,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton2 }, - [OPPONENT_DALTON_3] = + [TRAINER_DALTON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2785,7 +2785,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton3 }, - [OPPONENT_DALTON_4] = + [TRAINER_DALTON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2799,7 +2799,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton4 }, - [OPPONENT_DALTON_5] = + [TRAINER_DALTON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2813,7 +2813,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton5 }, - [OPPONENT_COLE] = + [TRAINER_COLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2827,7 +2827,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cole }, - [OPPONENT_FLINT] = + [TRAINER_FLINT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2841,7 +2841,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Flint }, - [OPPONENT_AXLE] = + [TRAINER_AXLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2855,7 +2855,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Axle }, - [OPPONENT_JAKE] = + [TRAINER_JAKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2869,7 +2869,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jake }, - [OPPONENT_ANDY] = + [TRAINER_ANDY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2883,7 +2883,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Andy }, - [OPPONENT_BERNIE_1] = + [TRAINER_BERNIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2897,7 +2897,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie1 }, - [OPPONENT_BERNIE_2] = + [TRAINER_BERNIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2911,7 +2911,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie2 }, - [OPPONENT_BERNIE_3] = + [TRAINER_BERNIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2925,7 +2925,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie3 }, - [OPPONENT_BERNIE_4] = + [TRAINER_BERNIE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2939,7 +2939,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie4 }, - [OPPONENT_BERNIE_5] = + [TRAINER_BERNIE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2953,7 +2953,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie5 }, - [OPPONENT_DREW] = + [TRAINER_DREW] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_CAMPER, @@ -2967,7 +2967,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Drew }, - [OPPONENT_CLIFF] = + [TRAINER_CLIFF] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_CAMPER, @@ -2981,7 +2981,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cliff }, - [OPPONENT_LARRY] = + [TRAINER_LARRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -2995,7 +2995,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Larry }, - [OPPONENT_SHANE] = + [TRAINER_SHANE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3009,7 +3009,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shane }, - [OPPONENT_JUSTIN] = + [TRAINER_JUSTIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3023,7 +3023,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Justin }, - [OPPONENT_ETHAN_1] = + [TRAINER_ETHAN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3037,7 +3037,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan1 }, - [OPPONENT_JEFF] = + [TRAINER_JEFF] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3051,7 +3051,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jeff }, - [OPPONENT_TRAVIS] = + [TRAINER_TRAVIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3065,7 +3065,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Travis }, - [OPPONENT_ETHAN_2] = + [TRAINER_ETHAN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3079,7 +3079,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan2 }, - [OPPONENT_ETHAN_3] = + [TRAINER_ETHAN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3093,7 +3093,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan3 }, - [OPPONENT_ETHAN_4] = + [TRAINER_ETHAN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3107,7 +3107,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan4 }, - [OPPONENT_ETHAN_5] = + [TRAINER_ETHAN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3121,7 +3121,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan5 }, - [OPPONENT_BRENT] = + [TRAINER_BRENT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3135,7 +3135,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brent }, - [OPPONENT_DONALD] = + [TRAINER_DONALD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3149,7 +3149,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Donald }, - [OPPONENT_TAYLOR] = + [TRAINER_TAYLOR] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3163,7 +3163,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Taylor }, - [OPPONENT_BRANDON_1] = + [TRAINER_BRANDON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3177,7 +3177,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon1 }, - [OPPONENT_DEREK] = + [TRAINER_DEREK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3191,7 +3191,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Derek }, - [OPPONENT_BRANDON_2] = + [TRAINER_BRANDON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3205,7 +3205,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon2 }, - [OPPONENT_BRANDON_3] = + [TRAINER_BRANDON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3219,7 +3219,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon3 }, - [OPPONENT_BRANDON_4] = + [TRAINER_BRANDON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3233,7 +3233,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon4 }, - [OPPONENT_BRANDON_5] = + [TRAINER_BRANDON_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3247,7 +3247,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon5 }, - [OPPONENT_EDWARD] = + [TRAINER_EDWARD] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3261,7 +3261,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edward }, - [OPPONENT_PRESTON] = + [TRAINER_PRESTON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3275,7 +3275,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Preston }, - [OPPONENT_VIRGIL] = + [TRAINER_VIRGIL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3289,7 +3289,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Virgil }, - [OPPONENT_FRITZ] = + [TRAINER_FRITZ] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3303,7 +3303,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Fritz }, - [OPPONENT_WILLIAM] = + [TRAINER_WILLIAM] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3317,7 +3317,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_William }, - [OPPONENT_JOSHUA] = + [TRAINER_JOSHUA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3331,7 +3331,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Joshua }, - [OPPONENT_CAMERON_1] = + [TRAINER_CAMERON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3345,7 +3345,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron1 }, - [OPPONENT_CAMERON_2] = + [TRAINER_CAMERON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3359,7 +3359,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron2 }, - [OPPONENT_CAMERON_3] = + [TRAINER_CAMERON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3373,7 +3373,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron3 }, - [OPPONENT_CAMERON_4] = + [TRAINER_CAMERON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3387,7 +3387,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron4 }, - [OPPONENT_CAMERON_5] = + [TRAINER_CAMERON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3401,7 +3401,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron5 }, - [OPPONENT_JACLYN] = + [TRAINER_JACLYN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3415,7 +3415,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jaclyn }, - [OPPONENT_HANNAH] = + [TRAINER_HANNAH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3429,7 +3429,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hannah }, - [OPPONENT_SAMANTHA] = + [TRAINER_SAMANTHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3443,7 +3443,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Samantha }, - [OPPONENT_MAURA] = + [TRAINER_MAURA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3457,7 +3457,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maura }, - [OPPONENT_KAYLA] = + [TRAINER_KAYLA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3471,7 +3471,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kayla }, - [OPPONENT_ALEXIS] = + [TRAINER_ALEXIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3485,7 +3485,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alexis }, - [OPPONENT_JACKI_1] = + [TRAINER_JACKI_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3499,7 +3499,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki1 }, - [OPPONENT_JACKI_2] = + [TRAINER_JACKI_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3513,7 +3513,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki2 }, - [OPPONENT_JACKI_3] = + [TRAINER_JACKI_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3527,7 +3527,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki3 }, - [OPPONENT_JACKI_4] = + [TRAINER_JACKI_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3541,7 +3541,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki4 }, - [OPPONENT_JACKI_5] = + [TRAINER_JACKI_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3555,7 +3555,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki5 }, - [OPPONENT_WALTER_1] = + [TRAINER_WALTER_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3569,7 +3569,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter1 }, - [OPPONENT_TUCKER] = + [TRAINER_TUCKER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3583,7 +3583,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tucker }, - [OPPONENT_THOMAS] = + [TRAINER_THOMAS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3597,7 +3597,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Thomas }, - [OPPONENT_WALTER_2] = + [TRAINER_WALTER_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3611,7 +3611,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter2 }, - [OPPONENT_WALTER_3] = + [TRAINER_WALTER_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3625,7 +3625,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter3 }, - [OPPONENT_WALTER_4] = + [TRAINER_WALTER_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3639,7 +3639,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter4 }, - [OPPONENT_WALTER_5] = + [TRAINER_WALTER_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3653,7 +3653,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter5 }, - [OPPONENT_SIDNEY] = + [TRAINER_SIDNEY] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3667,7 +3667,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sidney }, - [OPPONENT_PHOEBE] = + [TRAINER_PHOEBE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3681,7 +3681,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Phoebe }, - [OPPONENT_GLACIA] = + [TRAINER_GLACIA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3695,7 +3695,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Glacia }, - [OPPONENT_DRAKE] = + [TRAINER_DRAKE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3709,7 +3709,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Drake }, - [OPPONENT_ROXANNE] = + [TRAINER_ROXANNE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3723,7 +3723,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Roxanne }, - [OPPONENT_BRAWLY] = + [TRAINER_BRAWLY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3737,7 +3737,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brawly }, - [OPPONENT_WATTSON] = + [TRAINER_WATTSON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3751,7 +3751,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wattson }, - [OPPONENT_FLANNERY] = + [TRAINER_FLANNERY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3765,7 +3765,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Flannery }, - [OPPONENT_NORMAN] = + [TRAINER_NORMAN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3779,7 +3779,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Norman }, - [OPPONENT_WINONA] = + [TRAINER_WINONA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3793,7 +3793,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winona }, - [OPPONENT_TATE_AND_LIZA] = + [TRAINER_TATE_AND_LIZA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3807,7 +3807,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_TateAndLiza }, - [OPPONENT_WALLACE] = + [TRAINER_WALLACE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3821,7 +3821,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wallace }, - [OPPONENT_JERRY_1] = + [TRAINER_JERRY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3835,7 +3835,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry1 }, - [OPPONENT_TED] = + [TRAINER_TED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3849,7 +3849,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ted }, - [OPPONENT_PAUL] = + [TRAINER_PAUL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3863,7 +3863,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Paul }, - [OPPONENT_JERRY_2] = + [TRAINER_JERRY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3877,7 +3877,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry2 }, - [OPPONENT_JERRY_3] = + [TRAINER_JERRY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3891,7 +3891,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry3 }, - [OPPONENT_JERRY_4] = + [TRAINER_JERRY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3905,7 +3905,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry4 }, - [OPPONENT_JERRY_5] = + [TRAINER_JERRY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3919,7 +3919,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry5 }, - [OPPONENT_KAREN_1] = + [TRAINER_KAREN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3933,7 +3933,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen1 }, - [OPPONENT_GEORGIA] = + [TRAINER_GEORGIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3947,7 +3947,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Georgia }, - [OPPONENT_KAREN_2] = + [TRAINER_KAREN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3961,7 +3961,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen2 }, - [OPPONENT_KAREN_3] = + [TRAINER_KAREN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3975,7 +3975,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen3 }, - [OPPONENT_KAREN_4] = + [TRAINER_KAREN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3989,7 +3989,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen4 }, - [OPPONENT_KAREN_5] = + [TRAINER_KAREN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -4003,7 +4003,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen5 }, - [OPPONENT_KATE_AND_JOY] = + [TRAINER_KATE_AND_JOY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4017,7 +4017,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_KateAndJoy }, - [OPPONENT_ANNA_AND_MEG_1] = + [TRAINER_ANNA_AND_MEG_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4031,7 +4031,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg1 }, - [OPPONENT_ANNA_AND_MEG_2] = + [TRAINER_ANNA_AND_MEG_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4045,7 +4045,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg2 }, - [OPPONENT_ANNA_AND_MEG_3] = + [TRAINER_ANNA_AND_MEG_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4059,7 +4059,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg3 }, - [OPPONENT_ANNA_AND_MEG_4] = + [TRAINER_ANNA_AND_MEG_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4073,7 +4073,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg4 }, - [OPPONENT_ANNA_AND_MEG_5] = + [TRAINER_ANNA_AND_MEG_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4087,7 +4087,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg5 }, - [OPPONENT_VICTOR] = + [TRAINER_VICTOR] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -4101,7 +4101,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Victor }, - [OPPONENT_MIGUEL_1] = + [TRAINER_MIGUEL_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4115,7 +4115,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel1 }, - [OPPONENT_COLTON] = + [TRAINER_COLTON] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4129,7 +4129,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Colton }, - [OPPONENT_MIGUEL_2] = + [TRAINER_MIGUEL_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4143,7 +4143,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel2 }, - [OPPONENT_MIGUEL_3] = + [TRAINER_MIGUEL_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4157,7 +4157,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel3 }, - [OPPONENT_MIGUEL_4] = + [TRAINER_MIGUEL_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4171,7 +4171,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel4 }, - [OPPONENT_MIGUEL_5] = + [TRAINER_MIGUEL_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4185,7 +4185,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel5 }, - [OPPONENT_VICTORIA] = + [TRAINER_VICTORIA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -4199,7 +4199,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Victoria }, - [OPPONENT_VANESSA] = + [TRAINER_VANESSA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4213,7 +4213,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vanessa }, - [OPPONENT_MARISSA] = + [TRAINER_MARISSA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4227,7 +4227,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Marissa }, - [OPPONENT_ISABEL_1] = + [TRAINER_ISABEL_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4241,7 +4241,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel1 }, - [OPPONENT_ISABEL_2] = + [TRAINER_ISABEL_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4255,7 +4255,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel2 }, - [OPPONENT_ISABEL_3] = + [TRAINER_ISABEL_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4269,7 +4269,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel3 }, - [OPPONENT_ISABEL_4] = + [TRAINER_ISABEL_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4283,7 +4283,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel4 }, - [OPPONENT_ISABEL_5] = + [TRAINER_ISABEL_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4297,7 +4297,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel5 }, - [OPPONENT_TIMOTHY_1] = + [TRAINER_TIMOTHY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4311,7 +4311,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy1 }, - [OPPONENT_TIMOTHY_2] = + [TRAINER_TIMOTHY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4325,7 +4325,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy2 }, - [OPPONENT_TIMOTHY_3] = + [TRAINER_TIMOTHY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4339,7 +4339,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy3 }, - [OPPONENT_TIMOTHY_4] = + [TRAINER_TIMOTHY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4353,7 +4353,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy4 }, - [OPPONENT_TIMOTHY_5] = + [TRAINER_TIMOTHY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4367,7 +4367,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy5 }, - [OPPONENT_VICKY] = + [TRAINER_VICKY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -4381,7 +4381,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vicky }, - [OPPONENT_SHELBY_1] = + [TRAINER_SHELBY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4395,7 +4395,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby1 }, - [OPPONENT_SHELBY_2] = + [TRAINER_SHELBY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4409,7 +4409,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby2 }, - [OPPONENT_SHELBY_3] = + [TRAINER_SHELBY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4423,7 +4423,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby3 }, - [OPPONENT_SHELBY_4] = + [TRAINER_SHELBY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4437,7 +4437,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby4 }, - [OPPONENT_SHELBY_5] = + [TRAINER_SHELBY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4451,7 +4451,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby5 }, - [OPPONENT_CALVIN_1] = + [TRAINER_CALVIN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4465,7 +4465,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin1 }, - [OPPONENT_BILLY] = + [TRAINER_BILLY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4479,7 +4479,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Billy }, - [OPPONENT_JOSH] = + [TRAINER_JOSH] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4493,7 +4493,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Josh }, - [OPPONENT_TOMMY] = + [TRAINER_TOMMY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4507,7 +4507,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tommy }, - [OPPONENT_JOEY] = + [TRAINER_JOEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4521,7 +4521,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Joey }, - [OPPONENT_BEN] = + [TRAINER_BEN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4535,7 +4535,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ben }, - [OPPONENT_ANONYMOUS_5] = + [TRAINER_ANONYMOUS_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4549,7 +4549,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous5 }, - [OPPONENT_KEVIN] = + [TRAINER_KEVIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4563,7 +4563,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kevin }, - [OPPONENT_NEAL] = + [TRAINER_NEAL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4577,7 +4577,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Neal }, - [OPPONENT_DILLON] = + [TRAINER_DILLON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4591,7 +4591,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dillon }, - [OPPONENT_CALVIN_2] = + [TRAINER_CALVIN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4605,7 +4605,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin2 }, - [OPPONENT_CALVIN_3] = + [TRAINER_CALVIN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4619,7 +4619,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin3 }, - [OPPONENT_CALVIN_4] = + [TRAINER_CALVIN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4633,7 +4633,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin4 }, - [OPPONENT_CALVIN_5] = + [TRAINER_CALVIN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4647,7 +4647,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin5 }, - [OPPONENT_EDDIE] = + [TRAINER_EDDIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4661,7 +4661,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Eddie }, - [OPPONENT_ALLEN] = + [TRAINER_ALLEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4675,7 +4675,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Allen }, - [OPPONENT_TIMMY] = + [TRAINER_TIMMY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4689,7 +4689,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timmy }, - [OPPONENT_STEVEN] = + [TRAINER_STEVEN] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_CHAMPION, @@ -4703,7 +4703,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steven }, - [OPPONENT_ANDREW] = + [TRAINER_ANDREW] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4717,7 +4717,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Andrew }, - [OPPONENT_IVAN] = + [TRAINER_IVAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4731,7 +4731,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ivan }, - [OPPONENT_CLAUDE] = + [TRAINER_CLAUDE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4745,7 +4745,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Claude }, - [OPPONENT_ELLIOT_1] = + [TRAINER_ELLIOT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4759,7 +4759,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot1 }, - [OPPONENT_NED] = + [TRAINER_NED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4773,7 +4773,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ned }, - [OPPONENT_DALE] = + [TRAINER_DALE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4787,7 +4787,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dale }, - [OPPONENT_NOLAN] = + [TRAINER_NOLAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4801,7 +4801,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nolan }, - [OPPONENT_BARNY] = + [TRAINER_BARNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4815,7 +4815,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Barny }, - [OPPONENT_WADE] = + [TRAINER_WADE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4829,7 +4829,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wade }, - [OPPONENT_CARTER] = + [TRAINER_CARTER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4843,7 +4843,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Carter }, - [OPPONENT_ELLIOT_2] = + [TRAINER_ELLIOT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4857,7 +4857,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot2 }, - [OPPONENT_ELLIOT_3] = + [TRAINER_ELLIOT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4871,7 +4871,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot3 }, - [OPPONENT_ELLIOT_4] = + [TRAINER_ELLIOT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4885,7 +4885,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot4 }, - [OPPONENT_ELLIOT_5] = + [TRAINER_ELLIOT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4899,7 +4899,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot5 }, - [OPPONENT_RONALD] = + [TRAINER_RONALD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4913,7 +4913,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ronald }, - [OPPONENT_JACOB] = + [TRAINER_JACOB] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4927,7 +4927,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacob }, - [OPPONENT_ANTHONY] = + [TRAINER_ANTHONY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4941,7 +4941,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anthony }, - [OPPONENT_BENJAMIN_1] = + [TRAINER_BENJAMIN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4955,7 +4955,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin1 }, - [OPPONENT_BENJAMIN_2] = + [TRAINER_BENJAMIN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4969,7 +4969,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin2 }, - [OPPONENT_BENJAMIN_3] = + [TRAINER_BENJAMIN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4983,7 +4983,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin3 }, - [OPPONENT_BENJAMIN_4] = + [TRAINER_BENJAMIN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4997,7 +4997,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin4 }, - [OPPONENT_BENJAMIN_5] = + [TRAINER_BENJAMIN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5011,7 +5011,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin5 }, - [OPPONENT_ABIGAIL_1] = + [TRAINER_ABIGAIL_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5025,7 +5025,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail1 }, - [OPPONENT_JASMINE] = + [TRAINER_JASMINE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5039,7 +5039,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jasmine }, - [OPPONENT_ABIGAIL_2] = + [TRAINER_ABIGAIL_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5053,7 +5053,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail2 }, - [OPPONENT_ABIGAIL_3] = + [TRAINER_ABIGAIL_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5067,7 +5067,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail3 }, - [OPPONENT_ABIGAIL_4] = + [TRAINER_ABIGAIL_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5081,7 +5081,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail4 }, - [OPPONENT_ABIGAIL_5] = + [TRAINER_ABIGAIL_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5095,7 +5095,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail5 }, - [OPPONENT_DYLAN_1] = + [TRAINER_DYLAN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5109,7 +5109,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan1 }, - [OPPONENT_DYLAN_2] = + [TRAINER_DYLAN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5123,7 +5123,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan2 }, - [OPPONENT_DYLAN_3] = + [TRAINER_DYLAN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5137,7 +5137,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan3 }, - [OPPONENT_DYLAN_4] = + [TRAINER_DYLAN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5151,7 +5151,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan4 }, - [OPPONENT_DYLAN_5] = + [TRAINER_DYLAN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5165,7 +5165,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan5 }, - [OPPONENT_MARIA_1] = + [TRAINER_MARIA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5179,7 +5179,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria1 }, - [OPPONENT_MARIA_2] = + [TRAINER_MARIA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5193,7 +5193,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria2 }, - [OPPONENT_MARIA_3] = + [TRAINER_MARIA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5207,7 +5207,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria3 }, - [OPPONENT_MARIA_4] = + [TRAINER_MARIA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5221,7 +5221,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria4 }, - [OPPONENT_MARIA_5] = + [TRAINER_MARIA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5235,7 +5235,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria5 }, - [OPPONENT_CALEB] = + [TRAINER_CALEB] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5249,7 +5249,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Caleb }, - [OPPONENT_ANONYMOUS_6] = + [TRAINER_ANONYMOUS_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5263,7 +5263,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous6 }, - [OPPONENT_ISAIAH_1] = + [TRAINER_ISAIAH_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5277,7 +5277,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah1 }, - [OPPONENT_ANONYMOUS_7] = + [TRAINER_ANONYMOUS_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5291,7 +5291,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous7 }, - [OPPONENT_CHASE] = + [TRAINER_CHASE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5305,7 +5305,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chase }, - [OPPONENT_ISAIAH_2] = + [TRAINER_ISAIAH_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5319,7 +5319,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah2 }, - [OPPONENT_ISAIAH_3] = + [TRAINER_ISAIAH_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5333,7 +5333,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah3 }, - [OPPONENT_ISAIAH_4] = + [TRAINER_ISAIAH_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5347,7 +5347,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah4 }, - [OPPONENT_ISAIAH_5] = + [TRAINER_ISAIAH_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5361,7 +5361,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah5 }, - [OPPONENT_ANONYMOUS_8] = + [TRAINER_ANONYMOUS_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5375,7 +5375,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous8 }, - [OPPONENT_CONNOR] = + [TRAINER_CONNOR] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5389,7 +5389,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Connor }, - [OPPONENT_ANONYMOUS_9] = + [TRAINER_ANONYMOUS_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5403,7 +5403,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous9 }, - [OPPONENT_KATELYN_1] = + [TRAINER_KATELYN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5417,7 +5417,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn1 }, - [OPPONENT_ALLISON] = + [TRAINER_ALLISON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5431,7 +5431,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Allison }, - [OPPONENT_KATELYN_2] = + [TRAINER_KATELYN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5445,7 +5445,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn2 }, - [OPPONENT_KATELYN_3] = + [TRAINER_KATELYN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5459,7 +5459,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn3 }, - [OPPONENT_KATELYN_4] = + [TRAINER_KATELYN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5473,7 +5473,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn4 }, - [OPPONENT_KATELYN_5] = + [TRAINER_KATELYN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5487,7 +5487,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn5 }, - [OPPONENT_NICOLAS_1] = + [TRAINER_NICOLAS_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5501,7 +5501,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas1 }, - [OPPONENT_NICOLAS_2] = + [TRAINER_NICOLAS_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5515,7 +5515,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas2 }, - [OPPONENT_NICOLAS_3] = + [TRAINER_NICOLAS_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5529,7 +5529,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas3 }, - [OPPONENT_NICOLAS_4] = + [TRAINER_NICOLAS_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5543,7 +5543,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas4 }, - [OPPONENT_NICOLAS_5] = + [TRAINER_NICOLAS_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5557,7 +5557,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas5 }, - [OPPONENT_AARON] = + [TRAINER_AARON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5571,7 +5571,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Aaron }, - [OPPONENT_PERRY] = + [TRAINER_PERRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5585,7 +5585,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Perry }, - [OPPONENT_HUGH] = + [TRAINER_HUGH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5599,7 +5599,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hugh }, - [OPPONENT_PHIL] = + [TRAINER_PHIL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5613,7 +5613,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Phil }, - [OPPONENT_JARED] = + [TRAINER_JARED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5627,7 +5627,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jared }, - [OPPONENT_ANONYMOUS_10] = + [TRAINER_ANONYMOUS_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5641,7 +5641,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous10 }, - [OPPONENT_TANNER] = + [TRAINER_TANNER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5655,7 +5655,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tanner }, - [OPPONENT_WILL] = + [TRAINER_WILL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5669,7 +5669,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Will }, - [OPPONENT_COLIN] = + [TRAINER_COLIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5683,7 +5683,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Colin }, - [OPPONENT_ROBERT_1] = + [TRAINER_ROBERT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5697,7 +5697,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert1 }, - [OPPONENT_BENNY] = + [TRAINER_BENNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5711,7 +5711,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benny }, - [OPPONENT_CHESTER] = + [TRAINER_CHESTER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5725,7 +5725,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chester }, - [OPPONENT_ROBERT_2] = + [TRAINER_ROBERT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5739,7 +5739,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert2 }, - [OPPONENT_ROBERT_3] = + [TRAINER_ROBERT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5753,7 +5753,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert3 }, - [OPPONENT_ROBERT_4] = + [TRAINER_ROBERT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5767,7 +5767,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert4 }, - [OPPONENT_ROBERT_5] = + [TRAINER_ROBERT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5781,7 +5781,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert5 }, - [OPPONENT_ALEX] = + [TRAINER_ALEX] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5795,7 +5795,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alex }, - [OPPONENT_BECK] = + [TRAINER_BECK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5809,7 +5809,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Beck }, - [OPPONENT_YASU] = + [TRAINER_YASU] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5823,7 +5823,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Yasu }, - [OPPONENT_TAKASHI] = + [TRAINER_TAKASHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5837,7 +5837,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Takashi }, - [OPPONENT_MAKOTO] = + [TRAINER_MAKOTO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5851,7 +5851,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Makoto }, - [OPPONENT_HIDEO_1] = + [TRAINER_HIDEO_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5865,7 +5865,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hideo1 }, - [OPPONENT_LAO_1] = + [TRAINER_LAO_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5879,7 +5879,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao1 }, - [OPPONENT_LUNG] = + [TRAINER_LUNG] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5893,7 +5893,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lung }, - [OPPONENT_LAO_2] = + [TRAINER_LAO_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5907,7 +5907,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao2 }, - [OPPONENT_LAO_3] = + [TRAINER_LAO_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5921,7 +5921,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao3 }, - [OPPONENT_LAO_4] = + [TRAINER_LAO_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5935,7 +5935,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao4 }, - [OPPONENT_LAO_5] = + [TRAINER_LAO_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5949,7 +5949,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao5 }, - [OPPONENT_TESSA] = + [TRAINER_TESSA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -5963,7 +5963,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tessa }, - [OPPONENT_LAURA] = + [TRAINER_LAURA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -5977,7 +5977,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Laura }, - [OPPONENT_CYNDY_1] = + [TRAINER_CYNDY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -5991,7 +5991,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy1 }, - [OPPONENT_CORA] = + [TRAINER_CORA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6005,7 +6005,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cora }, - [OPPONENT_JILL] = + [TRAINER_JILL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6019,7 +6019,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jill }, - [OPPONENT_CYNDY_2] = + [TRAINER_CYNDY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6033,7 +6033,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy2 }, - [OPPONENT_CYNDY_3] = + [TRAINER_CYNDY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6047,7 +6047,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy3 }, - [OPPONENT_CYNDY_4] = + [TRAINER_CYNDY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6061,7 +6061,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy4 }, - [OPPONENT_CYNDY_5] = + [TRAINER_CYNDY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6075,7 +6075,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy5 }, - [OPPONENT_MADELINE_1] = + [TRAINER_MADELINE_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6089,7 +6089,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline1 }, - [OPPONENT_CLARISSA] = + [TRAINER_CLARISSA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6103,7 +6103,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Clarissa }, - [OPPONENT_ANGELICA] = + [TRAINER_ANGELICA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6117,7 +6117,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Angelica }, - [OPPONENT_MADELINE_2] = + [TRAINER_MADELINE_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6131,7 +6131,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline2 }, - [OPPONENT_MADELINE_3] = + [TRAINER_MADELINE_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6145,7 +6145,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline3 }, - [OPPONENT_MADELINE_4] = + [TRAINER_MADELINE_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6159,7 +6159,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline4 }, - [OPPONENT_MADELINE_5] = + [TRAINER_MADELINE_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6173,7 +6173,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline5 }, - [OPPONENT_BEVERLY] = + [TRAINER_BEVERLY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6187,7 +6187,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Beverly }, - [OPPONENT_DAWN] = + [TRAINER_DAWN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6201,7 +6201,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dawn }, - [OPPONENT_NICOLE] = + [TRAINER_NICOLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6215,7 +6215,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicole }, - [OPPONENT_DENISE] = + [TRAINER_DENISE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6229,7 +6229,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Denise }, - [OPPONENT_BETH] = + [TRAINER_BETH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6243,7 +6243,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Beth }, - [OPPONENT_TARA] = + [TRAINER_TARA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6257,7 +6257,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tara }, - [OPPONENT_MISSY] = + [TRAINER_MISSY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6271,7 +6271,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Missy }, - [OPPONENT_ALICE] = + [TRAINER_ALICE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6285,7 +6285,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alice }, - [OPPONENT_JENNY_1] = + [TRAINER_JENNY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6299,7 +6299,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny1 }, - [OPPONENT_GRACE] = + [TRAINER_GRACE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6313,7 +6313,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grace }, - [OPPONENT_TANYA] = + [TRAINER_TANYA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6327,7 +6327,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tanya }, - [OPPONENT_SHARON] = + [TRAINER_SHARON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6341,7 +6341,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sharon }, - [OPPONENT_NIKKI] = + [TRAINER_NIKKI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6355,7 +6355,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nikki }, - [OPPONENT_BRENDA] = + [TRAINER_BRENDA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6369,7 +6369,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brenda }, - [OPPONENT_KATIE] = + [TRAINER_KATIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6383,7 +6383,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katie }, - [OPPONENT_SUSIE] = + [TRAINER_SUSIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6397,7 +6397,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Susie }, - [OPPONENT_KARA] = + [TRAINER_KARA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6411,7 +6411,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kara }, - [OPPONENT_DANA] = + [TRAINER_DANA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6425,7 +6425,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dana }, - [OPPONENT_ERIN] = + [TRAINER_ERIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6439,7 +6439,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Erin }, - [OPPONENT_DEBRA] = + [TRAINER_DEBRA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6453,7 +6453,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Debra }, - [OPPONENT_LINDA] = + [TRAINER_LINDA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6467,7 +6467,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Linda }, - [OPPONENT_KAYLEE] = + [TRAINER_KAYLEE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6481,7 +6481,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kaylee }, - [OPPONENT_LAUREL] = + [TRAINER_LAUREL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6495,7 +6495,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Laurel }, - [OPPONENT_DARCY] = + [TRAINER_DARCY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6509,7 +6509,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Darcy }, - [OPPONENT_JENNY_2] = + [TRAINER_JENNY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6523,7 +6523,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny2 }, - [OPPONENT_JENNY_3] = + [TRAINER_JENNY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6537,7 +6537,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny3 }, - [OPPONENT_JENNY_4] = + [TRAINER_JENNY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6551,7 +6551,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny4 }, - [OPPONENT_JENNY_5] = + [TRAINER_JENNY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6565,7 +6565,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny5 }, - [OPPONENT_HEIDI] = + [TRAINER_HEIDI] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6579,7 +6579,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Heidi }, - [OPPONENT_BECKY] = + [TRAINER_BECKY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6593,7 +6593,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Becky }, - [OPPONENT_CAROL] = + [TRAINER_CAROL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6607,7 +6607,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Carol }, - [OPPONENT_NANCY] = + [TRAINER_NANCY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6621,7 +6621,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nancy }, - [OPPONENT_MARTHA] = + [TRAINER_MARTHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6635,7 +6635,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Martha }, - [OPPONENT_DIANA_1] = + [TRAINER_DIANA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6649,7 +6649,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana1 }, - [OPPONENT_NINA] = + [TRAINER_NINA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6663,7 +6663,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nina }, - [OPPONENT_IRENE] = + [TRAINER_IRENE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6677,7 +6677,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Irene }, - [OPPONENT_DIANA_2] = + [TRAINER_DIANA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6691,7 +6691,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana2 }, - [OPPONENT_DIANA_3] = + [TRAINER_DIANA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6705,7 +6705,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana3 }, - [OPPONENT_DIANA_4] = + [TRAINER_DIANA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6719,7 +6719,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana4 }, - [OPPONENT_DIANA_5] = + [TRAINER_DIANA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6733,7 +6733,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana5 }, - [OPPONENT_AMY_AND_LIV_1] = + [TRAINER_AMY_AND_LIV_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6747,7 +6747,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv1 }, - [OPPONENT_AMY_AND_LIV_2] = + [TRAINER_AMY_AND_LIV_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6761,7 +6761,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv2 }, - [OPPONENT_GINA_AND_MIA_1] = + [TRAINER_GINA_AND_MIA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6775,7 +6775,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GinaAndMia1 }, - [OPPONENT_MIU_AND_YUKI] = + [TRAINER_MIU_AND_YUKI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6789,7 +6789,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_MiuAndYuki }, - [OPPONENT_AMY_AND_LIV_3] = + [TRAINER_AMY_AND_LIV_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6803,7 +6803,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv3 }, - [OPPONENT_GINA_AND_MIA_2] = + [TRAINER_GINA_AND_MIA_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TWINS, @@ -6817,7 +6817,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GinaAndMia2 }, - [OPPONENT_AMY_AND_LIV_4] = + [TRAINER_AMY_AND_LIV_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6831,7 +6831,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv4 }, - [OPPONENT_AMY_AND_LIV_5] = + [TRAINER_AMY_AND_LIV_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TWINS, @@ -6845,7 +6845,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv5 }, - [OPPONENT_AMY_AND_LIV_6] = + [TRAINER_AMY_AND_LIV_6] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TWINS, @@ -6859,7 +6859,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv6 }, - [OPPONENT_HUEY] = + [TRAINER_HUEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6873,7 +6873,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Huey }, - [OPPONENT_EDMOND] = + [TRAINER_EDMOND] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6887,7 +6887,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edmond }, - [OPPONENT_ERNEST_1] = + [TRAINER_ERNEST_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6901,7 +6901,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest1 }, - [OPPONENT_DWAYNE] = + [TRAINER_DWAYNE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6915,7 +6915,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dwayne }, - [OPPONENT_PHILLIP] = + [TRAINER_PHILLIP] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6929,7 +6929,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Phillip }, - [OPPONENT_LEONARD] = + [TRAINER_LEONARD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6943,7 +6943,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Leonard }, - [OPPONENT_DUNCAN] = + [TRAINER_DUNCAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6957,7 +6957,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Duncan }, - [OPPONENT_ERNEST_2] = + [TRAINER_ERNEST_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6971,7 +6971,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest2 }, - [OPPONENT_ERNEST_3] = + [TRAINER_ERNEST_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6985,7 +6985,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest3 }, - [OPPONENT_ERNEST_4] = + [TRAINER_ERNEST_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6999,7 +6999,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest4 }, - [OPPONENT_ERNEST_5] = + [TRAINER_ERNEST_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -7013,7 +7013,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest5 }, - [OPPONENT_ANONYMOUS_11] = + [TRAINER_ANONYMOUS_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7027,7 +7027,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous11 }, - [OPPONENT_ANONYMOUS_12] = + [TRAINER_ANONYMOUS_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7041,7 +7041,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous12 }, - [OPPONENT_ANONYMOUS_13] = + [TRAINER_ANONYMOUS_13] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7055,7 +7055,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous13 }, - [OPPONENT_SONNY] = + [TRAINER_SONNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7069,7 +7069,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sonny }, - [OPPONENT_DONOVAN] = + [TRAINER_DONOVAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7083,7 +7083,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Donovan }, - [OPPONENT_GERALD] = + [TRAINER_GERALD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7097,7 +7097,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Gerald }, - [OPPONENT_KELVIN] = + [TRAINER_KELVIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7111,7 +7111,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kelvin }, - [OPPONENT_KODY] = + [TRAINER_KODY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7125,7 +7125,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kody }, - [OPPONENT_TEVIN] = + [TRAINER_TEVIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7139,7 +7139,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tevin }, - [OPPONENT_DAMON] = + [TRAINER_DAMON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7153,7 +7153,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Damon }, - [OPPONENT_PABLO] = + [TRAINER_PABLO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7167,7 +7167,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Pablo }, - [OPPONENT_EDWIN_1] = + [TRAINER_EDWIN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7181,7 +7181,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin1 }, - [OPPONENT_HECTOR_1] = + [TRAINER_HECTOR_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7195,7 +7195,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hector1 }, - [OPPONENT_HECTOR_2] = + [TRAINER_HECTOR_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7209,7 +7209,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hector2 }, - [OPPONENT_EDWIN_2] = + [TRAINER_EDWIN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7223,7 +7223,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin2 }, - [OPPONENT_EDWIN_3] = + [TRAINER_EDWIN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7237,7 +7237,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin3 }, - [OPPONENT_EDWIN_4] = + [TRAINER_EDWIN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7251,7 +7251,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin4 }, - [OPPONENT_EDWIN_5] = + [TRAINER_EDWIN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7265,7 +7265,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin5 }, - [OPPONENT_WALLY_1] = + [TRAINER_WALLY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7279,7 +7279,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally1 }, - [OPPONENT_BRENDAN_1] = + [TRAINER_BRENDAN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7293,7 +7293,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan1 }, - [OPPONENT_BRENDAN_2] = + [TRAINER_BRENDAN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7307,7 +7307,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan2 }, - [OPPONENT_BRENDAN_3] = + [TRAINER_BRENDAN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7321,7 +7321,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan3 }, - [OPPONENT_BRENDAN_4] = + [TRAINER_BRENDAN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7335,7 +7335,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan4 }, - [OPPONENT_BRENDAN_5] = + [TRAINER_BRENDAN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7349,7 +7349,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan5 }, - [OPPONENT_BRENDAN_6] = + [TRAINER_BRENDAN_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7363,7 +7363,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan6 }, - [OPPONENT_BRENDAN_7] = + [TRAINER_BRENDAN_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7377,7 +7377,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan7 }, - [OPPONENT_BRENDAN_8] = + [TRAINER_BRENDAN_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7391,7 +7391,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan8 }, - [OPPONENT_BRENDAN_9] = + [TRAINER_BRENDAN_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7405,7 +7405,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan9 }, - [OPPONENT_MAY_1] = + [TRAINER_MAY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7419,7 +7419,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May1 }, - [OPPONENT_MAY_2] = + [TRAINER_MAY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7433,7 +7433,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May2 }, - [OPPONENT_MAY_3] = + [TRAINER_MAY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7447,7 +7447,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May3 }, - [OPPONENT_MAY_4] = + [TRAINER_MAY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7461,7 +7461,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May4 }, - [OPPONENT_MAY_5] = + [TRAINER_MAY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7475,7 +7475,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May5 }, - [OPPONENT_MAY_6] = + [TRAINER_MAY_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7489,7 +7489,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May6 }, - [OPPONENT_MAY_7] = + [TRAINER_MAY_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7503,7 +7503,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May7 }, - [OPPONENT_MAY_8] = + [TRAINER_MAY_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7517,7 +7517,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May8 }, - [OPPONENT_MAY_9] = + [TRAINER_MAY_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7531,7 +7531,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May9 }, - [OPPONENT_ISAAC_1] = + [TRAINER_ISAAC_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7545,7 +7545,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac1 }, - [OPPONENT_RILEY] = + [TRAINER_RILEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7559,7 +7559,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Riley }, - [OPPONENT_AIDAN] = + [TRAINER_AIDAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7573,7 +7573,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Aidan }, - [OPPONENT_ISAAC_2] = + [TRAINER_ISAAC_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7587,7 +7587,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac2 }, - [OPPONENT_ISAAC_3] = + [TRAINER_ISAAC_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7601,7 +7601,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac3 }, - [OPPONENT_ISAAC_4] = + [TRAINER_ISAAC_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7615,7 +7615,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac4 }, - [OPPONENT_ISAAC_5] = + [TRAINER_ISAAC_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7629,7 +7629,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac5 }, - [OPPONENT_LYDIA_1] = + [TRAINER_LYDIA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7643,7 +7643,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia1 }, - [OPPONENT_ALEXIA] = + [TRAINER_ALEXIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7657,7 +7657,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alexia }, - [OPPONENT_DANIELLE] = + [TRAINER_DANIELLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7671,7 +7671,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Danielle }, - [OPPONENT_LYDIA_2] = + [TRAINER_LYDIA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7685,7 +7685,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia2 }, - [OPPONENT_LYDIA_3] = + [TRAINER_LYDIA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7699,7 +7699,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia3 }, - [OPPONENT_LYDIA_4] = + [TRAINER_LYDIA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7713,7 +7713,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia4 }, - [OPPONENT_LYDIA_5] = + [TRAINER_LYDIA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7727,7 +7727,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia5 }, - [OPPONENT_JACKSON_1] = + [TRAINER_JACKSON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7741,7 +7741,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson1 }, - [OPPONENT_CARLOS] = + [TRAINER_CARLOS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7755,7 +7755,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Carlos }, - [OPPONENT_SEBASTIAN] = + [TRAINER_SEBASTIAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7769,7 +7769,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sebastian }, - [OPPONENT_JACKSON_2] = + [TRAINER_JACKSON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7783,7 +7783,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson2 }, - [OPPONENT_JACKSON_3] = + [TRAINER_JACKSON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7797,7 +7797,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson3 }, - [OPPONENT_JACKSON_4] = + [TRAINER_JACKSON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7811,7 +7811,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson4 }, - [OPPONENT_JACKSON_5] = + [TRAINER_JACKSON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7825,7 +7825,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson5 }, - [OPPONENT_CATHERINE_1] = + [TRAINER_CATHERINE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7839,7 +7839,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine1 }, - [OPPONENT_JENNA] = + [TRAINER_JENNA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7853,7 +7853,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenna }, - [OPPONENT_SOPHIA] = + [TRAINER_SOPHIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7867,7 +7867,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sophia }, - [OPPONENT_CATHERINE_2] = + [TRAINER_CATHERINE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7881,7 +7881,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine2 }, - [OPPONENT_CATHERINE_3] = + [TRAINER_CATHERINE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7895,7 +7895,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine3 }, - [OPPONENT_CATHERINE_4] = + [TRAINER_CATHERINE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7909,7 +7909,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine4 }, - [OPPONENT_CATHERINE_5] = + [TRAINER_CATHERINE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7923,7 +7923,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine5 }, - [OPPONENT_MAXIE_1] = + [TRAINER_MAXIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_LEADER, @@ -7937,7 +7937,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maxie1 }, - [OPPONENT_GRUNT_28] = + [TRAINER_GRUNT_28] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7951,7 +7951,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt28 }, - [OPPONENT_GRUNT_29] = + [TRAINER_GRUNT_29] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7965,7 +7965,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt29 }, - [OPPONENT_GRUNT_30] = + [TRAINER_GRUNT_30] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7979,7 +7979,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt30 }, - [OPPONENT_GRUNT_31] = + [TRAINER_GRUNT_31] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7993,7 +7993,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt31 }, - [OPPONENT_GRUNT_32] = + [TRAINER_GRUNT_32] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8007,7 +8007,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt32 }, - [OPPONENT_GRUNT_33] = + [TRAINER_GRUNT_33] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8021,7 +8021,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt33 }, - [OPPONENT_GRUNT_34] = + [TRAINER_GRUNT_34] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8035,7 +8035,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt34 }, - [OPPONENT_GRUNT_35] = + [TRAINER_GRUNT_35] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8049,7 +8049,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt35 }, - [OPPONENT_GRUNT_36] = + [TRAINER_GRUNT_36] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8063,7 +8063,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt36 }, - [OPPONENT_GRUNT_37] = + [TRAINER_GRUNT_37] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8077,7 +8077,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt37 }, - [OPPONENT_GRUNT_38] = + [TRAINER_GRUNT_38] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8091,7 +8091,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt38 }, - [OPPONENT_GRUNT_39] = + [TRAINER_GRUNT_39] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8105,7 +8105,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt39 }, - [OPPONENT_GRUNT_40] = + [TRAINER_GRUNT_40] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8119,7 +8119,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt40 }, - [OPPONENT_GRUNT_41] = + [TRAINER_GRUNT_41] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8133,7 +8133,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt41 }, - [OPPONENT_GRUNT_42] = + [TRAINER_GRUNT_42] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8147,7 +8147,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt42 }, - [OPPONENT_GRUNT_43] = + [TRAINER_GRUNT_43] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8161,7 +8161,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt43 }, - [OPPONENT_GRUNT_44] = + [TRAINER_GRUNT_44] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8175,7 +8175,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt44 }, - [OPPONENT_GRUNT_45] = + [TRAINER_GRUNT_45] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8189,7 +8189,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt45 }, - [OPPONENT_GRUNT_46] = + [TRAINER_GRUNT_46] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8203,7 +8203,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt46 }, - [OPPONENT_GRUNT_47] = + [TRAINER_GRUNT_47] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8217,7 +8217,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt47 }, - [OPPONENT_GRUNT_48] = + [TRAINER_GRUNT_48] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8231,7 +8231,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt48 }, - [OPPONENT_GRUNT_49] = + [TRAINER_GRUNT_49] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8245,7 +8245,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt49 }, - [OPPONENT_GRUNT_50] = + [TRAINER_GRUNT_50] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8259,7 +8259,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt50 }, - [OPPONENT_GRUNT_51] = + [TRAINER_GRUNT_51] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8273,7 +8273,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt51 }, - [OPPONENT_GRUNT_52] = + [TRAINER_GRUNT_52] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8287,7 +8287,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt52 }, - [OPPONENT_GRUNT_53] = + [TRAINER_GRUNT_53] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8301,7 +8301,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt53 }, - [OPPONENT_GRUNT_54] = + [TRAINER_GRUNT_54] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8315,7 +8315,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt54 }, - [OPPONENT_ANONYMOUS_14] = + [TRAINER_ANONYMOUS_14] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8329,7 +8329,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous14 }, - [OPPONENT_ANONYMOUS_15] = + [TRAINER_ANONYMOUS_15] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8343,7 +8343,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous15 }, - [OPPONENT_TABITHA_1] = + [TRAINER_TABITHA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8357,7 +8357,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tabitha1 }, - [OPPONENT_TABITHA_2] = + [TRAINER_TABITHA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8371,7 +8371,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tabitha2 }, - [OPPONENT_ANONYMOUS_16] = + [TRAINER_ANONYMOUS_16] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8385,7 +8385,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous16 }, - [OPPONENT_COURTNEY_1] = + [TRAINER_COURTNEY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8399,7 +8399,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Courtney1 }, - [OPPONENT_COURTNEY_2] = + [TRAINER_COURTNEY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8413,7 +8413,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Courtney2 }, - [OPPONENT_MAXIE_2] = + [TRAINER_MAXIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_LEADER, @@ -8427,7 +8427,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maxie2 }, - [OPPONENT_MAXIE_3] = + [TRAINER_MAXIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_LEADER, @@ -8441,7 +8441,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maxie3 }, - [OPPONENT_TIANA] = + [TRAINER_TIANA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8455,7 +8455,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tiana }, - [OPPONENT_HALEY_1] = + [TRAINER_HALEY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8469,7 +8469,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley1 }, - [OPPONENT_JANICE] = + [TRAINER_JANICE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8483,7 +8483,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Janice }, - [OPPONENT_VIVI] = + [TRAINER_VIVI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -8497,7 +8497,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vivi }, - [OPPONENT_HALEY_2] = + [TRAINER_HALEY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8511,7 +8511,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley2 }, - [OPPONENT_HALEY_3] = + [TRAINER_HALEY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8525,7 +8525,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley3 }, - [OPPONENT_HALEY_4] = + [TRAINER_HALEY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8539,7 +8539,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley4 }, - [OPPONENT_HALEY_5] = + [TRAINER_HALEY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8553,7 +8553,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley5 }, - [OPPONENT_SALLY] = + [TRAINER_SALLY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8567,7 +8567,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sally }, - [OPPONENT_ROBIN] = + [TRAINER_ROBIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8581,7 +8581,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robin }, - [OPPONENT_ANDREA] = + [TRAINER_ANDREA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8595,7 +8595,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Andrea }, - [OPPONENT_CRISSY] = + [TRAINER_CRISSY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8609,7 +8609,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Crissy }, - [OPPONENT_RICK] = + [TRAINER_RICK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8623,7 +8623,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rick }, - [OPPONENT_LYLE] = + [TRAINER_LYLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8637,7 +8637,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lyle }, - [OPPONENT_JOSE] = + [TRAINER_JOSE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8651,7 +8651,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jose }, - [OPPONENT_DOUG] = + [TRAINER_DOUG] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8665,7 +8665,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Doug }, - [OPPONENT_GREG] = + [TRAINER_GREG] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8679,7 +8679,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Greg }, - [OPPONENT_KENT] = + [TRAINER_KENT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8693,7 +8693,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kent }, - [OPPONENT_JAMES_1] = + [TRAINER_JAMES_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8707,7 +8707,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James1 }, - [OPPONENT_JAMES_2] = + [TRAINER_JAMES_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8721,7 +8721,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James2 }, - [OPPONENT_JAMES_3] = + [TRAINER_JAMES_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8735,7 +8735,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James3 }, - [OPPONENT_JAMES_4] = + [TRAINER_JAMES_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8749,7 +8749,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James4 }, - [OPPONENT_JAMES_5] = + [TRAINER_JAMES_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8763,7 +8763,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James5 }, - [OPPONENT_BRICE] = + [TRAINER_BRICE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8777,7 +8777,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brice }, - [OPPONENT_TRENT_1] = + [TRAINER_TRENT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8791,7 +8791,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent1 }, - [OPPONENT_LENNY] = + [TRAINER_LENNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8805,7 +8805,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lenny }, - [OPPONENT_LUCAS_1] = + [TRAINER_LUCAS_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8819,7 +8819,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lucas1 }, - [OPPONENT_ALAN] = + [TRAINER_ALAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8833,7 +8833,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alan }, - [OPPONENT_CLARK] = + [TRAINER_CLARK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8847,7 +8847,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Clark }, - [OPPONENT_ERIC] = + [TRAINER_ERIC] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8861,7 +8861,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Eric }, - [OPPONENT_LUCAS_2] = + [TRAINER_LUCAS_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_HIKER, @@ -8875,7 +8875,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lucas2 }, - [OPPONENT_MIKE_1] = + [TRAINER_MIKE_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_HIKER, @@ -8889,7 +8889,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Mike1 }, - [OPPONENT_MIKE_2] = + [TRAINER_MIKE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8903,7 +8903,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Mike2 }, - [OPPONENT_TRENT_2] = + [TRAINER_TRENT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8917,7 +8917,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent2 }, - [OPPONENT_TRENT_3] = + [TRAINER_TRENT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8931,7 +8931,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent3 }, - [OPPONENT_TRENT_4] = + [TRAINER_TRENT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8945,7 +8945,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent4 }, - [OPPONENT_TRENT_5] = + [TRAINER_TRENT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8959,7 +8959,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent5 }, - [OPPONENT_DEZ_AND_LUKE] = + [TRAINER_DEZ_AND_LUKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -8973,7 +8973,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_DezAndLuke }, - [OPPONENT_LEA_AND_JED] = + [TRAINER_LEA_AND_JED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -8987,7 +8987,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LeaAndJed }, - [OPPONENT_LOIS_AND_HAL_1] = + [TRAINER_LOIS_AND_HAL_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9001,7 +9001,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal1 }, - [OPPONENT_LOIS_AND_HAL_2] = + [TRAINER_LOIS_AND_HAL_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9015,7 +9015,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal2 }, - [OPPONENT_LOIS_AND_HAL_3] = + [TRAINER_LOIS_AND_HAL_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9029,7 +9029,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal3 }, - [OPPONENT_LOIS_AND_HAL_4] = + [TRAINER_LOIS_AND_HAL_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9043,7 +9043,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal4 }, - [OPPONENT_LOIS_AND_HAL_5] = + [TRAINER_LOIS_AND_HAL_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9057,7 +9057,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal5 }, - [OPPONENT_JOHANNA] = + [TRAINER_JOHANNA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -9071,7 +9071,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Johanna }, - [OPPONENT_ZANE] = + [TRAINER_ZANE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -9085,7 +9085,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Zane }, - [OPPONENT_VIVIAN] = + [TRAINER_VIVIAN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -9099,7 +9099,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vivian }, - [OPPONENT_SADIE] = + [TRAINER_SADIE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -9113,7 +9113,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sadie }, - [OPPONENT_HIDEO_2] = + [TRAINER_HIDEO_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -9127,7 +9127,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hideo2 }, - [OPPONENT_KEIGO] = + [TRAINER_KEIGO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -9141,7 +9141,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Keigo }, - [OPPONENT_TSUNAO] = + [TRAINER_TSUNAO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -9155,7 +9155,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tsunao }, - [OPPONENT_TERRELL] = + [TRAINER_TERRELL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -9169,7 +9169,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Terrell }, - [OPPONENT_KYLEE] = + [TRAINER_KYLEE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -9183,7 +9183,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kylee }, - [OPPONENT_WALLY_2] = + [TRAINER_WALLY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9197,7 +9197,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally2 }, - [OPPONENT_WALLY_3] = + [TRAINER_WALLY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9211,7 +9211,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally3 }, - [OPPONENT_WALLY_4] = + [TRAINER_WALLY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9225,7 +9225,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally4 }, - [OPPONENT_WALLY_5] = + [TRAINER_WALLY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9239,7 +9239,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally5 }, - [OPPONENT_WALLY_6] = + [TRAINER_WALLY_6] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9253,7 +9253,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally6 }, - [OPPONENT_BRENDAN_10] = + [TRAINER_BRENDAN_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9267,7 +9267,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan10 }, - [OPPONENT_BRENDAN_11] = + [TRAINER_BRENDAN_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9281,7 +9281,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan11 }, - [OPPONENT_BRENDAN_12] = + [TRAINER_BRENDAN_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9295,7 +9295,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan12 }, - [OPPONENT_MAY_10] = + [TRAINER_MAY_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9309,7 +9309,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May10 }, - [OPPONENT_MAY_11] = + [TRAINER_MAY_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9323,7 +9323,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May11 }, - [OPPONENT_MAY_12] = + [TRAINER_MAY_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9337,7 +9337,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May12 }, - [OPPONENT_JONAH] = + [TRAINER_JONAH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9351,7 +9351,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jonah }, - [OPPONENT_HENRY] = + [TRAINER_HENRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9365,7 +9365,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Henry }, - [OPPONENT_ROGER] = + [TRAINER_ROGER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9379,7 +9379,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Roger }, - [OPPONENT_ALEXA] = + [TRAINER_ALEXA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -9393,7 +9393,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alexa }, - [OPPONENT_RUBEN] = + [TRAINER_RUBEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -9407,7 +9407,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ruben }, - [OPPONENT_KOJI] = + [TRAINER_KOJI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -9421,7 +9421,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Koji }, - [OPPONENT_WAYNE] = + [TRAINER_WAYNE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9435,7 +9435,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wayne }, - [OPPONENT_BYRON] = + [TRAINER_BYRON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -9449,7 +9449,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Byron }, - [OPPONENT_REED] = + [TRAINER_REED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -9463,7 +9463,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Reed }, - [OPPONENT_TISHA] = + [TRAINER_TISHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -9477,7 +9477,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tisha }, - [OPPONENT_TORI_AND_TIA] = + [TRAINER_TORI_AND_TIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -9491,7 +9491,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_ToriAndTia }, - [OPPONENT_KIM_AND_IRIS] = + [TRAINER_KIM_AND_IRIS] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -9505,7 +9505,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_KimAndIris }, - [OPPONENT_TYRA_AND_IVY] = + [TRAINER_TYRA_AND_IVY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -9519,7 +9519,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_TyraAndIvy }, - [OPPONENT_MEL_AND_PAUL] = + [TRAINER_MEL_AND_PAUL] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9533,7 +9533,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_MelAndPaul }, - [OPPONENT_JOHN_AND_JAY_1] = + [TRAINER_JOHN_AND_JAY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9547,7 +9547,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay1 }, - [OPPONENT_JOHN_AND_JAY_2] = + [TRAINER_JOHN_AND_JAY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9561,7 +9561,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay2 }, - [OPPONENT_JOHN_AND_JAY_3] = + [TRAINER_JOHN_AND_JAY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9575,7 +9575,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay3 }, - [OPPONENT_JOHN_AND_JAY_4] = + [TRAINER_JOHN_AND_JAY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9589,7 +9589,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay4 }, - [OPPONENT_JOHN_AND_JAY_5] = + [TRAINER_JOHN_AND_JAY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9603,7 +9603,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay5 }, - [OPPONENT_RELI_AND_IAN] = + [TRAINER_RELI_AND_IAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9617,7 +9617,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_ReliAndIan }, - [OPPONENT_RITA_AND_SAM_1] = + [TRAINER_RITA_AND_SAM_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9631,7 +9631,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam1 }, - [OPPONENT_RITA_AND_SAM_2] = + [TRAINER_RITA_AND_SAM_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9645,7 +9645,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam2 }, - [OPPONENT_RITA_AND_SAM_3] = + [TRAINER_RITA_AND_SAM_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9659,7 +9659,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam3 }, - [OPPONENT_RITA_AND_SAM_4] = + [TRAINER_RITA_AND_SAM_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9673,7 +9673,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam4 }, - [OPPONENT_RITA_AND_SAM_5] = + [TRAINER_RITA_AND_SAM_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9687,7 +9687,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam5 }, - [OPPONENT_LISA_AND_RAY] = + [TRAINER_LISA_AND_RAY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9701,7 +9701,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LisaAndRay }, - [OPPONENT_EUGENE] = + [TRAINER_EUGENE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, diff --git a/src/data/trainers_en.h b/src/data/trainers_en.h index fbcdd5a4e..7f522dd93 100644 --- a/src/data/trainers_en.h +++ b/src/data/trainers_en.h @@ -1,5 +1,5 @@ const struct Trainer gTrainers[] = { - [OPPONENT_NONE] = + [TRAINER_NONE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_1, @@ -13,7 +13,7 @@ const struct Trainer gTrainers[] = { .party = NULL }, - [OPPONENT_ARCHIE_1] = + [TRAINER_ARCHIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_LEADER, @@ -27,7 +27,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Archie1 }, - [OPPONENT_GRUNT_1] = + [TRAINER_GRUNT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -41,7 +41,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt1 }, - [OPPONENT_GRUNT_2] = + [TRAINER_GRUNT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -55,7 +55,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt2 }, - [OPPONENT_GRUNT_3] = + [TRAINER_GRUNT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -69,7 +69,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt3 }, - [OPPONENT_GRUNT_4] = + [TRAINER_GRUNT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -83,7 +83,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt4 }, - [OPPONENT_GRUNT_5] = + [TRAINER_GRUNT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -97,7 +97,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt5 }, - [OPPONENT_GRUNT_6] = + [TRAINER_GRUNT_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -111,7 +111,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt6 }, - [OPPONENT_GRUNT_7] = + [TRAINER_GRUNT_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -125,7 +125,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt7 }, - [OPPONENT_GRUNT_8] = + [TRAINER_GRUNT_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -139,7 +139,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt8 }, - [OPPONENT_GRUNT_9] = + [TRAINER_GRUNT_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -153,7 +153,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt9 }, - [OPPONENT_GRUNT_10] = + [TRAINER_GRUNT_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -167,7 +167,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt10 }, - [OPPONENT_GRUNT_11] = + [TRAINER_GRUNT_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -181,7 +181,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt11 }, - [OPPONENT_GRUNT_12] = + [TRAINER_GRUNT_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -195,7 +195,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt12 }, - [OPPONENT_GRUNT_13] = + [TRAINER_GRUNT_13] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -209,7 +209,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt13 }, - [OPPONENT_GRUNT_14] = + [TRAINER_GRUNT_14] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -223,7 +223,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt14 }, - [OPPONENT_GRUNT_15] = + [TRAINER_GRUNT_15] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -237,7 +237,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt15 }, - [OPPONENT_GRUNT_16] = + [TRAINER_GRUNT_16] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -251,7 +251,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt16 }, - [OPPONENT_GRUNT_17] = + [TRAINER_GRUNT_17] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -265,7 +265,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt17 }, - [OPPONENT_GRUNT_18] = + [TRAINER_GRUNT_18] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -279,7 +279,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt18 }, - [OPPONENT_GRUNT_19] = + [TRAINER_GRUNT_19] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -293,7 +293,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt19 }, - [OPPONENT_GRUNT_20] = + [TRAINER_GRUNT_20] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -307,7 +307,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt20 }, - [OPPONENT_GRUNT_21] = + [TRAINER_GRUNT_21] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -321,7 +321,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt21 }, - [OPPONENT_GRUNT_22] = + [TRAINER_GRUNT_22] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -335,7 +335,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt22 }, - [OPPONENT_GRUNT_23] = + [TRAINER_GRUNT_23] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -349,7 +349,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt23 }, - [OPPONENT_GRUNT_24] = + [TRAINER_GRUNT_24] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -363,7 +363,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt24 }, - [OPPONENT_GRUNT_25] = + [TRAINER_GRUNT_25] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -377,7 +377,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt25 }, - [OPPONENT_GRUNT_26] = + [TRAINER_GRUNT_26] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -391,7 +391,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt26 }, - [OPPONENT_GRUNT_27] = + [TRAINER_GRUNT_27] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -405,7 +405,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt27 }, - [OPPONENT_ANONYMOUS_1] = + [TRAINER_ANONYMOUS_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -419,7 +419,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous1 }, - [OPPONENT_MATT_1] = + [TRAINER_MATT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -433,7 +433,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Matt1 }, - [OPPONENT_MATT_2] = + [TRAINER_MATT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -447,7 +447,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Matt2 }, - [OPPONENT_SHELLY_1] = + [TRAINER_SHELLY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -461,7 +461,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelly1 }, - [OPPONENT_SHELLY_2] = + [TRAINER_SHELLY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -475,7 +475,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelly2 }, - [OPPONENT_ARCHIE_2] = + [TRAINER_ARCHIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_LEADER, @@ -489,7 +489,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Archie2 }, - [OPPONENT_ARCHIE_3] = + [TRAINER_ARCHIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_LEADER, @@ -503,7 +503,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Archie3 }, - [OPPONENT_DAISY] = + [TRAINER_DAISY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -517,7 +517,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Daisy }, - [OPPONENT_ROSE_1] = + [TRAINER_ROSE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -531,7 +531,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose1 }, - [OPPONENT_LILY] = + [TRAINER_LILY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -545,7 +545,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lily }, - [OPPONENT_VIOLET] = + [TRAINER_VIOLET] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -559,7 +559,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Violet }, - [OPPONENT_ROSE_2] = + [TRAINER_ROSE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -573,7 +573,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose2 }, - [OPPONENT_ROSE_3] = + [TRAINER_ROSE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -587,7 +587,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose3 }, - [OPPONENT_ROSE_4] = + [TRAINER_ROSE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -601,7 +601,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose4 }, - [OPPONENT_ROSE_5] = + [TRAINER_ROSE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -615,7 +615,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose5 }, - [OPPONENT_DUSTY_1] = + [TRAINER_DUSTY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -629,7 +629,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty1 }, - [OPPONENT_CHIP] = + [TRAINER_CHIP] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -643,7 +643,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chip }, - [OPPONENT_FOSTER] = + [TRAINER_FOSTER] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -657,7 +657,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Foster }, - [OPPONENT_DUSTY_2] = + [TRAINER_DUSTY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -671,7 +671,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty2 }, - [OPPONENT_DUSTY_3] = + [TRAINER_DUSTY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -685,7 +685,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty3 }, - [OPPONENT_DUSTY_4] = + [TRAINER_DUSTY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -699,7 +699,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty4 }, - [OPPONENT_DUSTY_5] = + [TRAINER_DUSTY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -713,7 +713,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty5 }, - [OPPONENT_GABBY_AND_TY_1] = + [TRAINER_GABBY_AND_TY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -727,7 +727,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy1 }, - [OPPONENT_GABBY_AND_TY_2] = + [TRAINER_GABBY_AND_TY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -741,7 +741,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy2 }, - [OPPONENT_GABBY_AND_TY_3] = + [TRAINER_GABBY_AND_TY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -755,7 +755,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy3 }, - [OPPONENT_GABBY_AND_TY_4] = + [TRAINER_GABBY_AND_TY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -769,7 +769,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy4 }, - [OPPONENT_GABBY_AND_TY_5] = + [TRAINER_GABBY_AND_TY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -783,7 +783,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy5 }, - [OPPONENT_GABBY_AND_TY_6] = + [TRAINER_GABBY_AND_TY_6] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -797,7 +797,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy6 }, - [OPPONENT_LOLA_1] = + [TRAINER_LOLA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -811,7 +811,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola1 }, - [OPPONENT_CARMEN] = + [TRAINER_CARMEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -825,7 +825,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Carmen }, - [OPPONENT_GWEN] = + [TRAINER_GWEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -839,7 +839,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Gwen }, - [OPPONENT_LOLA_2] = + [TRAINER_LOLA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -853,7 +853,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola2 }, - [OPPONENT_LOLA_3] = + [TRAINER_LOLA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -867,7 +867,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola3 }, - [OPPONENT_LOLA_4] = + [TRAINER_LOLA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -881,7 +881,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola4 }, - [OPPONENT_LOLA_5] = + [TRAINER_LOLA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -895,7 +895,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola5 }, - [OPPONENT_RICKY_1] = + [TRAINER_RICKY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -909,7 +909,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky1 }, - [OPPONENT_SIMON] = + [TRAINER_SIMON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -923,7 +923,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Simon }, - [OPPONENT_CHARLIE] = + [TRAINER_CHARLIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -937,7 +937,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Charlie }, - [OPPONENT_RICKY_2] = + [TRAINER_RICKY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -951,7 +951,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky2 }, - [OPPONENT_RICKY_3] = + [TRAINER_RICKY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -965,7 +965,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky3 }, - [OPPONENT_RICKY_4] = + [TRAINER_RICKY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -979,7 +979,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky4 }, - [OPPONENT_RICKY_5] = + [TRAINER_RICKY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -993,7 +993,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky5 }, - [OPPONENT_RANDALL] = + [TRAINER_RANDALL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1007,7 +1007,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Randall }, - [OPPONENT_PARKER] = + [TRAINER_PARKER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1021,7 +1021,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Parker }, - [OPPONENT_GEORGE] = + [TRAINER_GEORGE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1035,7 +1035,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_George }, - [OPPONENT_BERKE] = + [TRAINER_BERKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1049,7 +1049,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Berke }, - [OPPONENT_CLYDE] = + [TRAINER_CLYDE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1063,7 +1063,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Clyde }, - [OPPONENT_VINCENT] = + [TRAINER_VINCENT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1077,7 +1077,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vincent }, - [OPPONENT_LEROY] = + [TRAINER_LEROY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1091,7 +1091,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Leroy }, - [OPPONENT_WILTON_1] = + [TRAINER_WILTON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1105,7 +1105,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton1 }, - [OPPONENT_EDGAR] = + [TRAINER_EDGAR] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1119,7 +1119,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edgar }, - [OPPONENT_ALBERT] = + [TRAINER_ALBERT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1133,7 +1133,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Albert }, - [OPPONENT_SAMUEL] = + [TRAINER_SAMUEL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1147,7 +1147,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Samuel }, - [OPPONENT_VITO] = + [TRAINER_VITO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1161,7 +1161,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vito }, - [OPPONENT_OWEN] = + [TRAINER_OWEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1175,7 +1175,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Owen }, - [OPPONENT_WILTON_2] = + [TRAINER_WILTON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1189,7 +1189,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton2 }, - [OPPONENT_WILTON_3] = + [TRAINER_WILTON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1203,7 +1203,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton3 }, - [OPPONENT_WILTON_4] = + [TRAINER_WILTON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1217,7 +1217,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton4 }, - [OPPONENT_WILTON_5] = + [TRAINER_WILTON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1231,7 +1231,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton5 }, - [OPPONENT_WARREN] = + [TRAINER_WARREN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1245,7 +1245,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Warren }, - [OPPONENT_MARY] = + [TRAINER_MARY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1259,7 +1259,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Mary }, - [OPPONENT_LORI] = + [TRAINER_LORI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1273,7 +1273,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lori }, - [OPPONENT_JODY] = + [TRAINER_JODY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1287,7 +1287,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jody }, - [OPPONENT_WENDY] = + [TRAINER_WENDY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1301,7 +1301,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wendy }, - [OPPONENT_ELAINE] = + [TRAINER_ELAINE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1315,7 +1315,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elaine }, - [OPPONENT_BROOKE_1] = + [TRAINER_BROOKE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1329,7 +1329,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke1 }, - [OPPONENT_JENNIFER] = + [TRAINER_JENNIFER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1343,7 +1343,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jennifer }, - [OPPONENT_HOPE] = + [TRAINER_HOPE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1357,7 +1357,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hope }, - [OPPONENT_SHANNON] = + [TRAINER_SHANNON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1371,7 +1371,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shannon }, - [OPPONENT_MICHELLE] = + [TRAINER_MICHELLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1385,7 +1385,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Michelle }, - [OPPONENT_CAROLINE] = + [TRAINER_CAROLINE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1399,7 +1399,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Caroline }, - [OPPONENT_JULIE] = + [TRAINER_JULIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1413,7 +1413,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Julie }, - [OPPONENT_BROOKE_2] = + [TRAINER_BROOKE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1427,7 +1427,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke2 }, - [OPPONENT_BROOKE_3] = + [TRAINER_BROOKE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1441,7 +1441,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke3 }, - [OPPONENT_BROOKE_4] = + [TRAINER_BROOKE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1455,7 +1455,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke4 }, - [OPPONENT_BROOKE_5] = + [TRAINER_BROOKE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1469,7 +1469,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke5 }, - [OPPONENT_PATRICIA] = + [TRAINER_PATRICIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1483,7 +1483,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Patricia }, - [OPPONENT_KINDRA] = + [TRAINER_KINDRA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1497,7 +1497,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kindra }, - [OPPONENT_TAMMY] = + [TRAINER_TAMMY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1511,7 +1511,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tammy }, - [OPPONENT_VALERIE_1] = + [TRAINER_VALERIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1525,7 +1525,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie1 }, - [OPPONENT_TASHA] = + [TRAINER_TASHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1539,7 +1539,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tasha }, - [OPPONENT_VALERIE_2] = + [TRAINER_VALERIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1553,7 +1553,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie2 }, - [OPPONENT_VALERIE_3] = + [TRAINER_VALERIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1567,7 +1567,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie3 }, - [OPPONENT_VALERIE_4] = + [TRAINER_VALERIE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1581,7 +1581,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie4 }, - [OPPONENT_VALERIE_5] = + [TRAINER_VALERIE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1595,7 +1595,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie5 }, - [OPPONENT_CINDY_1] = + [TRAINER_CINDY_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1609,7 +1609,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy1 }, - [OPPONENT_ANONYMOUS_2] = + [TRAINER_ANONYMOUS_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LADY, @@ -1623,7 +1623,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous2 }, - [OPPONENT_BRIANNA_1] = + [TRAINER_BRIANNA_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LADY, @@ -1637,7 +1637,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brianna1 }, - [OPPONENT_CINDY_2] = + [TRAINER_CINDY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LADY, @@ -1651,7 +1651,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy2 }, - [OPPONENT_BRIANNA_2] = + [TRAINER_BRIANNA_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1665,7 +1665,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brianna2 }, - [OPPONENT_ANETTE] = + [TRAINER_ANETTE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1679,7 +1679,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anette }, - [OPPONENT_CINDY_3] = + [TRAINER_CINDY_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1693,7 +1693,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy3 }, - [OPPONENT_CINDY_4] = + [TRAINER_CINDY_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1707,7 +1707,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy4 }, - [OPPONENT_CINDY_5] = + [TRAINER_CINDY_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1721,7 +1721,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy5 }, - [OPPONENT_CINDY_6] = + [TRAINER_CINDY_6] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LADY, @@ -1735,7 +1735,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy6 }, - [OPPONENT_MELISSA] = + [TRAINER_MELISSA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1749,7 +1749,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Melissa }, - [OPPONENT_SHEILA] = + [TRAINER_SHEILA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1763,7 +1763,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sheila }, - [OPPONENT_SHIRLEY] = + [TRAINER_SHIRLEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1777,7 +1777,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shirley }, - [OPPONENT_JESSICA_1] = + [TRAINER_JESSICA_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1791,7 +1791,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica1 }, - [OPPONENT_CONNIE] = + [TRAINER_CONNIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1805,7 +1805,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Connie }, - [OPPONENT_BRIDGET] = + [TRAINER_BRIDGET] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1819,7 +1819,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bridget }, - [OPPONENT_OLIVIA] = + [TRAINER_OLIVIA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1833,7 +1833,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Olivia }, - [OPPONENT_TIFFANY] = + [TRAINER_TIFFANY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1847,7 +1847,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tiffany }, - [OPPONENT_JESSICA_2] = + [TRAINER_JESSICA_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1861,7 +1861,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica2 }, - [OPPONENT_JESSICA_3] = + [TRAINER_JESSICA_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1875,7 +1875,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica3 }, - [OPPONENT_JESSICA_4] = + [TRAINER_JESSICA_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1889,7 +1889,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica4 }, - [OPPONENT_JESSICA_5] = + [TRAINER_JESSICA_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1903,7 +1903,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica5 }, - [OPPONENT_WINSTON_1] = + [TRAINER_WINSTON_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1917,7 +1917,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston1 }, - [OPPONENT_ANONYMOUS_3] = + [TRAINER_ANONYMOUS_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1931,7 +1931,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous3 }, - [OPPONENT_GARRET] = + [TRAINER_GARRET] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1945,7 +1945,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Garret }, - [OPPONENT_WINSTON_2] = + [TRAINER_WINSTON_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1959,7 +1959,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston2 }, - [OPPONENT_WINSTON_3] = + [TRAINER_WINSTON_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1973,7 +1973,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston3 }, - [OPPONENT_WINSTON_4] = + [TRAINER_WINSTON_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1987,7 +1987,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston4 }, - [OPPONENT_WINSTON_5] = + [TRAINER_WINSTON_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -2001,7 +2001,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston5 }, - [OPPONENT_STEVE_1] = + [TRAINER_STEVE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2015,7 +2015,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve1 }, - [OPPONENT_CHRIS] = + [TRAINER_CHRIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2029,7 +2029,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chris }, - [OPPONENT_MARK] = + [TRAINER_MARK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2043,7 +2043,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Mark }, - [OPPONENT_KENN] = + [TRAINER_KENN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2057,7 +2057,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kenn }, - [OPPONENT_STEVE_2] = + [TRAINER_STEVE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2071,7 +2071,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve2 }, - [OPPONENT_STEVE_3] = + [TRAINER_STEVE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2085,7 +2085,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve3 }, - [OPPONENT_STEVE_4] = + [TRAINER_STEVE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2099,7 +2099,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve4 }, - [OPPONENT_STEVE_5] = + [TRAINER_STEVE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2113,7 +2113,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve5 }, - [OPPONENT_LUIS] = + [TRAINER_LUIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2127,7 +2127,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Luis }, - [OPPONENT_AUSTIN] = + [TRAINER_AUSTIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2141,7 +2141,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Austin }, - [OPPONENT_DOUGLAS] = + [TRAINER_DOUGLAS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2155,7 +2155,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Douglas }, - [OPPONENT_DARRIN] = + [TRAINER_DARRIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2169,7 +2169,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Darrin }, - [OPPONENT_TONY_1] = + [TRAINER_TONY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2183,7 +2183,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony1 }, - [OPPONENT_JEROME] = + [TRAINER_JEROME] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2197,7 +2197,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerome }, - [OPPONENT_MATTHEW] = + [TRAINER_MATTHEW] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2211,7 +2211,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Matthew }, - [OPPONENT_DAVID] = + [TRAINER_DAVID] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2225,7 +2225,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_David }, - [OPPONENT_SPENCER] = + [TRAINER_SPENCER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2239,7 +2239,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Spencer }, - [OPPONENT_ROLAND] = + [TRAINER_ROLAND] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2253,7 +2253,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Roland }, - [OPPONENT_CODY] = + [TRAINER_CODY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2267,7 +2267,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cody }, - [OPPONENT_STAN] = + [TRAINER_STAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2281,7 +2281,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Stan }, - [OPPONENT_BARRY] = + [TRAINER_BARRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2295,7 +2295,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Barry }, - [OPPONENT_DEAN] = + [TRAINER_DEAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2309,7 +2309,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dean }, - [OPPONENT_RODNEY] = + [TRAINER_RODNEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2323,7 +2323,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rodney }, - [OPPONENT_RICHARD] = + [TRAINER_RICHARD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2337,7 +2337,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Richard }, - [OPPONENT_HERMAN] = + [TRAINER_HERMAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2351,7 +2351,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Herman }, - [OPPONENT_ANONYMOUS_4] = + [TRAINER_ANONYMOUS_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2365,7 +2365,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous4 }, - [OPPONENT_GILBERT] = + [TRAINER_GILBERT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2379,7 +2379,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Gilbert }, - [OPPONENT_FRANKLIN] = + [TRAINER_FRANKLIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2393,7 +2393,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Franklin }, - [OPPONENT_DANNY] = + [TRAINER_DANNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2407,7 +2407,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Danny }, - [OPPONENT_JACK] = + [TRAINER_JACK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2421,7 +2421,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jack }, - [OPPONENT_DUDLEY] = + [TRAINER_DUDLEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2435,7 +2435,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dudley }, - [OPPONENT_CHAD] = + [TRAINER_CHAD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2449,7 +2449,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chad }, - [OPPONENT_TONY_2] = + [TRAINER_TONY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2463,7 +2463,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony2 }, - [OPPONENT_TONY_3] = + [TRAINER_TONY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2477,7 +2477,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony3 }, - [OPPONENT_TONY_4] = + [TRAINER_TONY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2491,7 +2491,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony4 }, - [OPPONENT_TONY_5] = + [TRAINER_TONY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2505,7 +2505,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony5 }, - [OPPONENT_HIDEKI] = + [TRAINER_HIDEKI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2519,7 +2519,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hideki }, - [OPPONENT_HITOSHI] = + [TRAINER_HITOSHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2533,7 +2533,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hitoshi }, - [OPPONENT_KIYO] = + [TRAINER_KIYO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2547,7 +2547,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kiyo }, - [OPPONENT_KOICHI] = + [TRAINER_KOICHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2561,7 +2561,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Koichi }, - [OPPONENT_NOB_1] = + [TRAINER_NOB_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2575,7 +2575,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob1 }, - [OPPONENT_NOB_2] = + [TRAINER_NOB_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2589,7 +2589,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob2 }, - [OPPONENT_NOB_3] = + [TRAINER_NOB_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2603,7 +2603,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob3 }, - [OPPONENT_NOB_4] = + [TRAINER_NOB_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2617,7 +2617,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob4 }, - [OPPONENT_NOB_5] = + [TRAINER_NOB_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2631,7 +2631,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob5 }, - [OPPONENT_YUJI] = + [TRAINER_YUJI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2645,7 +2645,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Yuji }, - [OPPONENT_DAISUKE] = + [TRAINER_DAISUKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2659,7 +2659,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Daisuke }, - [OPPONENT_ATSUSHI] = + [TRAINER_ATSUSHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2673,7 +2673,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Atsushi }, - [OPPONENT_KIRK] = + [TRAINER_KIRK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2687,7 +2687,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kirk }, - [OPPONENT_SCOTT] = + [TRAINER_SCOTT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2701,7 +2701,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Scott }, - [OPPONENT_HARVEY] = + [TRAINER_HARVEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2715,7 +2715,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Harvey }, - [OPPONENT_SHAWN] = + [TRAINER_SHAWN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2729,7 +2729,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shawn }, - [OPPONENT_RANDY] = + [TRAINER_RANDY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2743,7 +2743,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Randy }, - [OPPONENT_DALTON_1] = + [TRAINER_DALTON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2757,7 +2757,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton1 }, - [OPPONENT_DALTON_2] = + [TRAINER_DALTON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2771,7 +2771,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton2 }, - [OPPONENT_DALTON_3] = + [TRAINER_DALTON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2785,7 +2785,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton3 }, - [OPPONENT_DALTON_4] = + [TRAINER_DALTON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2799,7 +2799,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton4 }, - [OPPONENT_DALTON_5] = + [TRAINER_DALTON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2813,7 +2813,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton5 }, - [OPPONENT_COLE] = + [TRAINER_COLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2827,7 +2827,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cole }, - [OPPONENT_FLINT] = + [TRAINER_FLINT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2841,7 +2841,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Flint }, - [OPPONENT_AXLE] = + [TRAINER_AXLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2855,7 +2855,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Axle }, - [OPPONENT_JAKE] = + [TRAINER_JAKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2869,7 +2869,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jake }, - [OPPONENT_ANDY] = + [TRAINER_ANDY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2883,7 +2883,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Andy }, - [OPPONENT_BERNIE_1] = + [TRAINER_BERNIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2897,7 +2897,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie1 }, - [OPPONENT_BERNIE_2] = + [TRAINER_BERNIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2911,7 +2911,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie2 }, - [OPPONENT_BERNIE_3] = + [TRAINER_BERNIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2925,7 +2925,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie3 }, - [OPPONENT_BERNIE_4] = + [TRAINER_BERNIE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2939,7 +2939,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie4 }, - [OPPONENT_BERNIE_5] = + [TRAINER_BERNIE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2953,7 +2953,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie5 }, - [OPPONENT_DREW] = + [TRAINER_DREW] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_CAMPER, @@ -2967,7 +2967,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Drew }, - [OPPONENT_CLIFF] = + [TRAINER_CLIFF] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_CAMPER, @@ -2981,7 +2981,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cliff }, - [OPPONENT_LARRY] = + [TRAINER_LARRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -2995,7 +2995,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Larry }, - [OPPONENT_SHANE] = + [TRAINER_SHANE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3009,7 +3009,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shane }, - [OPPONENT_JUSTIN] = + [TRAINER_JUSTIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3023,7 +3023,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Justin }, - [OPPONENT_ETHAN_1] = + [TRAINER_ETHAN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3037,7 +3037,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan1 }, - [OPPONENT_JEFF] = + [TRAINER_JEFF] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3051,7 +3051,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jeff }, - [OPPONENT_TRAVIS] = + [TRAINER_TRAVIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3065,7 +3065,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Travis }, - [OPPONENT_ETHAN_2] = + [TRAINER_ETHAN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3079,7 +3079,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan2 }, - [OPPONENT_ETHAN_3] = + [TRAINER_ETHAN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3093,7 +3093,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan3 }, - [OPPONENT_ETHAN_4] = + [TRAINER_ETHAN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3107,7 +3107,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan4 }, - [OPPONENT_ETHAN_5] = + [TRAINER_ETHAN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3121,7 +3121,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan5 }, - [OPPONENT_BRENT] = + [TRAINER_BRENT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3135,7 +3135,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brent }, - [OPPONENT_DONALD] = + [TRAINER_DONALD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3149,7 +3149,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Donald }, - [OPPONENT_TAYLOR] = + [TRAINER_TAYLOR] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3163,7 +3163,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Taylor }, - [OPPONENT_BRANDON_1] = + [TRAINER_BRANDON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3177,7 +3177,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon1 }, - [OPPONENT_DEREK] = + [TRAINER_DEREK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3191,7 +3191,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Derek }, - [OPPONENT_BRANDON_2] = + [TRAINER_BRANDON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3205,7 +3205,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon2 }, - [OPPONENT_BRANDON_3] = + [TRAINER_BRANDON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3219,7 +3219,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon3 }, - [OPPONENT_BRANDON_4] = + [TRAINER_BRANDON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3233,7 +3233,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon4 }, - [OPPONENT_BRANDON_5] = + [TRAINER_BRANDON_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3247,7 +3247,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon5 }, - [OPPONENT_EDWARD] = + [TRAINER_EDWARD] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3261,7 +3261,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edward }, - [OPPONENT_PRESTON] = + [TRAINER_PRESTON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3275,7 +3275,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Preston }, - [OPPONENT_VIRGIL] = + [TRAINER_VIRGIL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3289,7 +3289,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Virgil }, - [OPPONENT_FRITZ] = + [TRAINER_FRITZ] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3303,7 +3303,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Fritz }, - [OPPONENT_WILLIAM] = + [TRAINER_WILLIAM] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3317,7 +3317,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_William }, - [OPPONENT_JOSHUA] = + [TRAINER_JOSHUA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3331,7 +3331,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Joshua }, - [OPPONENT_CAMERON_1] = + [TRAINER_CAMERON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3345,7 +3345,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron1 }, - [OPPONENT_CAMERON_2] = + [TRAINER_CAMERON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3359,7 +3359,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron2 }, - [OPPONENT_CAMERON_3] = + [TRAINER_CAMERON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3373,7 +3373,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron3 }, - [OPPONENT_CAMERON_4] = + [TRAINER_CAMERON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3387,7 +3387,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron4 }, - [OPPONENT_CAMERON_5] = + [TRAINER_CAMERON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3401,7 +3401,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron5 }, - [OPPONENT_JACLYN] = + [TRAINER_JACLYN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3415,7 +3415,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jaclyn }, - [OPPONENT_HANNAH] = + [TRAINER_HANNAH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3429,7 +3429,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hannah }, - [OPPONENT_SAMANTHA] = + [TRAINER_SAMANTHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3443,7 +3443,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Samantha }, - [OPPONENT_MAURA] = + [TRAINER_MAURA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3457,7 +3457,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maura }, - [OPPONENT_KAYLA] = + [TRAINER_KAYLA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3471,7 +3471,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kayla }, - [OPPONENT_ALEXIS] = + [TRAINER_ALEXIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3485,7 +3485,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alexis }, - [OPPONENT_JACKI_1] = + [TRAINER_JACKI_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3499,7 +3499,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki1 }, - [OPPONENT_JACKI_2] = + [TRAINER_JACKI_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3513,7 +3513,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki2 }, - [OPPONENT_JACKI_3] = + [TRAINER_JACKI_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3527,7 +3527,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki3 }, - [OPPONENT_JACKI_4] = + [TRAINER_JACKI_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3541,7 +3541,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki4 }, - [OPPONENT_JACKI_5] = + [TRAINER_JACKI_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3555,7 +3555,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki5 }, - [OPPONENT_WALTER_1] = + [TRAINER_WALTER_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3569,7 +3569,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter1 }, - [OPPONENT_TUCKER] = + [TRAINER_TUCKER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3583,7 +3583,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tucker }, - [OPPONENT_THOMAS] = + [TRAINER_THOMAS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3597,7 +3597,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Thomas }, - [OPPONENT_WALTER_2] = + [TRAINER_WALTER_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3611,7 +3611,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter2 }, - [OPPONENT_WALTER_3] = + [TRAINER_WALTER_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3625,7 +3625,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter3 }, - [OPPONENT_WALTER_4] = + [TRAINER_WALTER_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3639,7 +3639,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter4 }, - [OPPONENT_WALTER_5] = + [TRAINER_WALTER_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3653,7 +3653,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter5 }, - [OPPONENT_SIDNEY] = + [TRAINER_SIDNEY] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3667,7 +3667,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sidney }, - [OPPONENT_PHOEBE] = + [TRAINER_PHOEBE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3681,7 +3681,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Phoebe }, - [OPPONENT_GLACIA] = + [TRAINER_GLACIA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3695,7 +3695,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Glacia }, - [OPPONENT_DRAKE] = + [TRAINER_DRAKE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3709,7 +3709,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Drake }, - [OPPONENT_ROXANNE] = + [TRAINER_ROXANNE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3723,7 +3723,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Roxanne }, - [OPPONENT_BRAWLY] = + [TRAINER_BRAWLY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3737,7 +3737,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brawly }, - [OPPONENT_WATTSON] = + [TRAINER_WATTSON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3751,7 +3751,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wattson }, - [OPPONENT_FLANNERY] = + [TRAINER_FLANNERY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3765,7 +3765,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Flannery }, - [OPPONENT_NORMAN] = + [TRAINER_NORMAN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3779,7 +3779,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Norman }, - [OPPONENT_WINONA] = + [TRAINER_WINONA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3793,7 +3793,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winona }, - [OPPONENT_TATE_AND_LIZA] = + [TRAINER_TATE_AND_LIZA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3807,7 +3807,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_TateAndLiza }, - [OPPONENT_WALLACE] = + [TRAINER_WALLACE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3821,7 +3821,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wallace }, - [OPPONENT_JERRY_1] = + [TRAINER_JERRY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3835,7 +3835,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry1 }, - [OPPONENT_TED] = + [TRAINER_TED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3849,7 +3849,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ted }, - [OPPONENT_PAUL] = + [TRAINER_PAUL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3863,7 +3863,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Paul }, - [OPPONENT_JERRY_2] = + [TRAINER_JERRY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3877,7 +3877,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry2 }, - [OPPONENT_JERRY_3] = + [TRAINER_JERRY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3891,7 +3891,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry3 }, - [OPPONENT_JERRY_4] = + [TRAINER_JERRY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3905,7 +3905,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry4 }, - [OPPONENT_JERRY_5] = + [TRAINER_JERRY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3919,7 +3919,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry5 }, - [OPPONENT_KAREN_1] = + [TRAINER_KAREN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3933,7 +3933,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen1 }, - [OPPONENT_GEORGIA] = + [TRAINER_GEORGIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3947,7 +3947,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Georgia }, - [OPPONENT_KAREN_2] = + [TRAINER_KAREN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3961,7 +3961,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen2 }, - [OPPONENT_KAREN_3] = + [TRAINER_KAREN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3975,7 +3975,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen3 }, - [OPPONENT_KAREN_4] = + [TRAINER_KAREN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3989,7 +3989,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen4 }, - [OPPONENT_KAREN_5] = + [TRAINER_KAREN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -4003,7 +4003,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen5 }, - [OPPONENT_KATE_AND_JOY] = + [TRAINER_KATE_AND_JOY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4017,7 +4017,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_KateAndJoy }, - [OPPONENT_ANNA_AND_MEG_1] = + [TRAINER_ANNA_AND_MEG_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4031,7 +4031,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg1 }, - [OPPONENT_ANNA_AND_MEG_2] = + [TRAINER_ANNA_AND_MEG_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4045,7 +4045,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg2 }, - [OPPONENT_ANNA_AND_MEG_3] = + [TRAINER_ANNA_AND_MEG_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4059,7 +4059,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg3 }, - [OPPONENT_ANNA_AND_MEG_4] = + [TRAINER_ANNA_AND_MEG_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4073,7 +4073,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg4 }, - [OPPONENT_ANNA_AND_MEG_5] = + [TRAINER_ANNA_AND_MEG_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4087,7 +4087,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg5 }, - [OPPONENT_VICTOR] = + [TRAINER_VICTOR] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -4101,7 +4101,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Victor }, - [OPPONENT_MIGUEL_1] = + [TRAINER_MIGUEL_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4115,7 +4115,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel1 }, - [OPPONENT_COLTON] = + [TRAINER_COLTON] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4129,7 +4129,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Colton }, - [OPPONENT_MIGUEL_2] = + [TRAINER_MIGUEL_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4143,7 +4143,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel2 }, - [OPPONENT_MIGUEL_3] = + [TRAINER_MIGUEL_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4157,7 +4157,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel3 }, - [OPPONENT_MIGUEL_4] = + [TRAINER_MIGUEL_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4171,7 +4171,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel4 }, - [OPPONENT_MIGUEL_5] = + [TRAINER_MIGUEL_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4185,7 +4185,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel5 }, - [OPPONENT_VICTORIA] = + [TRAINER_VICTORIA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -4199,7 +4199,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Victoria }, - [OPPONENT_VANESSA] = + [TRAINER_VANESSA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4213,7 +4213,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vanessa }, - [OPPONENT_MARISSA] = + [TRAINER_MARISSA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4227,7 +4227,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Marissa }, - [OPPONENT_ISABEL_1] = + [TRAINER_ISABEL_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4241,7 +4241,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel1 }, - [OPPONENT_ISABEL_2] = + [TRAINER_ISABEL_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4255,7 +4255,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel2 }, - [OPPONENT_ISABEL_3] = + [TRAINER_ISABEL_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4269,7 +4269,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel3 }, - [OPPONENT_ISABEL_4] = + [TRAINER_ISABEL_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4283,7 +4283,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel4 }, - [OPPONENT_ISABEL_5] = + [TRAINER_ISABEL_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4297,7 +4297,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel5 }, - [OPPONENT_TIMOTHY_1] = + [TRAINER_TIMOTHY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4311,7 +4311,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy1 }, - [OPPONENT_TIMOTHY_2] = + [TRAINER_TIMOTHY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4325,7 +4325,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy2 }, - [OPPONENT_TIMOTHY_3] = + [TRAINER_TIMOTHY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4339,7 +4339,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy3 }, - [OPPONENT_TIMOTHY_4] = + [TRAINER_TIMOTHY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4353,7 +4353,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy4 }, - [OPPONENT_TIMOTHY_5] = + [TRAINER_TIMOTHY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4367,7 +4367,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy5 }, - [OPPONENT_VICKY] = + [TRAINER_VICKY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -4381,7 +4381,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vicky }, - [OPPONENT_SHELBY_1] = + [TRAINER_SHELBY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4395,7 +4395,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby1 }, - [OPPONENT_SHELBY_2] = + [TRAINER_SHELBY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4409,7 +4409,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby2 }, - [OPPONENT_SHELBY_3] = + [TRAINER_SHELBY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4423,7 +4423,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby3 }, - [OPPONENT_SHELBY_4] = + [TRAINER_SHELBY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4437,7 +4437,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby4 }, - [OPPONENT_SHELBY_5] = + [TRAINER_SHELBY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4451,7 +4451,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby5 }, - [OPPONENT_CALVIN_1] = + [TRAINER_CALVIN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4465,7 +4465,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin1 }, - [OPPONENT_BILLY] = + [TRAINER_BILLY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4479,7 +4479,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Billy }, - [OPPONENT_JOSH] = + [TRAINER_JOSH] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4493,7 +4493,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Josh }, - [OPPONENT_TOMMY] = + [TRAINER_TOMMY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4507,7 +4507,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tommy }, - [OPPONENT_JOEY] = + [TRAINER_JOEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4521,7 +4521,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Joey }, - [OPPONENT_BEN] = + [TRAINER_BEN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4535,7 +4535,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ben }, - [OPPONENT_ANONYMOUS_5] = + [TRAINER_ANONYMOUS_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4549,7 +4549,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous5 }, - [OPPONENT_KEVIN] = + [TRAINER_KEVIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4563,7 +4563,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kevin }, - [OPPONENT_NEAL] = + [TRAINER_NEAL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4577,7 +4577,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Neal }, - [OPPONENT_DILLON] = + [TRAINER_DILLON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4591,7 +4591,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dillon }, - [OPPONENT_CALVIN_2] = + [TRAINER_CALVIN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4605,7 +4605,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin2 }, - [OPPONENT_CALVIN_3] = + [TRAINER_CALVIN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4619,7 +4619,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin3 }, - [OPPONENT_CALVIN_4] = + [TRAINER_CALVIN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4633,7 +4633,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin4 }, - [OPPONENT_CALVIN_5] = + [TRAINER_CALVIN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4647,7 +4647,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin5 }, - [OPPONENT_EDDIE] = + [TRAINER_EDDIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4661,7 +4661,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Eddie }, - [OPPONENT_ALLEN] = + [TRAINER_ALLEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4675,7 +4675,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Allen }, - [OPPONENT_TIMMY] = + [TRAINER_TIMMY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4689,7 +4689,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timmy }, - [OPPONENT_STEVEN] = + [TRAINER_STEVEN] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_CHAMPION, @@ -4703,7 +4703,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steven }, - [OPPONENT_ANDREW] = + [TRAINER_ANDREW] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4717,7 +4717,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Andrew }, - [OPPONENT_IVAN] = + [TRAINER_IVAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4731,7 +4731,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ivan }, - [OPPONENT_CLAUDE] = + [TRAINER_CLAUDE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4745,7 +4745,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Claude }, - [OPPONENT_ELLIOT_1] = + [TRAINER_ELLIOT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4759,7 +4759,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot1 }, - [OPPONENT_NED] = + [TRAINER_NED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4773,7 +4773,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ned }, - [OPPONENT_DALE] = + [TRAINER_DALE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4787,7 +4787,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dale }, - [OPPONENT_NOLAN] = + [TRAINER_NOLAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4801,7 +4801,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nolan }, - [OPPONENT_BARNY] = + [TRAINER_BARNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4815,7 +4815,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Barny }, - [OPPONENT_WADE] = + [TRAINER_WADE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4829,7 +4829,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wade }, - [OPPONENT_CARTER] = + [TRAINER_CARTER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4843,7 +4843,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Carter }, - [OPPONENT_ELLIOT_2] = + [TRAINER_ELLIOT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4857,7 +4857,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot2 }, - [OPPONENT_ELLIOT_3] = + [TRAINER_ELLIOT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4871,7 +4871,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot3 }, - [OPPONENT_ELLIOT_4] = + [TRAINER_ELLIOT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4885,7 +4885,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot4 }, - [OPPONENT_ELLIOT_5] = + [TRAINER_ELLIOT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4899,7 +4899,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot5 }, - [OPPONENT_RONALD] = + [TRAINER_RONALD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4913,7 +4913,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ronald }, - [OPPONENT_JACOB] = + [TRAINER_JACOB] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4927,7 +4927,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacob }, - [OPPONENT_ANTHONY] = + [TRAINER_ANTHONY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4941,7 +4941,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anthony }, - [OPPONENT_BENJAMIN_1] = + [TRAINER_BENJAMIN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4955,7 +4955,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin1 }, - [OPPONENT_BENJAMIN_2] = + [TRAINER_BENJAMIN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4969,7 +4969,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin2 }, - [OPPONENT_BENJAMIN_3] = + [TRAINER_BENJAMIN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4983,7 +4983,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin3 }, - [OPPONENT_BENJAMIN_4] = + [TRAINER_BENJAMIN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4997,7 +4997,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin4 }, - [OPPONENT_BENJAMIN_5] = + [TRAINER_BENJAMIN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5011,7 +5011,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin5 }, - [OPPONENT_ABIGAIL_1] = + [TRAINER_ABIGAIL_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5025,7 +5025,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail1 }, - [OPPONENT_JASMINE] = + [TRAINER_JASMINE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5039,7 +5039,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jasmine }, - [OPPONENT_ABIGAIL_2] = + [TRAINER_ABIGAIL_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5053,7 +5053,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail2 }, - [OPPONENT_ABIGAIL_3] = + [TRAINER_ABIGAIL_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5067,7 +5067,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail3 }, - [OPPONENT_ABIGAIL_4] = + [TRAINER_ABIGAIL_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5081,7 +5081,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail4 }, - [OPPONENT_ABIGAIL_5] = + [TRAINER_ABIGAIL_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5095,7 +5095,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail5 }, - [OPPONENT_DYLAN_1] = + [TRAINER_DYLAN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5109,7 +5109,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan1 }, - [OPPONENT_DYLAN_2] = + [TRAINER_DYLAN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5123,7 +5123,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan2 }, - [OPPONENT_DYLAN_3] = + [TRAINER_DYLAN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5137,7 +5137,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan3 }, - [OPPONENT_DYLAN_4] = + [TRAINER_DYLAN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5151,7 +5151,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan4 }, - [OPPONENT_DYLAN_5] = + [TRAINER_DYLAN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5165,7 +5165,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan5 }, - [OPPONENT_MARIA_1] = + [TRAINER_MARIA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5179,7 +5179,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria1 }, - [OPPONENT_MARIA_2] = + [TRAINER_MARIA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5193,7 +5193,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria2 }, - [OPPONENT_MARIA_3] = + [TRAINER_MARIA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5207,7 +5207,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria3 }, - [OPPONENT_MARIA_4] = + [TRAINER_MARIA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5221,7 +5221,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria4 }, - [OPPONENT_MARIA_5] = + [TRAINER_MARIA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5235,7 +5235,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria5 }, - [OPPONENT_CALEB] = + [TRAINER_CALEB] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5249,7 +5249,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Caleb }, - [OPPONENT_ANONYMOUS_6] = + [TRAINER_ANONYMOUS_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5263,7 +5263,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous6 }, - [OPPONENT_ISAIAH_1] = + [TRAINER_ISAIAH_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5277,7 +5277,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah1 }, - [OPPONENT_ANONYMOUS_7] = + [TRAINER_ANONYMOUS_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5291,7 +5291,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous7 }, - [OPPONENT_CHASE] = + [TRAINER_CHASE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5305,7 +5305,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chase }, - [OPPONENT_ISAIAH_2] = + [TRAINER_ISAIAH_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5319,7 +5319,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah2 }, - [OPPONENT_ISAIAH_3] = + [TRAINER_ISAIAH_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5333,7 +5333,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah3 }, - [OPPONENT_ISAIAH_4] = + [TRAINER_ISAIAH_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5347,7 +5347,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah4 }, - [OPPONENT_ISAIAH_5] = + [TRAINER_ISAIAH_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5361,7 +5361,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah5 }, - [OPPONENT_ANONYMOUS_8] = + [TRAINER_ANONYMOUS_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5375,7 +5375,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous8 }, - [OPPONENT_CONNOR] = + [TRAINER_CONNOR] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5389,7 +5389,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Connor }, - [OPPONENT_ANONYMOUS_9] = + [TRAINER_ANONYMOUS_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5403,7 +5403,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous9 }, - [OPPONENT_KATELYN_1] = + [TRAINER_KATELYN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5417,7 +5417,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn1 }, - [OPPONENT_ALLISON] = + [TRAINER_ALLISON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5431,7 +5431,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Allison }, - [OPPONENT_KATELYN_2] = + [TRAINER_KATELYN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5445,7 +5445,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn2 }, - [OPPONENT_KATELYN_3] = + [TRAINER_KATELYN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5459,7 +5459,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn3 }, - [OPPONENT_KATELYN_4] = + [TRAINER_KATELYN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5473,7 +5473,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn4 }, - [OPPONENT_KATELYN_5] = + [TRAINER_KATELYN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5487,7 +5487,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn5 }, - [OPPONENT_NICOLAS_1] = + [TRAINER_NICOLAS_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5501,7 +5501,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas1 }, - [OPPONENT_NICOLAS_2] = + [TRAINER_NICOLAS_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5515,7 +5515,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas2 }, - [OPPONENT_NICOLAS_3] = + [TRAINER_NICOLAS_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5529,7 +5529,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas3 }, - [OPPONENT_NICOLAS_4] = + [TRAINER_NICOLAS_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5543,7 +5543,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas4 }, - [OPPONENT_NICOLAS_5] = + [TRAINER_NICOLAS_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5557,7 +5557,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas5 }, - [OPPONENT_AARON] = + [TRAINER_AARON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5571,7 +5571,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Aaron }, - [OPPONENT_PERRY] = + [TRAINER_PERRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5585,7 +5585,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Perry }, - [OPPONENT_HUGH] = + [TRAINER_HUGH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5599,7 +5599,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hugh }, - [OPPONENT_PHIL] = + [TRAINER_PHIL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5613,7 +5613,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Phil }, - [OPPONENT_JARED] = + [TRAINER_JARED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5627,7 +5627,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jared }, - [OPPONENT_ANONYMOUS_10] = + [TRAINER_ANONYMOUS_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5641,7 +5641,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous10 }, - [OPPONENT_TANNER] = + [TRAINER_TANNER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5655,7 +5655,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tanner }, - [OPPONENT_WILL] = + [TRAINER_WILL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5669,7 +5669,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Will }, - [OPPONENT_COLIN] = + [TRAINER_COLIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5683,7 +5683,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Colin }, - [OPPONENT_ROBERT_1] = + [TRAINER_ROBERT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5697,7 +5697,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert1 }, - [OPPONENT_BENNY] = + [TRAINER_BENNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5711,7 +5711,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benny }, - [OPPONENT_CHESTER] = + [TRAINER_CHESTER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5725,7 +5725,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chester }, - [OPPONENT_ROBERT_2] = + [TRAINER_ROBERT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5739,7 +5739,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert2 }, - [OPPONENT_ROBERT_3] = + [TRAINER_ROBERT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5753,7 +5753,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert3 }, - [OPPONENT_ROBERT_4] = + [TRAINER_ROBERT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5767,7 +5767,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert4 }, - [OPPONENT_ROBERT_5] = + [TRAINER_ROBERT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5781,7 +5781,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert5 }, - [OPPONENT_ALEX] = + [TRAINER_ALEX] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5795,7 +5795,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alex }, - [OPPONENT_BECK] = + [TRAINER_BECK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5809,7 +5809,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Beck }, - [OPPONENT_YASU] = + [TRAINER_YASU] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5823,7 +5823,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Yasu }, - [OPPONENT_TAKASHI] = + [TRAINER_TAKASHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5837,7 +5837,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Takashi }, - [OPPONENT_MAKOTO] = + [TRAINER_MAKOTO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5851,7 +5851,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Makoto }, - [OPPONENT_HIDEO_1] = + [TRAINER_HIDEO_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5865,7 +5865,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hideo1 }, - [OPPONENT_LAO_1] = + [TRAINER_LAO_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5879,7 +5879,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao1 }, - [OPPONENT_LUNG] = + [TRAINER_LUNG] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5893,7 +5893,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lung }, - [OPPONENT_LAO_2] = + [TRAINER_LAO_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5907,7 +5907,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao2 }, - [OPPONENT_LAO_3] = + [TRAINER_LAO_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5921,7 +5921,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao3 }, - [OPPONENT_LAO_4] = + [TRAINER_LAO_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5935,7 +5935,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao4 }, - [OPPONENT_LAO_5] = + [TRAINER_LAO_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5949,7 +5949,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao5 }, - [OPPONENT_TESSA] = + [TRAINER_TESSA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -5963,7 +5963,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tessa }, - [OPPONENT_LAURA] = + [TRAINER_LAURA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -5977,7 +5977,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Laura }, - [OPPONENT_CYNDY_1] = + [TRAINER_CYNDY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -5991,7 +5991,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy1 }, - [OPPONENT_CORA] = + [TRAINER_CORA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6005,7 +6005,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cora }, - [OPPONENT_JILL] = + [TRAINER_JILL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6019,7 +6019,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jill }, - [OPPONENT_CYNDY_2] = + [TRAINER_CYNDY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6033,7 +6033,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy2 }, - [OPPONENT_CYNDY_3] = + [TRAINER_CYNDY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6047,7 +6047,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy3 }, - [OPPONENT_CYNDY_4] = + [TRAINER_CYNDY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6061,7 +6061,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy4 }, - [OPPONENT_CYNDY_5] = + [TRAINER_CYNDY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6075,7 +6075,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy5 }, - [OPPONENT_MADELINE_1] = + [TRAINER_MADELINE_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6089,7 +6089,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline1 }, - [OPPONENT_CLARISSA] = + [TRAINER_CLARISSA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6103,7 +6103,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Clarissa }, - [OPPONENT_ANGELICA] = + [TRAINER_ANGELICA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6117,7 +6117,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Angelica }, - [OPPONENT_MADELINE_2] = + [TRAINER_MADELINE_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6131,7 +6131,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline2 }, - [OPPONENT_MADELINE_3] = + [TRAINER_MADELINE_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6145,7 +6145,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline3 }, - [OPPONENT_MADELINE_4] = + [TRAINER_MADELINE_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6159,7 +6159,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline4 }, - [OPPONENT_MADELINE_5] = + [TRAINER_MADELINE_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6173,7 +6173,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline5 }, - [OPPONENT_BEVERLY] = + [TRAINER_BEVERLY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6187,7 +6187,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Beverly }, - [OPPONENT_DAWN] = + [TRAINER_DAWN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6201,7 +6201,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dawn }, - [OPPONENT_NICOLE] = + [TRAINER_NICOLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6215,7 +6215,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicole }, - [OPPONENT_DENISE] = + [TRAINER_DENISE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6229,7 +6229,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Denise }, - [OPPONENT_BETH] = + [TRAINER_BETH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6243,7 +6243,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Beth }, - [OPPONENT_TARA] = + [TRAINER_TARA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6257,7 +6257,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tara }, - [OPPONENT_MISSY] = + [TRAINER_MISSY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6271,7 +6271,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Missy }, - [OPPONENT_ALICE] = + [TRAINER_ALICE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6285,7 +6285,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alice }, - [OPPONENT_JENNY_1] = + [TRAINER_JENNY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6299,7 +6299,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny1 }, - [OPPONENT_GRACE] = + [TRAINER_GRACE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6313,7 +6313,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grace }, - [OPPONENT_TANYA] = + [TRAINER_TANYA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6327,7 +6327,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tanya }, - [OPPONENT_SHARON] = + [TRAINER_SHARON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6341,7 +6341,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sharon }, - [OPPONENT_NIKKI] = + [TRAINER_NIKKI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6355,7 +6355,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nikki }, - [OPPONENT_BRENDA] = + [TRAINER_BRENDA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6369,7 +6369,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brenda }, - [OPPONENT_KATIE] = + [TRAINER_KATIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6383,7 +6383,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katie }, - [OPPONENT_SUSIE] = + [TRAINER_SUSIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6397,7 +6397,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Susie }, - [OPPONENT_KARA] = + [TRAINER_KARA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6411,7 +6411,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kara }, - [OPPONENT_DANA] = + [TRAINER_DANA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6425,7 +6425,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dana }, - [OPPONENT_ERIN] = + [TRAINER_ERIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6439,7 +6439,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Erin }, - [OPPONENT_DEBRA] = + [TRAINER_DEBRA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6453,7 +6453,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Debra }, - [OPPONENT_LINDA] = + [TRAINER_LINDA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6467,7 +6467,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Linda }, - [OPPONENT_KAYLEE] = + [TRAINER_KAYLEE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6481,7 +6481,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kaylee }, - [OPPONENT_LAUREL] = + [TRAINER_LAUREL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6495,7 +6495,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Laurel }, - [OPPONENT_DARCY] = + [TRAINER_DARCY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6509,7 +6509,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Darcy }, - [OPPONENT_JENNY_2] = + [TRAINER_JENNY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6523,7 +6523,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny2 }, - [OPPONENT_JENNY_3] = + [TRAINER_JENNY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6537,7 +6537,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny3 }, - [OPPONENT_JENNY_4] = + [TRAINER_JENNY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6551,7 +6551,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny4 }, - [OPPONENT_JENNY_5] = + [TRAINER_JENNY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6565,7 +6565,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny5 }, - [OPPONENT_HEIDI] = + [TRAINER_HEIDI] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6579,7 +6579,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Heidi }, - [OPPONENT_BECKY] = + [TRAINER_BECKY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6593,7 +6593,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Becky }, - [OPPONENT_CAROL] = + [TRAINER_CAROL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6607,7 +6607,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Carol }, - [OPPONENT_NANCY] = + [TRAINER_NANCY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6621,7 +6621,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nancy }, - [OPPONENT_MARTHA] = + [TRAINER_MARTHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6635,7 +6635,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Martha }, - [OPPONENT_DIANA_1] = + [TRAINER_DIANA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6649,7 +6649,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana1 }, - [OPPONENT_NINA] = + [TRAINER_NINA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6663,7 +6663,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nina }, - [OPPONENT_IRENE] = + [TRAINER_IRENE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6677,7 +6677,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Irene }, - [OPPONENT_DIANA_2] = + [TRAINER_DIANA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6691,7 +6691,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana2 }, - [OPPONENT_DIANA_3] = + [TRAINER_DIANA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6705,7 +6705,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana3 }, - [OPPONENT_DIANA_4] = + [TRAINER_DIANA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6719,7 +6719,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana4 }, - [OPPONENT_DIANA_5] = + [TRAINER_DIANA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6733,7 +6733,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana5 }, - [OPPONENT_AMY_AND_LIV_1] = + [TRAINER_AMY_AND_LIV_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6747,7 +6747,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv1 }, - [OPPONENT_AMY_AND_LIV_2] = + [TRAINER_AMY_AND_LIV_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6761,7 +6761,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv2 }, - [OPPONENT_GINA_AND_MIA_1] = + [TRAINER_GINA_AND_MIA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6775,7 +6775,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GinaAndMia1 }, - [OPPONENT_MIU_AND_YUKI] = + [TRAINER_MIU_AND_YUKI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6789,7 +6789,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_MiuAndYuki }, - [OPPONENT_AMY_AND_LIV_3] = + [TRAINER_AMY_AND_LIV_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6803,7 +6803,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv3 }, - [OPPONENT_GINA_AND_MIA_2] = + [TRAINER_GINA_AND_MIA_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TWINS, @@ -6817,7 +6817,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GinaAndMia2 }, - [OPPONENT_AMY_AND_LIV_4] = + [TRAINER_AMY_AND_LIV_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6831,7 +6831,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv4 }, - [OPPONENT_AMY_AND_LIV_5] = + [TRAINER_AMY_AND_LIV_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TWINS, @@ -6845,7 +6845,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv5 }, - [OPPONENT_AMY_AND_LIV_6] = + [TRAINER_AMY_AND_LIV_6] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TWINS, @@ -6859,7 +6859,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv6 }, - [OPPONENT_HUEY] = + [TRAINER_HUEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6873,7 +6873,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Huey }, - [OPPONENT_EDMOND] = + [TRAINER_EDMOND] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6887,7 +6887,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edmond }, - [OPPONENT_ERNEST_1] = + [TRAINER_ERNEST_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6901,7 +6901,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest1 }, - [OPPONENT_DWAYNE] = + [TRAINER_DWAYNE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6915,7 +6915,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dwayne }, - [OPPONENT_PHILLIP] = + [TRAINER_PHILLIP] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6929,7 +6929,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Phillip }, - [OPPONENT_LEONARD] = + [TRAINER_LEONARD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6943,7 +6943,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Leonard }, - [OPPONENT_DUNCAN] = + [TRAINER_DUNCAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6957,7 +6957,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Duncan }, - [OPPONENT_ERNEST_2] = + [TRAINER_ERNEST_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6971,7 +6971,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest2 }, - [OPPONENT_ERNEST_3] = + [TRAINER_ERNEST_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6985,7 +6985,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest3 }, - [OPPONENT_ERNEST_4] = + [TRAINER_ERNEST_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6999,7 +6999,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest4 }, - [OPPONENT_ERNEST_5] = + [TRAINER_ERNEST_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -7013,7 +7013,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest5 }, - [OPPONENT_ANONYMOUS_11] = + [TRAINER_ANONYMOUS_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7027,7 +7027,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous11 }, - [OPPONENT_ANONYMOUS_12] = + [TRAINER_ANONYMOUS_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7041,7 +7041,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous12 }, - [OPPONENT_ANONYMOUS_13] = + [TRAINER_ANONYMOUS_13] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7055,7 +7055,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous13 }, - [OPPONENT_SONNY] = + [TRAINER_SONNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7069,7 +7069,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sonny }, - [OPPONENT_DONOVAN] = + [TRAINER_DONOVAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7083,7 +7083,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Donovan }, - [OPPONENT_GERALD] = + [TRAINER_GERALD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7097,7 +7097,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Gerald }, - [OPPONENT_KELVIN] = + [TRAINER_KELVIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7111,7 +7111,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kelvin }, - [OPPONENT_KODY] = + [TRAINER_KODY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7125,7 +7125,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kody }, - [OPPONENT_TEVIN] = + [TRAINER_TEVIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7139,7 +7139,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tevin }, - [OPPONENT_DAMON] = + [TRAINER_DAMON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7153,7 +7153,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Damon }, - [OPPONENT_PABLO] = + [TRAINER_PABLO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7167,7 +7167,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Pablo }, - [OPPONENT_EDWIN_1] = + [TRAINER_EDWIN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7181,7 +7181,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin1 }, - [OPPONENT_HECTOR_1] = + [TRAINER_HECTOR_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7195,7 +7195,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hector1 }, - [OPPONENT_HECTOR_2] = + [TRAINER_HECTOR_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7209,7 +7209,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hector2 }, - [OPPONENT_EDWIN_2] = + [TRAINER_EDWIN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7223,7 +7223,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin2 }, - [OPPONENT_EDWIN_3] = + [TRAINER_EDWIN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7237,7 +7237,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin3 }, - [OPPONENT_EDWIN_4] = + [TRAINER_EDWIN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7251,7 +7251,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin4 }, - [OPPONENT_EDWIN_5] = + [TRAINER_EDWIN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7265,7 +7265,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin5 }, - [OPPONENT_WALLY_1] = + [TRAINER_WALLY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7279,7 +7279,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally1 }, - [OPPONENT_BRENDAN_1] = + [TRAINER_BRENDAN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7293,7 +7293,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan1 }, - [OPPONENT_BRENDAN_2] = + [TRAINER_BRENDAN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7307,7 +7307,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan2 }, - [OPPONENT_BRENDAN_3] = + [TRAINER_BRENDAN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7321,7 +7321,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan3 }, - [OPPONENT_BRENDAN_4] = + [TRAINER_BRENDAN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7335,7 +7335,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan4 }, - [OPPONENT_BRENDAN_5] = + [TRAINER_BRENDAN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7349,7 +7349,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan5 }, - [OPPONENT_BRENDAN_6] = + [TRAINER_BRENDAN_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7363,7 +7363,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan6 }, - [OPPONENT_BRENDAN_7] = + [TRAINER_BRENDAN_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7377,7 +7377,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan7 }, - [OPPONENT_BRENDAN_8] = + [TRAINER_BRENDAN_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7391,7 +7391,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan8 }, - [OPPONENT_BRENDAN_9] = + [TRAINER_BRENDAN_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7405,7 +7405,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan9 }, - [OPPONENT_MAY_1] = + [TRAINER_MAY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7419,7 +7419,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May1 }, - [OPPONENT_MAY_2] = + [TRAINER_MAY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7433,7 +7433,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May2 }, - [OPPONENT_MAY_3] = + [TRAINER_MAY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7447,7 +7447,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May3 }, - [OPPONENT_MAY_4] = + [TRAINER_MAY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7461,7 +7461,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May4 }, - [OPPONENT_MAY_5] = + [TRAINER_MAY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7475,7 +7475,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May5 }, - [OPPONENT_MAY_6] = + [TRAINER_MAY_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7489,7 +7489,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May6 }, - [OPPONENT_MAY_7] = + [TRAINER_MAY_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7503,7 +7503,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May7 }, - [OPPONENT_MAY_8] = + [TRAINER_MAY_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7517,7 +7517,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May8 }, - [OPPONENT_MAY_9] = + [TRAINER_MAY_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7531,7 +7531,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May9 }, - [OPPONENT_ISAAC_1] = + [TRAINER_ISAAC_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7545,7 +7545,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac1 }, - [OPPONENT_RILEY] = + [TRAINER_RILEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7559,7 +7559,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Riley }, - [OPPONENT_AIDAN] = + [TRAINER_AIDAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7573,7 +7573,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Aidan }, - [OPPONENT_ISAAC_2] = + [TRAINER_ISAAC_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7587,7 +7587,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac2 }, - [OPPONENT_ISAAC_3] = + [TRAINER_ISAAC_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7601,7 +7601,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac3 }, - [OPPONENT_ISAAC_4] = + [TRAINER_ISAAC_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7615,7 +7615,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac4 }, - [OPPONENT_ISAAC_5] = + [TRAINER_ISAAC_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7629,7 +7629,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac5 }, - [OPPONENT_LYDIA_1] = + [TRAINER_LYDIA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7643,7 +7643,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia1 }, - [OPPONENT_ALEXIA] = + [TRAINER_ALEXIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7657,7 +7657,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alexia }, - [OPPONENT_DANIELLE] = + [TRAINER_DANIELLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7671,7 +7671,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Danielle }, - [OPPONENT_LYDIA_2] = + [TRAINER_LYDIA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7685,7 +7685,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia2 }, - [OPPONENT_LYDIA_3] = + [TRAINER_LYDIA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7699,7 +7699,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia3 }, - [OPPONENT_LYDIA_4] = + [TRAINER_LYDIA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7713,7 +7713,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia4 }, - [OPPONENT_LYDIA_5] = + [TRAINER_LYDIA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7727,7 +7727,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia5 }, - [OPPONENT_JACKSON_1] = + [TRAINER_JACKSON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7741,7 +7741,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson1 }, - [OPPONENT_CARLOS] = + [TRAINER_CARLOS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7755,7 +7755,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Carlos }, - [OPPONENT_SEBASTIAN] = + [TRAINER_SEBASTIAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7769,7 +7769,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sebastian }, - [OPPONENT_JACKSON_2] = + [TRAINER_JACKSON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7783,7 +7783,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson2 }, - [OPPONENT_JACKSON_3] = + [TRAINER_JACKSON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7797,7 +7797,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson3 }, - [OPPONENT_JACKSON_4] = + [TRAINER_JACKSON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7811,7 +7811,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson4 }, - [OPPONENT_JACKSON_5] = + [TRAINER_JACKSON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7825,7 +7825,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson5 }, - [OPPONENT_CATHERINE_1] = + [TRAINER_CATHERINE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7839,7 +7839,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine1 }, - [OPPONENT_JENNA] = + [TRAINER_JENNA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7853,7 +7853,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenna }, - [OPPONENT_SOPHIA] = + [TRAINER_SOPHIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7867,7 +7867,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sophia }, - [OPPONENT_CATHERINE_2] = + [TRAINER_CATHERINE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7881,7 +7881,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine2 }, - [OPPONENT_CATHERINE_3] = + [TRAINER_CATHERINE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7895,7 +7895,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine3 }, - [OPPONENT_CATHERINE_4] = + [TRAINER_CATHERINE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7909,7 +7909,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine4 }, - [OPPONENT_CATHERINE_5] = + [TRAINER_CATHERINE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7923,7 +7923,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine5 }, - [OPPONENT_MAXIE_1] = + [TRAINER_MAXIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_LEADER, @@ -7937,7 +7937,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maxie1 }, - [OPPONENT_GRUNT_28] = + [TRAINER_GRUNT_28] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7951,7 +7951,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt28 }, - [OPPONENT_GRUNT_29] = + [TRAINER_GRUNT_29] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7965,7 +7965,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt29 }, - [OPPONENT_GRUNT_30] = + [TRAINER_GRUNT_30] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7979,7 +7979,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt30 }, - [OPPONENT_GRUNT_31] = + [TRAINER_GRUNT_31] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7993,7 +7993,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt31 }, - [OPPONENT_GRUNT_32] = + [TRAINER_GRUNT_32] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8007,7 +8007,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt32 }, - [OPPONENT_GRUNT_33] = + [TRAINER_GRUNT_33] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8021,7 +8021,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt33 }, - [OPPONENT_GRUNT_34] = + [TRAINER_GRUNT_34] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8035,7 +8035,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt34 }, - [OPPONENT_GRUNT_35] = + [TRAINER_GRUNT_35] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8049,7 +8049,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt35 }, - [OPPONENT_GRUNT_36] = + [TRAINER_GRUNT_36] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8063,7 +8063,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt36 }, - [OPPONENT_GRUNT_37] = + [TRAINER_GRUNT_37] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8077,7 +8077,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt37 }, - [OPPONENT_GRUNT_38] = + [TRAINER_GRUNT_38] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8091,7 +8091,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt38 }, - [OPPONENT_GRUNT_39] = + [TRAINER_GRUNT_39] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8105,7 +8105,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt39 }, - [OPPONENT_GRUNT_40] = + [TRAINER_GRUNT_40] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8119,7 +8119,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt40 }, - [OPPONENT_GRUNT_41] = + [TRAINER_GRUNT_41] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8133,7 +8133,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt41 }, - [OPPONENT_GRUNT_42] = + [TRAINER_GRUNT_42] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8147,7 +8147,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt42 }, - [OPPONENT_GRUNT_43] = + [TRAINER_GRUNT_43] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8161,7 +8161,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt43 }, - [OPPONENT_GRUNT_44] = + [TRAINER_GRUNT_44] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8175,7 +8175,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt44 }, - [OPPONENT_GRUNT_45] = + [TRAINER_GRUNT_45] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8189,7 +8189,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt45 }, - [OPPONENT_GRUNT_46] = + [TRAINER_GRUNT_46] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8203,7 +8203,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt46 }, - [OPPONENT_GRUNT_47] = + [TRAINER_GRUNT_47] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8217,7 +8217,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt47 }, - [OPPONENT_GRUNT_48] = + [TRAINER_GRUNT_48] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8231,7 +8231,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt48 }, - [OPPONENT_GRUNT_49] = + [TRAINER_GRUNT_49] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8245,7 +8245,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt49 }, - [OPPONENT_GRUNT_50] = + [TRAINER_GRUNT_50] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8259,7 +8259,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt50 }, - [OPPONENT_GRUNT_51] = + [TRAINER_GRUNT_51] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8273,7 +8273,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt51 }, - [OPPONENT_GRUNT_52] = + [TRAINER_GRUNT_52] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8287,7 +8287,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt52 }, - [OPPONENT_GRUNT_53] = + [TRAINER_GRUNT_53] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8301,7 +8301,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt53 }, - [OPPONENT_GRUNT_54] = + [TRAINER_GRUNT_54] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8315,7 +8315,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt54 }, - [OPPONENT_ANONYMOUS_14] = + [TRAINER_ANONYMOUS_14] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8329,7 +8329,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous14 }, - [OPPONENT_ANONYMOUS_15] = + [TRAINER_ANONYMOUS_15] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8343,7 +8343,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous15 }, - [OPPONENT_TABITHA_1] = + [TRAINER_TABITHA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8357,7 +8357,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tabitha1 }, - [OPPONENT_TABITHA_2] = + [TRAINER_TABITHA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8371,7 +8371,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tabitha2 }, - [OPPONENT_ANONYMOUS_16] = + [TRAINER_ANONYMOUS_16] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8385,7 +8385,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous16 }, - [OPPONENT_COURTNEY_1] = + [TRAINER_COURTNEY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8399,7 +8399,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Courtney1 }, - [OPPONENT_COURTNEY_2] = + [TRAINER_COURTNEY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8413,7 +8413,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Courtney2 }, - [OPPONENT_MAXIE_2] = + [TRAINER_MAXIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_LEADER, @@ -8427,7 +8427,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maxie2 }, - [OPPONENT_MAXIE_3] = + [TRAINER_MAXIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_LEADER, @@ -8441,7 +8441,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maxie3 }, - [OPPONENT_TIANA] = + [TRAINER_TIANA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8455,7 +8455,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tiana }, - [OPPONENT_HALEY_1] = + [TRAINER_HALEY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8469,7 +8469,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley1 }, - [OPPONENT_JANICE] = + [TRAINER_JANICE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8483,7 +8483,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Janice }, - [OPPONENT_VIVI] = + [TRAINER_VIVI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -8497,7 +8497,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vivi }, - [OPPONENT_HALEY_2] = + [TRAINER_HALEY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8511,7 +8511,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley2 }, - [OPPONENT_HALEY_3] = + [TRAINER_HALEY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8525,7 +8525,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley3 }, - [OPPONENT_HALEY_4] = + [TRAINER_HALEY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8539,7 +8539,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley4 }, - [OPPONENT_HALEY_5] = + [TRAINER_HALEY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8553,7 +8553,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley5 }, - [OPPONENT_SALLY] = + [TRAINER_SALLY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8567,7 +8567,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sally }, - [OPPONENT_ROBIN] = + [TRAINER_ROBIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8581,7 +8581,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robin }, - [OPPONENT_ANDREA] = + [TRAINER_ANDREA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8595,7 +8595,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Andrea }, - [OPPONENT_CRISSY] = + [TRAINER_CRISSY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8609,7 +8609,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Crissy }, - [OPPONENT_RICK] = + [TRAINER_RICK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8623,7 +8623,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rick }, - [OPPONENT_LYLE] = + [TRAINER_LYLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8637,7 +8637,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lyle }, - [OPPONENT_JOSE] = + [TRAINER_JOSE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8651,7 +8651,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jose }, - [OPPONENT_DOUG] = + [TRAINER_DOUG] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8665,7 +8665,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Doug }, - [OPPONENT_GREG] = + [TRAINER_GREG] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8679,7 +8679,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Greg }, - [OPPONENT_KENT] = + [TRAINER_KENT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8693,7 +8693,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kent }, - [OPPONENT_JAMES_1] = + [TRAINER_JAMES_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8707,7 +8707,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James1 }, - [OPPONENT_JAMES_2] = + [TRAINER_JAMES_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8721,7 +8721,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James2 }, - [OPPONENT_JAMES_3] = + [TRAINER_JAMES_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8735,7 +8735,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James3 }, - [OPPONENT_JAMES_4] = + [TRAINER_JAMES_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8749,7 +8749,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James4 }, - [OPPONENT_JAMES_5] = + [TRAINER_JAMES_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8763,7 +8763,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James5 }, - [OPPONENT_BRICE] = + [TRAINER_BRICE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8777,7 +8777,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brice }, - [OPPONENT_TRENT_1] = + [TRAINER_TRENT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8791,7 +8791,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent1 }, - [OPPONENT_LENNY] = + [TRAINER_LENNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8805,7 +8805,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lenny }, - [OPPONENT_LUCAS_1] = + [TRAINER_LUCAS_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8819,7 +8819,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lucas1 }, - [OPPONENT_ALAN] = + [TRAINER_ALAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8833,7 +8833,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alan }, - [OPPONENT_CLARK] = + [TRAINER_CLARK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8847,7 +8847,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Clark }, - [OPPONENT_ERIC] = + [TRAINER_ERIC] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8861,7 +8861,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Eric }, - [OPPONENT_LUCAS_2] = + [TRAINER_LUCAS_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_HIKER, @@ -8875,7 +8875,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lucas2 }, - [OPPONENT_MIKE_1] = + [TRAINER_MIKE_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_HIKER, @@ -8889,7 +8889,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Mike1 }, - [OPPONENT_MIKE_2] = + [TRAINER_MIKE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8903,7 +8903,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Mike2 }, - [OPPONENT_TRENT_2] = + [TRAINER_TRENT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8917,7 +8917,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent2 }, - [OPPONENT_TRENT_3] = + [TRAINER_TRENT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8931,7 +8931,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent3 }, - [OPPONENT_TRENT_4] = + [TRAINER_TRENT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8945,7 +8945,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent4 }, - [OPPONENT_TRENT_5] = + [TRAINER_TRENT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8959,7 +8959,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent5 }, - [OPPONENT_DEZ_AND_LUKE] = + [TRAINER_DEZ_AND_LUKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -8973,7 +8973,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_DezAndLuke }, - [OPPONENT_LEA_AND_JED] = + [TRAINER_LEA_AND_JED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -8987,7 +8987,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LeaAndJed }, - [OPPONENT_LOIS_AND_HAL_1] = + [TRAINER_LOIS_AND_HAL_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9001,7 +9001,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal1 }, - [OPPONENT_LOIS_AND_HAL_2] = + [TRAINER_LOIS_AND_HAL_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9015,7 +9015,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal2 }, - [OPPONENT_LOIS_AND_HAL_3] = + [TRAINER_LOIS_AND_HAL_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9029,7 +9029,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal3 }, - [OPPONENT_LOIS_AND_HAL_4] = + [TRAINER_LOIS_AND_HAL_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9043,7 +9043,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal4 }, - [OPPONENT_LOIS_AND_HAL_5] = + [TRAINER_LOIS_AND_HAL_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9057,7 +9057,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal5 }, - [OPPONENT_JOHANNA] = + [TRAINER_JOHANNA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -9071,7 +9071,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Johanna }, - [OPPONENT_ZANE] = + [TRAINER_ZANE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -9085,7 +9085,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Zane }, - [OPPONENT_VIVIAN] = + [TRAINER_VIVIAN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -9099,7 +9099,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vivian }, - [OPPONENT_SADIE] = + [TRAINER_SADIE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -9113,7 +9113,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sadie }, - [OPPONENT_HIDEO_2] = + [TRAINER_HIDEO_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -9127,7 +9127,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hideo2 }, - [OPPONENT_KEIGO] = + [TRAINER_KEIGO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -9141,7 +9141,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Keigo }, - [OPPONENT_TSUNAO] = + [TRAINER_TSUNAO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -9155,7 +9155,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tsunao }, - [OPPONENT_TERRELL] = + [TRAINER_TERRELL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -9169,7 +9169,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Terrell }, - [OPPONENT_KYLEE] = + [TRAINER_KYLEE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -9183,7 +9183,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kylee }, - [OPPONENT_WALLY_2] = + [TRAINER_WALLY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9197,7 +9197,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally2 }, - [OPPONENT_WALLY_3] = + [TRAINER_WALLY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9211,7 +9211,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally3 }, - [OPPONENT_WALLY_4] = + [TRAINER_WALLY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9225,7 +9225,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally4 }, - [OPPONENT_WALLY_5] = + [TRAINER_WALLY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9239,7 +9239,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally5 }, - [OPPONENT_WALLY_6] = + [TRAINER_WALLY_6] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9253,7 +9253,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally6 }, - [OPPONENT_BRENDAN_10] = + [TRAINER_BRENDAN_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9267,7 +9267,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan10 }, - [OPPONENT_BRENDAN_11] = + [TRAINER_BRENDAN_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9281,7 +9281,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan11 }, - [OPPONENT_BRENDAN_12] = + [TRAINER_BRENDAN_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9295,7 +9295,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan12 }, - [OPPONENT_MAY_10] = + [TRAINER_MAY_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9309,7 +9309,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May10 }, - [OPPONENT_MAY_11] = + [TRAINER_MAY_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9323,7 +9323,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May11 }, - [OPPONENT_MAY_12] = + [TRAINER_MAY_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9337,7 +9337,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May12 }, - [OPPONENT_JONAH] = + [TRAINER_JONAH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9351,7 +9351,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jonah }, - [OPPONENT_HENRY] = + [TRAINER_HENRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9365,7 +9365,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Henry }, - [OPPONENT_ROGER] = + [TRAINER_ROGER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9379,7 +9379,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Roger }, - [OPPONENT_ALEXA] = + [TRAINER_ALEXA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -9393,7 +9393,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alexa }, - [OPPONENT_RUBEN] = + [TRAINER_RUBEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -9407,7 +9407,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ruben }, - [OPPONENT_KOJI] = + [TRAINER_KOJI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -9421,7 +9421,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Koji }, - [OPPONENT_WAYNE] = + [TRAINER_WAYNE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9435,7 +9435,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wayne }, - [OPPONENT_BYRON] = + [TRAINER_BYRON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -9449,7 +9449,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Byron }, - [OPPONENT_REED] = + [TRAINER_REED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -9463,7 +9463,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Reed }, - [OPPONENT_TISHA] = + [TRAINER_TISHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -9477,7 +9477,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tisha }, - [OPPONENT_TORI_AND_TIA] = + [TRAINER_TORI_AND_TIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -9491,7 +9491,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_ToriAndTia }, - [OPPONENT_KIM_AND_IRIS] = + [TRAINER_KIM_AND_IRIS] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -9505,7 +9505,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_KimAndIris }, - [OPPONENT_TYRA_AND_IVY] = + [TRAINER_TYRA_AND_IVY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -9519,7 +9519,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_TyraAndIvy }, - [OPPONENT_MEL_AND_PAUL] = + [TRAINER_MEL_AND_PAUL] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9533,7 +9533,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_MelAndPaul }, - [OPPONENT_JOHN_AND_JAY_1] = + [TRAINER_JOHN_AND_JAY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9547,7 +9547,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay1 }, - [OPPONENT_JOHN_AND_JAY_2] = + [TRAINER_JOHN_AND_JAY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9561,7 +9561,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay2 }, - [OPPONENT_JOHN_AND_JAY_3] = + [TRAINER_JOHN_AND_JAY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9575,7 +9575,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay3 }, - [OPPONENT_JOHN_AND_JAY_4] = + [TRAINER_JOHN_AND_JAY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9589,7 +9589,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay4 }, - [OPPONENT_JOHN_AND_JAY_5] = + [TRAINER_JOHN_AND_JAY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9603,7 +9603,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay5 }, - [OPPONENT_RELI_AND_IAN] = + [TRAINER_RELI_AND_IAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9617,7 +9617,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_ReliAndIan }, - [OPPONENT_RITA_AND_SAM_1] = + [TRAINER_RITA_AND_SAM_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9631,7 +9631,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam1 }, - [OPPONENT_RITA_AND_SAM_2] = + [TRAINER_RITA_AND_SAM_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9645,7 +9645,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam2 }, - [OPPONENT_RITA_AND_SAM_3] = + [TRAINER_RITA_AND_SAM_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9659,7 +9659,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam3 }, - [OPPONENT_RITA_AND_SAM_4] = + [TRAINER_RITA_AND_SAM_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9673,7 +9673,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam4 }, - [OPPONENT_RITA_AND_SAM_5] = + [TRAINER_RITA_AND_SAM_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9687,7 +9687,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam5 }, - [OPPONENT_LISA_AND_RAY] = + [TRAINER_LISA_AND_RAY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9701,7 +9701,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LisaAndRay }, - [OPPONENT_EUGENE] = + [TRAINER_EUGENE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, |