diff options
78 files changed, 534 insertions, 534 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index e0cb3ec1c..a8c897621 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1941,66 +1941,66 @@ SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0 end DewfordTown_Gym_EventScript_1A021E:: @ 81A021E - cleartrainerflag 320 - cleartrainerflag 321 + cleartrainerflag OPPONENT_JOSH + cleartrainerflag OPPONENT_TOMMY return DewfordTown_Gym_EventScript_1A0225:: @ 81A0225 - cleartrainerflag 179 - cleartrainerflag 425 - cleartrainerflag 426 + cleartrainerflag OPPONENT_HIDEKI + cleartrainerflag OPPONENT_TESSA + cleartrainerflag OPPONENT_LAURA return DewfordTown_Gym_EventScript_1A022F:: @ 81A022F - cleartrainerflag 191 - cleartrainerflag 194 - cleartrainerflag 323 - cleartrainerflag 649 + cleartrainerflag OPPONENT_KIRK + cleartrainerflag OPPONENT_SHAWN + cleartrainerflag OPPONENT_BEN + cleartrainerflag OPPONENT_VIVIAN return DewfordTown_Gym_EventScript_1A023C:: @ 81A023C - cleartrainerflag 201 - cleartrainerflag 203 - cleartrainerflag 205 - cleartrainerflag 648 - cleartrainerflag 650 + cleartrainerflag OPPONENT_COLE + cleartrainerflag OPPONENT_AXLE + cleartrainerflag OPPONENT_ANDY + cleartrainerflag OPPONENT_ZANE + cleartrainerflag OPPONENT_SADIE return DewfordTown_Gym_EventScript_1A024C:: @ 81A024C - cleartrainerflag 71 - cleartrainerflag 72 - cleartrainerflag 73 - cleartrainerflag 74 - cleartrainerflag 89 - cleartrainerflag 90 - cleartrainerflag 91 + cleartrainerflag OPPONENT_RANDALL + cleartrainerflag OPPONENT_PARKER + cleartrainerflag OPPONENT_GEORGE + cleartrainerflag OPPONENT_BERKE + cleartrainerflag OPPONENT_MARY + cleartrainerflag OPPONENT_LORI + cleartrainerflag OPPONENT_JODY return DewfordTown_Gym_EventScript_1A0262:: @ 81A0262 - cleartrainerflag 401 - cleartrainerflag 654 - cleartrainerflag 655 - cleartrainerflag 404 + cleartrainerflag OPPONENT_JARED + cleartrainerflag OPPONENT_TERRELL + cleartrainerflag OPPONENT_KYLEE + cleartrainerflag OPPONENT_WILL return DewfordTown_Gym_EventScript_1A026F:: @ 81A026F - cleartrainerflag 233 - cleartrainerflag 234 - cleartrainerflag 235 - cleartrainerflag 244 - cleartrainerflag 245 - cleartrainerflag 246 + cleartrainerflag OPPONENT_PRESTON + cleartrainerflag OPPONENT_VIRGIL + cleartrainerflag OPPONENT_FRITZ + cleartrainerflag OPPONENT_HANNAH + cleartrainerflag OPPONENT_SAMANTHA + cleartrainerflag OPPONENT_MAURA return DewfordTown_Gym_EventScript_1A0282:: @ 81A0282 - cleartrainerflag 613 - cleartrainerflag 614 - cleartrainerflag 118 - cleartrainerflag 128 - cleartrainerflag 129 - cleartrainerflag 130 - cleartrainerflag 131 - cleartrainerflag 301 + cleartrainerflag OPPONENT_ANDREA + cleartrainerflag OPPONENT_CRISSY + cleartrainerflag OPPONENT_BRIANNA_2 + cleartrainerflag OPPONENT_CONNIE + cleartrainerflag OPPONENT_BRIDGET + cleartrainerflag OPPONENT_OLIVIA + cleartrainerflag OPPONENT_TIFFANY + cleartrainerflag OPPONENT_MARISSA return DewfordTown_Gym_EventScript_1A029B:: @ 81A029B diff --git a/data/scripts/gabby_and_ty.s b/data/scripts/gabby_and_ty.s index 343f35468..f008e892b 100644 --- a/data/scripts/gabby_and_ty.s +++ b/data/scripts/gabby_and_ty.s @@ -1,7 +1,7 @@ Route111_EventScript_1AE313:: @ 81AE313 Route118_EventScript_1AE313:: @ 81AE313 Route120_EventScript_1AE313:: @ 81AE313 - settrainerflag 56 + settrainerflag OPPONENT_GABBY_AND_TY_6 specialval RESULT, 172 switch RESULT case 0, Route111_EventScript_1AE384 @@ -124,61 +124,61 @@ Route111_EventScript_1AE41E:: @ 81AE41E return Route111_EventScript_1AE422:: @ 81AE422 - trainerbattle 6, 51, 0, Route111_Text_1ABED8, Route111_Text_1ABFD3, Route111_Text_1AC5CA, Route111_EventScript_1AE5A2 + trainerbattle 6, OPPONENT_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, 51, 0, Route111_Text_1AC73B, Route111_Text_1AC892, Route111_Text_1AC820, Route111_EventScript_1AE5A2 + trainerbattle 6, OPPONENT_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, 52, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F + trainerbattle 6, OPPONENT_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, 52, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F + trainerbattle 6, OPPONENT_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, 53, 0, Route120_Text_1ABF50, Route120_Text_1AC6F8, Route120_Text_1AC5CA, Route120_EventScript_1AE60F + trainerbattle 6, OPPONENT_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, 53, 0, Route120_Text_1AC790, Route120_Text_1AC8D7, Route120_Text_1AC820, Route120_EventScript_1AE60F + trainerbattle 6, OPPONENT_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, 54, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F + trainerbattle 6, OPPONENT_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, 54, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F + trainerbattle 6, OPPONENT_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, 55, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F + trainerbattle 6, OPPONENT_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, 55, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F + trainerbattle 6, OPPONENT_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, 56, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F + trainerbattle 6, OPPONENT_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, 56, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F + trainerbattle 6, OPPONENT_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/maps/AbandonedShip_Corridors_1F.s b/data/scripts/maps/AbandonedShip_Corridors_1F.s index 3cb3592ac..0c7278f3b 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_1F.s +++ b/data/scripts/maps/AbandonedShip_Corridors_1F.s @@ -6,6 +6,6 @@ AbandonedShip_Corridors_1F_EventScript_15E965:: @ 815E965 end AbandonedShip_Corridors_1F_EventScript_15E96E:: @ 815E96E - trainerbattle 0, 66, 0, AbandonedShip_Corridors_1F_Text_19843D, AbandonedShip_Corridors_1F_Text_198479 + trainerbattle 0, OPPONENT_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_19843D, AbandonedShip_Corridors_1F_Text_198479 msgbox AbandonedShip_Corridors_1F_Text_198493, 6 end diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.s b/data/scripts/maps/AbandonedShip_Corridors_B1F.s index 3f66cdbc4..e6b6a8f3d 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.s +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.s @@ -53,6 +53,6 @@ AbandonedShip_Corridors_B1F_EventScript_15EA14:: @ 815EA14 end AbandonedShip_Corridors_B1F_EventScript_15EA1E:: @ 815EA1E - trainerbattle 0, 496, 0, AbandonedShip_Corridors_B1F_Text_19856F, AbandonedShip_Corridors_B1F_Text_1985C5 + trainerbattle 0, OPPONENT_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_19856F, AbandonedShip_Corridors_B1F_Text_1985C5 msgbox AbandonedShip_Corridors_B1F_Text_1985D7, 6 end diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.s b/data/scripts/maps/AbandonedShip_Rooms2_1F.s index 1b2acf7ec..b2525d62e 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.s +++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.s @@ -2,7 +2,7 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67 .byte 0 AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 - trainerbattle 4, 642, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F + trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F specialval RESULT, 57 compare RESULT, 1 jumpeq AbandonedShip_Rooms2_1F_EventScript_15EA93 @@ -10,12 +10,12 @@ AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 end AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93 - trainerbattle 7, 642, 0, AbandonedShip_Rooms2_1F_Text_1989DF, AbandonedShip_Rooms2_1F_Text_198A53, AbandonedShip_Rooms2_1F_Text_198AEE + trainerbattle 7, OPPONENT_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, 642, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A + trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A specialval RESULT, 57 compare RESULT, 1 jumpeq AbandonedShip_Rooms2_1F_EventScript_15EAD9 @@ -23,6 +23,6 @@ AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE end AbandonedShip_Rooms2_1F_EventScript_15EAD9:: @ 815EAD9 - trainerbattle 7, 642, 0, AbandonedShip_Rooms2_1F_Text_198B3B, AbandonedShip_Rooms2_1F_Text_198BCF, AbandonedShip_Rooms2_1F_Text_198C40 + trainerbattle 7, OPPONENT_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/scripts/maps/DewfordTown_Gym.s b/data/scripts/maps/DewfordTown_Gym.s index e6b80462d..51d4f44ba 100644 --- a/data/scripts/maps/DewfordTown_Gym.s +++ b/data/scripts/maps/DewfordTown_Gym.s @@ -7,7 +7,7 @@ DewfordTown_Gym_MapScript1_15306B:: @ 815306B end DewfordTown_Gym_EventScript_153071:: @ 8153071 - checktrainerflag 266 + checktrainerflag OPPONENT_BRAWLY jumpeq DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 copyvar 0x8001, 0x8000 @@ -81,17 +81,17 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 DewfordTown_Gym_EventScript_153122:: @ 8153122 setvar 0x8000, 0 - checktrainerflag 179 + checktrainerflag OPPONENT_HIDEKI jumpif 0, DewfordTown_Gym_EventScript_153135 addvar 0x8000, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 - checktrainerflag 425 + checktrainerflag OPPONENT_TESSA jumpif 0, DewfordTown_Gym_EventScript_153143 addvar 0x8000, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 - checktrainerflag 426 + checktrainerflag OPPONENT_LAURA jumpif 0, DewfordTown_Gym_EventScript_153151 addvar 0x8000, 1 @@ -99,7 +99,7 @@ DewfordTown_Gym_EventScript_153151:: @ 8153151 return DewfordTown_Gym_EventScript_153152:: @ 8153152 - trainerbattle 1, 266, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 + trainerbattle 1, OPPONENT_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 checkflag 166 jumpif 0, DewfordTown_Gym_EventScript_1531B5 msgbox DewfordTown_Gym_Text_175412, 4 @@ -132,7 +132,7 @@ DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 end DewfordTown_Gym_EventScript_1531D9:: @ 81531D9 - trainerbattle 2, 179, 0, DewfordTown_Gym_Text_174F61, DewfordTown_Gym_Text_174F7A, DewfordTown_Gym_EventScript_1531F4 + trainerbattle 2, OPPONENT_HIDEKI, 0, DewfordTown_Gym_Text_174F61, DewfordTown_Gym_Text_174F7A, DewfordTown_Gym_EventScript_1531F4 msgbox DewfordTown_Gym_Text_174F8E, 6 end @@ -142,7 +142,7 @@ DewfordTown_Gym_EventScript_1531F4:: @ 81531F4 end DewfordTown_Gym_EventScript_1531FB:: @ 81531FB - trainerbattle 2, 425, 0, DewfordTown_Gym_Text_174FCE, DewfordTown_Gym_Text_175009, DewfordTown_Gym_EventScript_153216 + trainerbattle 2, OPPONENT_TESSA, 0, DewfordTown_Gym_Text_174FCE, DewfordTown_Gym_Text_175009, DewfordTown_Gym_EventScript_153216 msgbox DewfordTown_Gym_Text_175031, 6 end @@ -152,7 +152,7 @@ DewfordTown_Gym_EventScript_153216:: @ 8153216 end DewfordTown_Gym_EventScript_15321D:: @ 815321D - trainerbattle 2, 426, 0, DewfordTown_Gym_Text_1750C9, DewfordTown_Gym_Text_175104, DewfordTown_Gym_EventScript_153238 + trainerbattle 2, OPPONENT_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/scripts/maps/EverGrandeCity_ChampionsRoom.s b/data/scripts/maps/EverGrandeCity_ChampionsRoom.s index 92048597b..0e5dc21b0 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.s +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.s @@ -40,7 +40,7 @@ EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 playmusic 454, 0 msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4 - trainerbattle 3, 335, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 + trainerbattle 3, OPPONENT_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 jump EverGrandeCity_ChampionsRoom_EventScript_15B821 end diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.s b/data/scripts/maps/EverGrandeCity_DrakesRoom.s index fa301c508..c16bd544f 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.s +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.s @@ -45,7 +45,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 jumpeq EverGrandeCity_DrakesRoom_EventScript_15B78B playmusic 450, 0 msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 - trainerbattle 3, 264, 0, EverGrandeCity_DrakesRoom_Text_190E42 + trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 jump EverGrandeCity_DrakesRoom_EventScript_15B795 end diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.s b/data/scripts/maps/EverGrandeCity_GlaciasRoom.s index 6942aec23..039b2a772 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.s +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.s @@ -45,7 +45,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA jumpeq EverGrandeCity_GlaciasRoom_EventScript_15B6F1 playmusic 450, 0 msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 - trainerbattle 3, 263, 0, EverGrandeCity_GlaciasRoom_Text_190C01 + trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 jump EverGrandeCity_GlaciasRoom_EventScript_15B6FB end diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.s b/data/scripts/maps/EverGrandeCity_PhoebesRoom.s index 289065d72..7e8ee131a 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.s +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.s @@ -45,7 +45,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 jumpeq EverGrandeCity_PhoebesRoom_EventScript_15B657 playmusic 450, 0 msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 - trainerbattle 3, 262, 0, EverGrandeCity_PhoebesRoom_Text_190A0C + trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C jump EverGrandeCity_PhoebesRoom_EventScript_15B661 end diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.s b/data/scripts/maps/EverGrandeCity_SidneysRoom.s index e90317f01..84a6c3fdc 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.s +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.s @@ -46,7 +46,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 jumpeq EverGrandeCity_SidneysRoom_EventScript_15B5BD playmusic 450, 0 msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 - trainerbattle 3, 261, 0, EverGrandeCity_SidneysRoom_Text_190823 + trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 jump EverGrandeCity_SidneysRoom_EventScript_15B5C7 end diff --git a/data/scripts/maps/FortreeCity_Gym.s b/data/scripts/maps/FortreeCity_Gym.s index cb474d1a1..1bf6b0825 100644 --- a/data/scripts/maps/FortreeCity_Gym.s +++ b/data/scripts/maps/FortreeCity_Gym.s @@ -16,7 +16,7 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC end FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 - trainerbattle 1, 270, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 + trainerbattle 1, OPPONENT_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 checkflag 170 jumpif 0, FortreeCity_Gym_EventScript_157F3E msgbox FortreeCity_Gym_Text_185F98, 4 @@ -45,22 +45,22 @@ FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E end FortreeCity_Gym_EventScript_157F62:: @ 8157F62 - trainerbattle 0, 401, 0, FortreeCity_Gym_Text_1859B9, FortreeCity_Gym_Text_1859EA + trainerbattle 0, OPPONENT_JARED, 0, FortreeCity_Gym_Text_1859B9, FortreeCity_Gym_Text_1859EA msgbox FortreeCity_Gym_Text_185A02, 6 end FortreeCity_Gym_EventScript_157F79:: @ 8157F79 - trainerbattle 0, 404, 0, FortreeCity_Gym_Text_185A7F, FortreeCity_Gym_Text_185AEC + trainerbattle 0, OPPONENT_WILL, 0, FortreeCity_Gym_Text_185A7F, FortreeCity_Gym_Text_185AEC msgbox FortreeCity_Gym_Text_185B18, 6 end FortreeCity_Gym_EventScript_157F90:: @ 8157F90 - trainerbattle 0, 654, 0, FortreeCity_Gym_Text_185B8D, FortreeCity_Gym_Text_185BEB + trainerbattle 0, OPPONENT_TERRELL, 0, FortreeCity_Gym_Text_185B8D, FortreeCity_Gym_Text_185BEB msgbox FortreeCity_Gym_Text_185C00, 6 end FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7 - trainerbattle 0, 655, 0, FortreeCity_Gym_Text_185C45, FortreeCity_Gym_Text_185C7C + trainerbattle 0, OPPONENT_KYLEE, 0, FortreeCity_Gym_Text_185C45, FortreeCity_Gym_Text_185C7C msgbox FortreeCity_Gym_Text_185C8C, 6 end diff --git a/data/scripts/maps/JaggedPass.s b/data/scripts/maps/JaggedPass.s index 9d3191c3c..3ae0882c5 100644 --- a/data/scripts/maps/JaggedPass.s +++ b/data/scripts/maps/JaggedPass.s @@ -18,12 +18,12 @@ JaggedPass_EventScript_15D280:: @ 815D280 return JaggedPass_EventScript_15D285:: @ 815D285 - trainerbattle 0, 632, 0, JaggedPass_Text_195DAC, JaggedPass_Text_195E27 + trainerbattle 0, OPPONENT_ERIC, 0, JaggedPass_Text_195DAC, JaggedPass_Text_195E27 msgbox JaggedPass_Text_195E3E, 6 end JaggedPass_EventScript_15D29C:: @ 815D29C - trainerbattle 0, 474, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF + trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF specialval RESULT, 57 compare RESULT, 1 jumpeq JaggedPass_EventScript_15D2C3 @@ -31,12 +31,12 @@ JaggedPass_EventScript_15D29C:: @ 815D29C end JaggedPass_EventScript_15D2C3:: @ 815D2C3 - trainerbattle 5, 474, 0, JaggedPass_Text_195F58, JaggedPass_Text_195F8C + trainerbattle 5, OPPONENT_DIANA_1, 0, JaggedPass_Text_195F58, JaggedPass_Text_195F8C msgbox JaggedPass_Text_195FB9, 6 end JaggedPass_EventScript_15D2DA:: @ 815D2DA - trainerbattle 0, 216, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 + trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 specialval RESULT, 57 compare RESULT, 1 jumpeq JaggedPass_EventScript_15D301 @@ -44,6 +44,6 @@ JaggedPass_EventScript_15D2DA:: @ 815D2DA end JaggedPass_EventScript_15D301:: @ 815D301 - trainerbattle 5, 216, 0, JaggedPass_Text_1960AA, JaggedPass_Text_1960E2 + trainerbattle 5, OPPONENT_ETHAN_1, 0, JaggedPass_Text_1960AA, JaggedPass_Text_1960E2 msgbox JaggedPass_Text_196118, 6 end diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.s b/data/scripts/maps/LavaridgeTown_Gym_1F.s index c6cfc818c..57506bdb6 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.s +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.s @@ -13,27 +13,27 @@ LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F setvar 0x400d, 0 setvar 0x400e, 0 setvar 0x400f, 0 - checktrainerflag 201 + checktrainerflag OPPONENT_COLE jumpeq LavaridgeTown_Gym_1F_EventScript_1536C6 setvar 0x400b, 1 LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6 - checktrainerflag 648 + checktrainerflag OPPONENT_ZANE jumpeq LavaridgeTown_Gym_1F_EventScript_1536D4 setvar 0x400c, 1 LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4 - checktrainerflag 203 + checktrainerflag OPPONENT_AXLE jumpeq LavaridgeTown_Gym_1F_EventScript_1536E2 setvar 0x400d, 1 LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2 - checktrainerflag 650 + checktrainerflag OPPONENT_SADIE jumpeq LavaridgeTown_Gym_1F_EventScript_1536F0 setvar 0x400e, 1 LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0 - checktrainerflag 205 + checktrainerflag OPPONENT_ANDY jumpeq LavaridgeTown_Gym_1F_EventScript_1536FE setvar 0x400f, 1 @@ -41,27 +41,27 @@ LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE return LavaridgeTown_Gym_1F_EventScript_1536FF:: @ 81536FF - checktrainerflag 201 + checktrainerflag OPPONENT_COLE jumpeq LavaridgeTown_Gym_1F_EventScript_15370C spritebehave 2, 63 LavaridgeTown_Gym_1F_EventScript_15370C:: @ 815370C - checktrainerflag 648 + checktrainerflag OPPONENT_ZANE jumpeq LavaridgeTown_Gym_1F_EventScript_153719 spritebehave 3, 63 LavaridgeTown_Gym_1F_EventScript_153719:: @ 8153719 - checktrainerflag 203 + checktrainerflag OPPONENT_AXLE jumpeq LavaridgeTown_Gym_1F_EventScript_153726 spritebehave 4, 63 LavaridgeTown_Gym_1F_EventScript_153726:: @ 8153726 - checktrainerflag 650 + checktrainerflag OPPONENT_SADIE jumpeq LavaridgeTown_Gym_1F_EventScript_153733 spritebehave 5, 63 LavaridgeTown_Gym_1F_EventScript_153733:: @ 8153733 - checktrainerflag 205 + checktrainerflag OPPONENT_ANDY jumpeq LavaridgeTown_Gym_1F_EventScript_153740 spritebehave 7, 63 @@ -69,7 +69,7 @@ LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 return LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 - trainerbattle 1, 268, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 + trainerbattle 1, OPPONENT_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 checkflag 168 jumpif 0, LavaridgeTown_Gym_1F_EventScript_1537A7 msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4 @@ -103,7 +103,7 @@ LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 end LavaridgeTown_Gym_1F_EventScript_1537CB:: @ 81537CB - trainerbattle 2, 201, 2, LavaridgeTown_Gym_1F_Text_176432, LavaridgeTown_Gym_1F_Text_17644F, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, OPPONENT_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 @@ -113,22 +113,22 @@ LavaridgeTown_Gym_1F_EventScript_1537E6:: @ 81537E6 end LavaridgeTown_Gym_1F_EventScript_1537ED:: @ 81537ED - trainerbattle 2, 203, 4, LavaridgeTown_Gym_1F_Text_1764D1, LavaridgeTown_Gym_1F_Text_176516, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, OPPONENT_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, 205, 7, LavaridgeTown_Gym_1F_Text_17658D, LavaridgeTown_Gym_1F_Text_17663F, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, OPPONENT_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, 650, 5, LavaridgeTown_Gym_1F_Text_176784, LavaridgeTown_Gym_1F_Text_1767A6, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, OPPONENT_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, 648, 3, LavaridgeTown_Gym_1F_Text_1766D2, LavaridgeTown_Gym_1F_Text_1766FE, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, OPPONENT_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/scripts/maps/LilycoveCity.s b/data/scripts/maps/LilycoveCity.s index da5fdeba6..ae36e33b5 100644 --- a/data/scripts/maps/LilycoveCity.s +++ b/data/scripts/maps/LilycoveCity.s @@ -317,32 +317,32 @@ LilycoveCity_EventScript_14CE35:: @ 814CE35 end LilycoveCity_EventScript_14CE46:: @ 814CE46 - trainerbattle 3, 665, 0, LilycoveCity_Text_167BD5 + trainerbattle 3, OPPONENT_MAY_11, 0, LilycoveCity_Text_167BD5 jump LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE56:: @ 814CE56 - trainerbattle 3, 666, 0, LilycoveCity_Text_167BD5 + trainerbattle 3, OPPONENT_MAY_12, 0, LilycoveCity_Text_167BD5 jump LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE66:: @ 814CE66 - trainerbattle 3, 664, 0, LilycoveCity_Text_167BD5 + trainerbattle 3, OPPONENT_MAY_10, 0, LilycoveCity_Text_167BD5 jump LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE76:: @ 814CE76 - trainerbattle 3, 662, 0, LilycoveCity_Text_1680E4 + trainerbattle 3, OPPONENT_BRENDAN_11, 0, LilycoveCity_Text_1680E4 jump LilycoveCity_EventScript_14CF12 end LilycoveCity_EventScript_14CE86:: @ 814CE86 - trainerbattle 3, 663, 0, LilycoveCity_Text_1680E4 + trainerbattle 3, OPPONENT_BRENDAN_12, 0, LilycoveCity_Text_1680E4 jump LilycoveCity_EventScript_14CF12 end LilycoveCity_EventScript_14CE96:: @ 814CE96 - trainerbattle 3, 661, 0, LilycoveCity_Text_1680E4 + trainerbattle 3, OPPONENT_BRENDAN_10, 0, LilycoveCity_Text_1680E4 jump LilycoveCity_EventScript_14CF12 end diff --git a/data/scripts/maps/MauvilleCity.s b/data/scripts/maps/MauvilleCity.s index 0db1a2ab4..1b2827f2a 100644 --- a/data/scripts/maps/MauvilleCity.s +++ b/data/scripts/maps/MauvilleCity.s @@ -164,7 +164,7 @@ MauvilleCity_EventScript_14C22B:: @ 814C22B MauvilleCity_EventScript_14C23C:: @ 814C23C msgbox MauvilleCity_Text_165F0D, 4 - trainerbattle 3, 656, 0, MauvilleCity_Text_165F38 + trainerbattle 3, OPPONENT_WALLY_2, 0, MauvilleCity_Text_165F38 move 6, MauvilleCity_Movement_1A0843 waitmove 0 msgbox MauvilleCity_Text_165F85, 4 diff --git a/data/scripts/maps/MauvilleCity_Gym.s b/data/scripts/maps/MauvilleCity_Gym.s index 30bd20ada..9abac00d7 100644 --- a/data/scripts/maps/MauvilleCity_Gym.s +++ b/data/scripts/maps/MauvilleCity_Gym.s @@ -68,7 +68,7 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 end MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB - trainerbattle 1, 267, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB + trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB checkflag 167 jumpif 0, MauvilleCity_Gym_EventScript_15661D compare 0x40ba, 2 @@ -169,22 +169,22 @@ MauvilleCity_Gym_EventScript_1566E1:: @ 81566E1 end MauvilleCity_Gym_EventScript_1566E6:: @ 81566E6 - trainerbattle 0, 191, 0, MauvilleCity_Gym_Text_180956, MauvilleCity_Gym_Text_180997 + trainerbattle 0, OPPONENT_KIRK, 0, MauvilleCity_Gym_Text_180956, MauvilleCity_Gym_Text_180997 msgbox MauvilleCity_Gym_Text_1809D1, 6 end MauvilleCity_Gym_EventScript_1566FD:: @ 81566FD - trainerbattle 0, 194, 0, MauvilleCity_Gym_Text_180A05, MauvilleCity_Gym_Text_180A42 + trainerbattle 0, OPPONENT_SHAWN, 0, MauvilleCity_Gym_Text_180A05, MauvilleCity_Gym_Text_180A42 msgbox MauvilleCity_Gym_Text_180A5E, 6 end MauvilleCity_Gym_EventScript_156714:: @ 8156714 - trainerbattle 0, 323, 0, MauvilleCity_Gym_Text_180AE0, MauvilleCity_Gym_Text_180B06 + trainerbattle 0, OPPONENT_BEN, 0, MauvilleCity_Gym_Text_180AE0, MauvilleCity_Gym_Text_180B06 msgbox MauvilleCity_Gym_Text_180B1D, 6 end MauvilleCity_Gym_EventScript_15672B:: @ 815672B - trainerbattle 0, 649, 0, MauvilleCity_Gym_Text_180B5A, MauvilleCity_Gym_Text_180B93 + trainerbattle 0, OPPONENT_VIVIAN, 0, MauvilleCity_Gym_Text_180B5A, MauvilleCity_Gym_Text_180B93 msgbox MauvilleCity_Gym_Text_180BAE, 6 end diff --git a/data/scripts/maps/MeteorFalls_1F_2R.s b/data/scripts/maps/MeteorFalls_1F_2R.s index 14dcc4622..6c239043d 100644 --- a/data/scripts/maps/MeteorFalls_1F_2R.s +++ b/data/scripts/maps/MeteorFalls_1F_2R.s @@ -2,7 +2,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 815C678 .byte 0 MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 - trainerbattle 0, 392, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 + trainerbattle 0, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 specialval RESULT, 57 compare RESULT, 1 jumpeq MeteorFalls_1F_2R_EventScript_15C6A0 @@ -10,12 +10,12 @@ MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 end MeteorFalls_1F_2R_EventScript_15C6A0:: @ 815C6A0 - trainerbattle 5, 392, 0, MeteorFalls_1F_2R_Text_193AB3, MeteorFalls_1F_2R_Text_193B21 + trainerbattle 5, OPPONENT_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, 681, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F + trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F specialval RESULT, 57 compare RESULT, 1 jumpeq MeteorFalls_1F_2R_EventScript_15C6E2 @@ -23,12 +23,12 @@ MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 end MeteorFalls_1F_2R_EventScript_15C6E2:: @ 815C6E2 - trainerbattle 7, 681, 0, MeteorFalls_1F_2R_Text_193E75, MeteorFalls_1F_2R_Text_193ECE, MeteorFalls_1F_2R_Text_193F59 + trainerbattle 7, OPPONENT_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, 681, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB + trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB specialval RESULT, 57 compare RESULT, 1 jumpeq MeteorFalls_1F_2R_EventScript_15C728 @@ -36,6 +36,6 @@ MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD end MeteorFalls_1F_2R_EventScript_15C728:: @ 815C728 - trainerbattle 7, 681, 0, MeteorFalls_1F_2R_Text_193FCA, MeteorFalls_1F_2R_Text_19403A, MeteorFalls_1F_2R_Text_1940DF + trainerbattle 7, OPPONENT_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/scripts/maps/MossdeepCity_Gym.s b/data/scripts/maps/MossdeepCity_Gym.s index db6af9689..192f9e396 100644 --- a/data/scripts/maps/MossdeepCity_Gym.s +++ b/data/scripts/maps/MossdeepCity_Gym.s @@ -49,7 +49,7 @@ MossdeepCity_Gym_EventScript_15A558:: @ 815A558 end MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B - trainerbattle 8, 271, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 + trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 checkflag 171 jumpif 0, MossdeepCity_Gym_EventScript_15A5C6 msgbox MossdeepCity_Gym_Text_18D273, 4 @@ -178,32 +178,32 @@ MossdeepCity_Gym_EventScript_15A742:: @ 815A742 end MossdeepCity_Gym_EventScript_15A74E:: @ 815A74E - trainerbattle 0, 233, 0, MossdeepCity_Gym_Text_18C96A, MossdeepCity_Gym_Text_18C9BA + trainerbattle 0, OPPONENT_PRESTON, 0, MossdeepCity_Gym_Text_18C96A, MossdeepCity_Gym_Text_18C9BA msgbox MossdeepCity_Gym_Text_18C9E1, 6 end MossdeepCity_Gym_EventScript_15A765:: @ 815A765 - trainerbattle 0, 234, 0, MossdeepCity_Gym_Text_18CA10, MossdeepCity_Gym_Text_18CA28 + trainerbattle 0, OPPONENT_VIRGIL, 0, MossdeepCity_Gym_Text_18CA10, MossdeepCity_Gym_Text_18CA28 msgbox MossdeepCity_Gym_Text_18CA48, 6 end MossdeepCity_Gym_EventScript_15A77C:: @ 815A77C - trainerbattle 0, 235, 0, MossdeepCity_Gym_Text_18CAC0, MossdeepCity_Gym_Text_18CB46 + trainerbattle 0, OPPONENT_FRITZ, 0, MossdeepCity_Gym_Text_18CAC0, MossdeepCity_Gym_Text_18CB46 msgbox MossdeepCity_Gym_Text_18CB77, 6 end MossdeepCity_Gym_EventScript_15A793:: @ 815A793 - trainerbattle 0, 244, 0, MossdeepCity_Gym_Text_18CC1E, MossdeepCity_Gym_Text_18CC83 + trainerbattle 0, OPPONENT_HANNAH, 0, MossdeepCity_Gym_Text_18CC1E, MossdeepCity_Gym_Text_18CC83 msgbox MossdeepCity_Gym_Text_18CC9B, 6 end MossdeepCity_Gym_EventScript_15A7AA:: @ 815A7AA - trainerbattle 0, 245, 0, MossdeepCity_Gym_Text_18CD14, MossdeepCity_Gym_Text_18CD66 + trainerbattle 0, OPPONENT_SAMANTHA, 0, MossdeepCity_Gym_Text_18CD14, MossdeepCity_Gym_Text_18CD66 msgbox MossdeepCity_Gym_Text_18CD73, 6 end MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1 - trainerbattle 0, 246, 0, MossdeepCity_Gym_Text_18CDE0, MossdeepCity_Gym_Text_18CE47 + trainerbattle 0, OPPONENT_MAURA, 0, MossdeepCity_Gym_Text_18CDE0, MossdeepCity_Gym_Text_18CE47 msgbox MossdeepCity_Gym_Text_18CE6C, 6 end diff --git a/data/scripts/maps/MtChimney.s b/data/scripts/maps/MtChimney.s index 01065d315..b7a43328b 100644 --- a/data/scripts/maps/MtChimney.s +++ b/data/scripts/maps/MtChimney.s @@ -439,7 +439,7 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA end MtChimney_EventScript_15D1E3:: @ 815D1E3 - trainerbattle 0, 313, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 + trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 specialval RESULT, 57 compare RESULT, 1 jumpeq MtChimney_EventScript_15D20A @@ -447,21 +447,21 @@ MtChimney_EventScript_15D1E3:: @ 815D1E3 end MtChimney_EventScript_15D20A:: @ 815D20A - trainerbattle 5, 313, 0, MtChimney_Text_195A45, MtChimney_Text_195AAD + trainerbattle 5, OPPONENT_SHELBY_1, 0, MtChimney_Text_195A45, MtChimney_Text_195AAD msgbox MtChimney_Text_195AD9, 6 end MtChimney_EventScript_15D221:: @ 815D221 - trainerbattle 0, 124, 0, MtChimney_Text_195B1C, MtChimney_Text_195B5F + trainerbattle 0, OPPONENT_MELISSA, 0, MtChimney_Text_195B1C, MtChimney_Text_195B5F msgbox MtChimney_Text_195B84, 6 end MtChimney_EventScript_15D238:: @ 815D238 - trainerbattle 0, 125, 0, MtChimney_Text_195BB2, MtChimney_Text_195BF9 + trainerbattle 0, OPPONENT_SHEILA, 0, MtChimney_Text_195BB2, MtChimney_Text_195BF9 msgbox MtChimney_Text_195C31, 6 end MtChimney_EventScript_15D24F:: @ 815D24F - trainerbattle 0, 126, 0, MtChimney_Text_195CD8, MtChimney_Text_195D2F + trainerbattle 0, OPPONENT_SHIRLEY, 0, MtChimney_Text_195CD8, MtChimney_Text_195D2F msgbox MtChimney_Text_195D5C, 6 end diff --git a/data/scripts/maps/MtPyre_2F.s b/data/scripts/maps/MtPyre_2F.s index 8cfff795b..c44251af7 100644 --- a/data/scripts/maps/MtPyre_2F.s +++ b/data/scripts/maps/MtPyre_2F.s @@ -18,16 +18,16 @@ MtPyre_2F_EventScript_15D392:: @ 815D392 end MtPyre_2F_EventScript_15D39B:: @ 815D39B - trainerbattle 0, 145, 0, MtPyre_2F_Text_196674, MtPyre_2F_Text_1966BE + trainerbattle 0, OPPONENT_MARK, 0, MtPyre_2F_Text_196674, MtPyre_2F_Text_1966BE msgbox MtPyre_2F_Text_1966E7, 6 end MtPyre_2F_EventScript_15D3B2:: @ 815D3B2 - trainerbattle 4, 640, 0, MtPyre_2F_Text_1962C6, MtPyre_2F_Text_196358, MtPyre_2F_Text_1963CB + trainerbattle 4, OPPONENT_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, 640, 0, MtPyre_2F_Text_196449, MtPyre_2F_Text_1964EB, MtPyre_2F_Text_196539 + trainerbattle 4, OPPONENT_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/scripts/maps/MtPyre_3F.s b/data/scripts/maps/MtPyre_3F.s index 0f6f5c2ae..ea8bda7b5 100644 --- a/data/scripts/maps/MtPyre_3F.s +++ b/data/scripts/maps/MtPyre_3F.s @@ -2,11 +2,11 @@ MtPyre_3F_MapScripts:: @ 815D3E8 .byte 0 MtPyre_3F_EventScript_15D3E9:: @ 815D3E9 - trainerbattle 0, 236, 0, MtPyre_3F_Text_19672B, MtPyre_3F_Text_19679D + trainerbattle 0, OPPONENT_WILLIAM, 0, MtPyre_3F_Text_19672B, MtPyre_3F_Text_19679D msgbox MtPyre_3F_Text_1967B5, 6 end MtPyre_3F_EventScript_15D400:: @ 815D400 - trainerbattle 0, 247, 0, MtPyre_3F_Text_1967EF, MtPyre_3F_Text_19682B + trainerbattle 0, OPPONENT_KAYLA, 0, MtPyre_3F_Text_1967EF, MtPyre_3F_Text_19682B msgbox MtPyre_3F_Text_196842, 6 end diff --git a/data/scripts/maps/MtPyre_4F.s b/data/scripts/maps/MtPyre_4F.s index c8e961384..e1ebac7c1 100644 --- a/data/scripts/maps/MtPyre_4F.s +++ b/data/scripts/maps/MtPyre_4F.s @@ -2,6 +2,6 @@ MtPyre_4F_MapScripts:: @ 815D417 .byte 0 MtPyre_4F_EventScript_15D418:: @ 815D418 - trainerbattle 0, 190, 0, MtPyre_4F_Text_1968A6, MtPyre_4F_Text_1968D0 + trainerbattle 0, OPPONENT_ATSUSHI, 0, MtPyre_4F_Text_1968A6, MtPyre_4F_Text_1968D0 msgbox MtPyre_4F_Text_1968EE, 6 end diff --git a/data/scripts/maps/MtPyre_5F.s b/data/scripts/maps/MtPyre_5F.s index cd25d09b3..9adb249f0 100644 --- a/data/scripts/maps/MtPyre_5F.s +++ b/data/scripts/maps/MtPyre_5F.s @@ -2,6 +2,6 @@ MtPyre_5F_MapScripts:: @ 815D42F .byte 0 MtPyre_5F_EventScript_15D430:: @ 815D430 - trainerbattle 0, 109, 0, MtPyre_5F_Text_196939, MtPyre_5F_Text_196997 + trainerbattle 0, OPPONENT_TASHA, 0, MtPyre_5F_Text_196939, MtPyre_5F_Text_196997 msgbox MtPyre_5F_Text_1969AC, 6 end diff --git a/data/scripts/maps/MtPyre_6F.s b/data/scripts/maps/MtPyre_6F.s index 2212d5dd3..3729079bb 100644 --- a/data/scripts/maps/MtPyre_6F.s +++ b/data/scripts/maps/MtPyre_6F.s @@ -2,7 +2,7 @@ MtPyre_6F_MapScripts:: @ 815D447 .byte 0 MtPyre_6F_EventScript_15D448:: @ 815D448 - trainerbattle 0, 108, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 + trainerbattle 0, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 specialval RESULT, 57 compare RESULT, 1 jumpeq MtPyre_6F_EventScript_15D46F @@ -10,6 +10,6 @@ MtPyre_6F_EventScript_15D448:: @ 815D448 end MtPyre_6F_EventScript_15D46F:: @ 815D46F - trainerbattle 5, 108, 0, MtPyre_6F_Text_196A95, MtPyre_6F_Text_196AB1 + trainerbattle 5, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_196A95, MtPyre_6F_Text_196AB1 msgbox MtPyre_6F_Text_196AC9, 6 end diff --git a/data/scripts/maps/PetalburgCity_Gym.s b/data/scripts/maps/PetalburgCity_Gym.s index 13577ef04..9c6802e28 100644 --- a/data/scripts/maps/PetalburgCity_Gym.s +++ b/data/scripts/maps/PetalburgCity_Gym.s @@ -15,19 +15,19 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 setvar 0x8005, 1 call PetalburgCity_Gym_EventScript_154F9A - checktrainerflag 71 + checktrainerflag OPPONENT_RANDALL callif 1, PetalburgCity_Gym_EventScript_154FBB - checktrainerflag 89 + checktrainerflag OPPONENT_MARY callif 1, PetalburgCity_Gym_EventScript_154FDC - checktrainerflag 72 + checktrainerflag OPPONENT_PARKER callif 1, PetalburgCity_Gym_EventScript_154FFD - checktrainerflag 90 + checktrainerflag OPPONENT_LORI callif 1, PetalburgCity_Gym_EventScript_15501E - checktrainerflag 73 + checktrainerflag OPPONENT_GEORGE callif 1, PetalburgCity_Gym_EventScript_15503F - checktrainerflag 91 + checktrainerflag OPPONENT_JODY callif 1, PetalburgCity_Gym_EventScript_155060 - checktrainerflag 74 + checktrainerflag OPPONENT_BERKE callif 1, PetalburgCity_Gym_EventScript_155081 end @@ -392,7 +392,7 @@ PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 msgbox PetalburgCity_Gym_Text_17A653, 4 - trainerbattle 3, 269, 0, PetalburgCity_Gym_Text_17A77A + trainerbattle 3, OPPONENT_NORMAN, 0, PetalburgCity_Gym_Text_17A77A message PetalburgCity_Gym_Text_17A7DD waittext call PetalburgCity_Gym_EventScript_1A02C5 @@ -635,7 +635,7 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall - checktrainerflag 71 + checktrainerflag OPPONENT_RANDALL jumpif 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 46 @@ -648,7 +648,7 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall - checktrainerflag 71 + checktrainerflag OPPONENT_RANDALL jumpif 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 59 @@ -661,7 +661,7 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall - checktrainerflag 89 + checktrainerflag OPPONENT_MARY jumpif 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 59 @@ -674,7 +674,7 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall - checktrainerflag 89 + checktrainerflag OPPONENT_MARY jumpif 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 72 @@ -687,7 +687,7 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall - checktrainerflag 72 + checktrainerflag OPPONENT_PARKER jumpif 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 20 @@ -700,7 +700,7 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall - checktrainerflag 90 + checktrainerflag OPPONENT_LORI jumpif 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 20 @@ -713,7 +713,7 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall - checktrainerflag 90 + checktrainerflag OPPONENT_LORI jumpif 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 33 @@ -726,7 +726,7 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall - checktrainerflag 73 + checktrainerflag OPPONENT_GEORGE jumpif 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 33 @@ -739,7 +739,7 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall - checktrainerflag 91 + checktrainerflag OPPONENT_JODY jumpif 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 7 @@ -752,7 +752,7 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall - checktrainerflag 74 + checktrainerflag OPPONENT_BERKE jumpif 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 7 @@ -764,7 +764,7 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 end PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 - trainerbattle 2, 71, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A + trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A checkflag 1217 jumpeq PetalburgCity_Gym_EventScript_154E29 msgbox PetalburgCity_Gym_Text_17AE30, 6 @@ -782,7 +782,7 @@ PetalburgCity_Gym_EventScript_154E29:: @ 8154E29 end PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 - trainerbattle 2, 72, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 + trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 checkflag 1217 jumpeq PetalburgCity_Gym_EventScript_154E65 msgbox PetalburgCity_Gym_Text_17AFD3, 6 @@ -800,7 +800,7 @@ PetalburgCity_Gym_EventScript_154E65:: @ 8154E65 end PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E - trainerbattle 2, 73, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 + trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 checkflag 1217 jumpeq PetalburgCity_Gym_EventScript_154EA1 msgbox PetalburgCity_Gym_Text_17B12C, 6 @@ -818,7 +818,7 @@ PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1 end PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA - trainerbattle 2, 74, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE + trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE checkflag 1217 jumpeq PetalburgCity_Gym_EventScript_154EDD msgbox PetalburgCity_Gym_Text_17B2E4, 6 @@ -836,7 +836,7 @@ PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD end PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 - trainerbattle 2, 89, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A + trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A checkflag 1217 jumpeq PetalburgCity_Gym_EventScript_154F19 msgbox PetalburgCity_Gym_Text_17B46F, 6 @@ -854,7 +854,7 @@ PetalburgCity_Gym_EventScript_154F19:: @ 8154F19 end PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 - trainerbattle 2, 90, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 + trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 checkflag 1217 jumpeq PetalburgCity_Gym_EventScript_154F55 msgbox PetalburgCity_Gym_Text_17B5EA, 6 @@ -872,7 +872,7 @@ PetalburgCity_Gym_EventScript_154F55:: @ 8154F55 end PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E - trainerbattle 2, 91, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 + trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 checkflag 1217 jumpeq PetalburgCity_Gym_EventScript_154F91 msgbox PetalburgCity_Gym_Text_17B749, 6 diff --git a/data/scripts/maps/PetalburgWoods.s b/data/scripts/maps/PetalburgWoods.s index 82b84af10..8d6946bcd 100644 --- a/data/scripts/maps/PetalburgWoods.s +++ b/data/scripts/maps/PetalburgWoods.s @@ -265,12 +265,12 @@ PetalburgWoods_EventScript_15CF1E:: @ 815CF1E end PetalburgWoods_EventScript_15CF27:: @ 815CF27 - trainerbattle 0, 616, 0, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202 + trainerbattle 0, OPPONENT_LYLE, 0, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202 msgbox PetalburgWoods_Text_195232, 6 end PetalburgWoods_EventScript_15CF3E:: @ 815CF3E - trainerbattle 0, 621, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE + trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE specialval RESULT, 57 compare RESULT, 1 jumpeq PetalburgWoods_EventScript_15CF65 @@ -278,6 +278,6 @@ PetalburgWoods_EventScript_15CF3E:: @ 815CF3E end PetalburgWoods_EventScript_15CF65:: @ 815CF65 - trainerbattle 5, 621, 0, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338 + trainerbattle 5, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338 msgbox PetalburgWoods_Text_195356, 6 end diff --git a/data/scripts/maps/Route102.s b/data/scripts/maps/Route102.s index e82ff15c4..70d25eace 100644 --- a/data/scripts/maps/Route102.s +++ b/data/scripts/maps/Route102.s @@ -18,7 +18,7 @@ Route102_EventScript_14EAF5:: @ 814EAF5 end Route102_EventScript_14EAFE:: @ 814EAFE - trainerbattle 0, 318, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C + trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C specialval RESULT, 57 compare RESULT, 1 jumpeq Route102_EventScript_14EB25 @@ -26,21 +26,21 @@ Route102_EventScript_14EAFE:: @ 814EAFE end Route102_EventScript_14EB25:: @ 814EB25 - trainerbattle 5, 318, 0, Route102_Text_1B7A9F, Route102_Text_1B7AFD + trainerbattle 5, OPPONENT_CALVIN_1, 0, Route102_Text_1B7A9F, Route102_Text_1B7AFD msgbox Route102_Text_1B7B2F, 6 end Route102_EventScript_14EB3C:: @ 814EB3C - trainerbattle 0, 615, 0, Route102_Text_1B7C05, Route102_Text_1B7C40 + trainerbattle 0, OPPONENT_RICK, 0, Route102_Text_1B7C05, Route102_Text_1B7C40 msgbox Route102_Text_1B7C52, 6 end Route102_EventScript_14EB53:: @ 814EB53 - trainerbattle 0, 603, 0, Route102_Text_1B7C97, Route102_Text_1B7CEC + trainerbattle 0, OPPONENT_TIANA, 0, Route102_Text_1B7C97, Route102_Text_1B7CEC msgbox Route102_Text_1B7D11, 6 end Route102_EventScript_14EB6A:: @ 814EB6A - trainerbattle 0, 333, 0, Route102_Text_1B7B68, Route102_Text_1B7B9D + trainerbattle 0, OPPONENT_ALLEN, 0, Route102_Text_1B7B68, Route102_Text_1B7B9D msgbox Route102_Text_1B7BD0, 6 end diff --git a/data/scripts/maps/Route103.s b/data/scripts/maps/Route103.s index ec2f9e067..f47f5a824 100644 --- a/data/scripts/maps/Route103.s +++ b/data/scripts/maps/Route103.s @@ -49,32 +49,32 @@ Route103_EventScript_14EC04:: @ 814EC04 end Route103_EventScript_14EC5D:: @ 814EC5D - trainerbattle 3, 532, 0, Route103_Text_16D65B + trainerbattle 3, OPPONENT_MAY_4, 0, Route103_Text_16D65B jump Route103_EventScript_14ECBD end Route103_EventScript_14EC6D:: @ 814EC6D - trainerbattle 3, 535, 0, Route103_Text_16D65B + trainerbattle 3, OPPONENT_MAY_7, 0, Route103_Text_16D65B jump Route103_EventScript_14ECBD end Route103_EventScript_14EC7D:: @ 814EC7D - trainerbattle 3, 529, 0, Route103_Text_16D65B + trainerbattle 3, OPPONENT_MAY_1, 0, Route103_Text_16D65B jump Route103_EventScript_14ECBD end Route103_EventScript_14EC8D:: @ 814EC8D - trainerbattle 3, 523, 0, Route103_Text_16D836 + trainerbattle 3, OPPONENT_BRENDAN_4, 0, Route103_Text_16D836 jump Route103_EventScript_14ECCB end Route103_EventScript_14EC9D:: @ 814EC9D - trainerbattle 3, 526, 0, Route103_Text_16D836 + trainerbattle 3, OPPONENT_BRENDAN_7, 0, Route103_Text_16D836 jump Route103_EventScript_14ECCB end Route103_EventScript_14ECAD:: @ 814ECAD - trainerbattle 3, 520, 0, Route103_Text_16D836 + trainerbattle 3, OPPONENT_BRENDAN_1, 0, Route103_Text_16D836 jump Route103_EventScript_14ECCB end @@ -167,12 +167,12 @@ Route103_EventScript_14ED8B:: @ 814ED8B end Route103_EventScript_14ED94:: @ 814ED94 - trainerbattle 0, 36, 0, Route103_Text_1B7D55, Route103_Text_1B7D8B + trainerbattle 0, OPPONENT_DAISY, 0, Route103_Text_1B7D55, Route103_Text_1B7D8B msgbox Route103_Text_1B7DB2, 6 end Route103_EventScript_14EDAB:: @ 814EDAB - trainerbattle 4, 481, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC + trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC specialval RESULT, 57 compare RESULT, 1 jumpeq Route103_EventScript_14EDD6 @@ -180,12 +180,12 @@ Route103_EventScript_14EDAB:: @ 814EDAB end Route103_EventScript_14EDD6:: @ 814EDD6 - trainerbattle 7, 481, 0, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF + trainerbattle 7, OPPONENT_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, 481, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E + trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E specialval RESULT, 57 compare RESULT, 1 jumpeq Route103_EventScript_14EE1C @@ -193,17 +193,17 @@ Route103_EventScript_14EDF1:: @ 814EDF1 end Route103_EventScript_14EE1C:: @ 814EE1C - trainerbattle 7, 481, 0, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1 + trainerbattle 7, OPPONENT_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, 336, 0, Route103_Text_1B81FA, Route103_Text_1B8258 + trainerbattle 0, OPPONENT_ANDREW, 0, Route103_Text_1B81FA, Route103_Text_1B8258 msgbox Route103_Text_1B8281, 6 end Route103_EventScript_14EE4E:: @ 814EE4E - trainerbattle 0, 293, 0, Route103_Text_1B82A9, Route103_Text_1B82EC + trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC specialval RESULT, 57 compare RESULT, 1 jumpeq Route103_EventScript_14EE75 @@ -211,6 +211,6 @@ Route103_EventScript_14EE4E:: @ 814EE4E end Route103_EventScript_14EE75:: @ 814EE75 - trainerbattle 5, 293, 0, Route103_Text_1B8349, Route103_Text_1B838C + trainerbattle 5, OPPONENT_MIGUEL_1, 0, Route103_Text_1B8349, Route103_Text_1B838C msgbox Route103_Text_1B83A4, 6 end diff --git a/data/scripts/maps/Route104.s b/data/scripts/maps/Route104.s index 45a8062c8..bb98b023d 100644 --- a/data/scripts/maps/Route104.s +++ b/data/scripts/maps/Route104.s @@ -398,17 +398,17 @@ Route104_Movement_14F16F:: @ 814F16F step_end Route104_EventScript_14F172:: @ 814F172 - trainerbattle 0, 337, 0, Route104_Text_1B85EB, Route104_Text_1B8637 + trainerbattle 0, OPPONENT_IVAN, 0, Route104_Text_1B85EB, Route104_Text_1B8637 msgbox Route104_Text_1B8680, 6 end Route104_EventScript_14F189:: @ 814F189 - trainerbattle 0, 319, 0, Route104_Text_1B86BE, Route104_Text_1B86E8 + trainerbattle 0, OPPONENT_BILLY, 0, Route104_Text_1B86BE, Route104_Text_1B86E8 msgbox Route104_Text_1B871C, 6 end Route104_EventScript_14F1A0:: @ 814F1A0 - trainerbattle 0, 604, 0, Route104_Text_1B8770, Route104_Text_1B87A7 + trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 specialval RESULT, 57 compare RESULT, 1 jumpeq Route104_EventScript_14F1C7 @@ -416,12 +416,12 @@ Route104_EventScript_14F1A0:: @ 814F1A0 end Route104_EventScript_14F1C7:: @ 814F1C7 - trainerbattle 5, 604, 0, Route104_Text_1B8839, Route104_Text_1B8852 + trainerbattle 5, OPPONENT_HALEY_1, 0, Route104_Text_1B8839, Route104_Text_1B8852 msgbox Route104_Text_1B8872, 6 end Route104_EventScript_14F1DE:: @ 814F1DE - trainerbattle 0, 136, 0, Route104_Text_1B88D4, Route104_Text_1B8911 + trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 specialval RESULT, 57 compare RESULT, 1 jumpeq Route104_EventScript_14F205 @@ -429,12 +429,12 @@ Route104_EventScript_14F1DE:: @ 814F1DE end Route104_EventScript_14F205:: @ 814F205 - trainerbattle 5, 136, 0, Route104_Text_1B895E, Route104_Text_1B899E + trainerbattle 5, OPPONENT_WINSTON_1, 0, Route104_Text_1B895E, Route104_Text_1B899E msgbox Route104_Text_1B89C0, 6 end Route104_EventScript_14F21C:: @ 814F21C - trainerbattle 0, 114, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 + trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 specialval RESULT, 57 compare RESULT, 1 jumpeq Route104_EventScript_14F243 @@ -442,19 +442,19 @@ Route104_EventScript_14F21C:: @ 814F21C end Route104_EventScript_14F243:: @ 814F243 - trainerbattle 5, 114, 0, Route104_Text_1B8AA7, Route104_Text_1B8AD9 + trainerbattle 5, OPPONENT_CINDY_1, 0, Route104_Text_1B8AA7, Route104_Text_1B8AD9 msgbox Route104_Text_1B8B02, 6 end Route104_EventScript_14F25A:: @ 814F25A - trainerbattle 4, 483, 0, Route104_Text_1B83E9, Route104_Text_1B8414, Route104_Text_1B845C + trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B83E9, Route104_Text_1B8414, Route104_Text_1B845C special 148 msgbox Route104_Text_1B842C, 4 release end Route104_EventScript_14F279:: @ 814F279 - trainerbattle 4, 483, 0, Route104_Text_1B84DB, Route104_Text_1B850D, Route104_Text_1B8577 + trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B84DB, Route104_Text_1B850D, Route104_Text_1B8577 special 148 msgbox Route104_Text_1B853B, 4 release diff --git a/data/scripts/maps/Route104_Prototype.s b/data/scripts/maps/Route104_Prototype.s index 91ed6e593..184127187 100644 --- a/data/scripts/maps/Route104_Prototype.s +++ b/data/scripts/maps/Route104_Prototype.s @@ -4,17 +4,17 @@ Route104_Prototype_MapScripts:: @ 8160C4A Route104_Prototype_EventScript_160C4B:: @ 8160C4B lock faceplayer - checktrainerflag 116 + checktrainerflag OPPONENT_BRIANNA_1 jumpif 0, Route104_Prototype_EventScript_160C99 - checktrainerflag 117 + checktrainerflag OPPONENT_CINDY_2 jumpif 0, Route104_Prototype_EventScript_160C99 - checktrainerflag 485 + checktrainerflag OPPONENT_AMY_AND_LIV_3 jumpif 0, Route104_Prototype_EventScript_160C99 - checktrainerflag 486 + checktrainerflag OPPONENT_GINA_AND_MIA_2 jumpif 0, Route104_Prototype_EventScript_160C99 - checktrainerflag 633 + checktrainerflag OPPONENT_LUCAS_2 jumpif 0, Route104_Prototype_EventScript_160C99 - checktrainerflag 634 + checktrainerflag OPPONENT_MIKE_1 jumpif 0, Route104_Prototype_EventScript_160C99 setflag 215 msgbox Route104_Prototype_Text_19B267, 4 @@ -31,17 +31,17 @@ Route104_Prototype_EventScript_160C99:: @ 8160C99 Route104_Prototype_EventScript_160CA3:: @ 8160CA3 lock faceplayer - checktrainerflag 116 + checktrainerflag OPPONENT_BRIANNA_1 jumpif 0, Route104_Prototype_EventScript_160CF1 - checktrainerflag 117 + checktrainerflag OPPONENT_CINDY_2 jumpif 0, Route104_Prototype_EventScript_160CF1 - checktrainerflag 485 + checktrainerflag OPPONENT_AMY_AND_LIV_3 jumpif 0, Route104_Prototype_EventScript_160CF1 - checktrainerflag 486 + checktrainerflag OPPONENT_GINA_AND_MIA_2 jumpif 0, Route104_Prototype_EventScript_160CF1 - checktrainerflag 633 + checktrainerflag OPPONENT_LUCAS_2 jumpif 0, Route104_Prototype_EventScript_160CF1 - checktrainerflag 634 + checktrainerflag OPPONENT_MIKE_1 jumpif 0, Route104_Prototype_EventScript_160CF1 setflag 216 msgbox Route104_Prototype_Text_19B2E9, 4 @@ -82,31 +82,31 @@ Route104_Prototype_EventScript_160D25:: @ 8160D25 end Route104_Prototype_EventScript_160D2E:: @ 8160D2E - trainerbattle 0, 117, 0, Route104_Prototype_Text_19AD9B, Route104_Prototype_Text_19ADDA + trainerbattle 0, OPPONENT_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, 485, 0, Route104_Prototype_Text_19AE3E, Route104_Prototype_Text_19AE53, Route104_Prototype_Text_19AEA9 + trainerbattle 4, OPPONENT_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, 486, 0, Route104_Prototype_Text_19B148, Route104_Prototype_Text_19B17D, Route104_Prototype_Text_19B1DD + trainerbattle 4, OPPONENT_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, 634, 0, Route104_Prototype_Text_19AEFB, Route104_Prototype_Text_19AF3E + trainerbattle 0, OPPONENT_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, 116, 0, Route104_Prototype_Text_19AF8A, Route104_Prototype_Text_19AFDB + trainerbattle 0, OPPONENT_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, 633, 0, Route104_Prototype_Text_19B066, Route104_Prototype_Text_19B0D7 + trainerbattle 0, OPPONENT_LUCAS_2, 0, Route104_Prototype_Text_19B066, Route104_Prototype_Text_19B0D7 msgbox Route104_Prototype_Text_19B0EF, 6 end diff --git a/data/scripts/maps/Route105.s b/data/scripts/maps/Route105.s index eb86b126c..c71e2ce05 100644 --- a/data/scripts/maps/Route105.s +++ b/data/scripts/maps/Route105.s @@ -13,26 +13,26 @@ Route105_EventScript_14F2A8:: @ 814F2A8 return Route105_EventScript_14F2BB:: @ 814F2BB - trainerbattle 0, 46, 0, Route105_Text_1B8B40, Route105_Text_1B8B93 + trainerbattle 0, OPPONENT_FOSTER, 0, Route105_Text_1B8B40, Route105_Text_1B8B93 msgbox Route105_Text_1B8BDE, 6 end Route105_EventScript_14F2D2:: @ 814F2D2 - trainerbattle 0, 151, 0, Route105_Text_1B8C28, Route105_Text_1B8C99 + trainerbattle 0, OPPONENT_LUIS, 0, Route105_Text_1B8C28, Route105_Text_1B8C99 msgbox Route105_Text_1B8CA9, 6 end Route105_EventScript_14F2E9:: @ 814F2E9 - trainerbattle 0, 152, 0, Route105_Text_1B8CEE, Route105_Text_1B8D23 + trainerbattle 0, OPPONENT_AUSTIN, 0, Route105_Text_1B8CEE, Route105_Text_1B8D23 msgbox Route105_Text_1B8D45, 6 end Route105_EventScript_14F300:: @ 814F300 - trainerbattle 0, 441, 0, Route105_Text_1B8D99, Route105_Text_1B8DDD + trainerbattle 0, OPPONENT_BEVERLY, 0, Route105_Text_1B8D99, Route105_Text_1B8DDD msgbox Route105_Text_1B8DED, 6 end Route105_EventScript_14F317:: @ 814F317 - trainerbattle 0, 442, 0, Route105_Text_1B8E66, Route105_Text_1B8EA0 + trainerbattle 0, OPPONENT_DAWN, 0, Route105_Text_1B8E66, Route105_Text_1B8EA0 msgbox Route105_Text_1B8EBD, 6 end diff --git a/data/scripts/maps/Route106.s b/data/scripts/maps/Route106.s index 8ff86e445..1889eb4d7 100644 --- a/data/scripts/maps/Route106.s +++ b/data/scripts/maps/Route106.s @@ -6,17 +6,17 @@ Route106_EventScript_14F32F:: @ 814F32F end Route106_EventScript_14F338:: @ 814F338 - trainerbattle 0, 153, 0, Route106_Text_1B913D, Route106_Text_1B917F + trainerbattle 0, OPPONENT_DOUGLAS, 0, Route106_Text_1B913D, Route106_Text_1B917F msgbox Route106_Text_1B918A, 6 end Route106_EventScript_14F34F:: @ 814F34F - trainerbattle 0, 443, 0, Route106_Text_1B91AC, Route106_Text_1B91F8 + trainerbattle 0, OPPONENT_NICOLE, 0, Route106_Text_1B91AC, Route106_Text_1B91F8 msgbox Route106_Text_1B9222, 6 end Route106_EventScript_14F366:: @ 814F366 - trainerbattle 0, 339, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 + trainerbattle 0, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 specialval RESULT, 57 compare RESULT, 1 jumpeq Route106_EventScript_14F38D @@ -24,11 +24,11 @@ Route106_EventScript_14F366:: @ 814F366 end Route106_EventScript_14F38D:: @ 814F38D - trainerbattle 5, 339, 0, Route106_Text_1B8FAC, Route106_Text_1B8FF5 + trainerbattle 5, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8FAC, Route106_Text_1B8FF5 msgbox Route106_Text_1B9011, 6 end Route106_EventScript_14F3A4:: @ 814F3A4 - trainerbattle 0, 340, 0, Route106_Text_1B9052, Route106_Text_1B90D3 + trainerbattle 0, OPPONENT_NED, 0, Route106_Text_1B9052, Route106_Text_1B90D3 msgbox Route106_Text_1B910A, 6 end diff --git a/data/scripts/maps/Route107.s b/data/scripts/maps/Route107.s index bf94d6ce7..ef3407265 100644 --- a/data/scripts/maps/Route107.s +++ b/data/scripts/maps/Route107.s @@ -2,12 +2,12 @@ Route107_MapScripts:: @ 814F3BB .byte 0 Route107_EventScript_14F3BC:: @ 814F3BC - trainerbattle 0, 154, 0, Route107_Text_1B926B, Route107_Text_1B92B7 + trainerbattle 0, OPPONENT_DARRIN, 0, Route107_Text_1B926B, Route107_Text_1B92B7 msgbox Route107_Text_1B92E7, 6 end Route107_EventScript_14F3D3:: @ 814F3D3 - trainerbattle 0, 155, 0, Route107_Text_1B933A, Route107_Text_1B9365 + trainerbattle 0, OPPONENT_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 specialval RESULT, 57 compare RESULT, 1 jumpeq Route107_EventScript_14F3FA @@ -15,26 +15,26 @@ Route107_EventScript_14F3D3:: @ 814F3D3 end Route107_EventScript_14F3FA:: @ 814F3FA - trainerbattle 5, 155, 0, Route107_Text_1B93EB, Route107_Text_1B9429 + trainerbattle 5, OPPONENT_TONY_1, 0, Route107_Text_1B93EB, Route107_Text_1B9429 msgbox Route107_Text_1B9477, 6 end Route107_EventScript_14F411:: @ 814F411 - trainerbattle 0, 444, 0, Route107_Text_1B94C8, Route107_Text_1B94F2 + trainerbattle 0, OPPONENT_DENISE, 0, Route107_Text_1B94C8, Route107_Text_1B94F2 msgbox Route107_Text_1B94FF, 6 end Route107_EventScript_14F428:: @ 814F428 - trainerbattle 0, 445, 0, Route107_Text_1B9538, Route107_Text_1B956B + trainerbattle 0, OPPONENT_BETH, 0, Route107_Text_1B9538, Route107_Text_1B956B msgbox Route107_Text_1B9589, 6 end Route107_EventScript_14F43F:: @ 814F43F - trainerbattle 4, 692, 0, Route107_Text_1B95CB, Route107_Text_1B95FB, Route107_Text_1B9672 + trainerbattle 4, OPPONENT_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, 692, 0, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788 + trainerbattle 4, OPPONENT_LISA_AND_RAY, 0, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788 msgbox Route107_Text_1B9735, 6 end diff --git a/data/scripts/maps/Route108.s b/data/scripts/maps/Route108.s index c474cc2dd..2e40c882d 100644 --- a/data/scripts/maps/Route108.s +++ b/data/scripts/maps/Route108.s @@ -2,21 +2,21 @@ Route108_MapScripts:: @ 814F475 .byte 0 Route108_EventScript_14F476:: @ 814F476 - trainerbattle 0, 156, 0, Route108_Text_1B97C3, Route108_Text_1B97EF + trainerbattle 0, OPPONENT_JEROME, 0, Route108_Text_1B97C3, Route108_Text_1B97EF msgbox Route108_Text_1B9823, 6 end Route108_EventScript_14F48D:: @ 814F48D - trainerbattle 0, 157, 0, Route108_Text_1B9864, Route108_Text_1B989F + trainerbattle 0, OPPONENT_MATTHEW, 0, Route108_Text_1B9864, Route108_Text_1B989F msgbox Route108_Text_1B98BC, 6 end Route108_EventScript_14F4A4:: @ 814F4A4 - trainerbattle 0, 446, 0, Route108_Text_1B98EC, Route108_Text_1B992C + trainerbattle 0, OPPONENT_TARA, 0, Route108_Text_1B98EC, Route108_Text_1B992C msgbox Route108_Text_1B9935, 6 end Route108_EventScript_14F4BB:: @ 814F4BB - trainerbattle 0, 447, 0, Route108_Text_1B9986, Route108_Text_1B99BB + trainerbattle 0, OPPONENT_MISSY, 0, Route108_Text_1B9986, Route108_Text_1B99BB msgbox Route108_Text_1B99E9, 6 end diff --git a/data/scripts/maps/Route109.s b/data/scripts/maps/Route109.s index 2fa119117..343a8cab9 100644 --- a/data/scripts/maps/Route109.s +++ b/data/scripts/maps/Route109.s @@ -375,27 +375,27 @@ Route109_EventScript_14F7A4:: @ 814F7A4 end Route109_EventScript_14F7AD:: @ 814F7AD - trainerbattle 0, 158, 0, Route109_Text_1B9A1C, Route109_Text_1B9A59 + trainerbattle 0, OPPONENT_DAVID, 0, Route109_Text_1B9A1C, Route109_Text_1B9A59 msgbox Route109_Text_1B9A6D, 6 end Route109_EventScript_14F7C4:: @ 814F7C4 - trainerbattle 0, 448, 0, Route109_Text_1B9AAD, Route109_Text_1B9AD9 + trainerbattle 0, OPPONENT_ALICE, 0, Route109_Text_1B9AAD, Route109_Text_1B9AD9 msgbox Route109_Text_1B9AEB, 6 end Route109_EventScript_14F7DB:: @ 814F7DB - trainerbattle 0, 490, 0, Route109_Text_1B9B11, Route109_Text_1B9B57 + trainerbattle 0, OPPONENT_HUEY, 0, Route109_Text_1B9B11, Route109_Text_1B9B57 msgbox Route109_Text_1B9B68, 6 end Route109_EventScript_14F7F2:: @ 814F7F2 - trainerbattle 0, 491, 0, Route109_Text_1B9B91, Route109_Text_1B9BAE + trainerbattle 0, OPPONENT_EDMOND, 0, Route109_Text_1B9B91, Route109_Text_1B9BAE msgbox Route109_Text_1B9BD3, 6 end Route109_EventScript_14F809:: @ 814F809 - trainerbattle 0, 64, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 + trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 specialval RESULT, 57 compare RESULT, 1 jumpeq Route109_EventScript_14F830 @@ -403,12 +403,12 @@ Route109_EventScript_14F809:: @ 814F809 end Route109_EventScript_14F830:: @ 814F830 - trainerbattle 5, 64, 0, Route109_Text_1B9CB3, Route109_Text_1B9CEB + trainerbattle 5, OPPONENT_RICKY_1, 0, Route109_Text_1B9CB3, Route109_Text_1B9CEB msgbox Route109_Text_1B9D10, 6 end Route109_EventScript_14F847:: @ 814F847 - trainerbattle 0, 57, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 + trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 specialval RESULT, 57 compare RESULT, 1 jumpeq Route109_EventScript_14F86E @@ -416,31 +416,31 @@ Route109_EventScript_14F847:: @ 814F847 end Route109_EventScript_14F86E:: @ 814F86E - trainerbattle 5, 57, 0, Route109_Text_1B9DD8, Route109_Text_1B9E16 + trainerbattle 5, OPPONENT_LOLA_1, 0, Route109_Text_1B9DD8, Route109_Text_1B9E16 msgbox Route109_Text_1B9E1D, 6 end Route109_EventScript_14F885:: @ 814F885 - trainerbattle 0, 58, 0, Route109_Text_1B9E60, Route109_Text_1B9EA1 + trainerbattle 0, OPPONENT_CARMEN, 0, Route109_Text_1B9E60, Route109_Text_1B9EA1 msgbox Route109_Text_1B9ECA, 6 end Route109_EventScript_14F89C:: @ 814F89C - trainerbattle 0, 59, 0, Route109_Text_1B9F07, Route109_Text_1B9F31 + trainerbattle 0, OPPONENT_GWEN, 0, Route109_Text_1B9F07, Route109_Text_1B9F31 msgbox Route109_Text_1B9F44, 6 end Route109_EventScript_14F8B3:: @ 814F8B3 - trainerbattle 0, 345, 0, Route109_Text_1B9F65, Route109_Text_1B9F9C + trainerbattle 0, OPPONENT_CARTER, 0, Route109_Text_1B9F65, Route109_Text_1B9F9C msgbox Route109_Text_1B9FB7, 6 end Route109_EventScript_14F8CA:: @ 814F8CA - trainerbattle 4, 680, 0, Route109_Text_1B9FF6, Route109_Text_1BA052, Route109_Text_1BA0BF + trainerbattle 4, OPPONENT_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, 680, 0, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0 + trainerbattle 4, OPPONENT_MEL_AND_PAUL, 0, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0 msgbox Route109_Text_1BA193, 6 end diff --git a/data/scripts/maps/Route109_SeashoreHouse.s b/data/scripts/maps/Route109_SeashoreHouse.s index 919f07091..e1d9c380b 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.s +++ b/data/scripts/maps/Route109_SeashoreHouse.s @@ -79,26 +79,26 @@ Route109_SeashoreHouse_EventScript_160EAB:: @ 8160EAB end Route109_SeashoreHouse_EventScript_160EB8:: @ 8160EB8 - trainerbattle 2, 493, 0, Route109_SeashoreHouse_Text_19B809, Route109_SeashoreHouse_Text_19B869, Route109_SeashoreHouse_EventScript_160F09 + trainerbattle 2, OPPONENT_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, 647, 0, Route109_SeashoreHouse_Text_19B8E5, Route109_SeashoreHouse_Text_19B949, Route109_SeashoreHouse_EventScript_160F09 + trainerbattle 2, OPPONENT_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, 65, 0, Route109_SeashoreHouse_Text_19B988, Route109_SeashoreHouse_Text_19B9C7, Route109_SeashoreHouse_EventScript_160F09 + trainerbattle 2, OPPONENT_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 - checktrainerflag 493 + checktrainerflag OPPONENT_DWAYNE jumpif 0, Route109_SeashoreHouse_EventScript_160F29 - checktrainerflag 647 + checktrainerflag OPPONENT_JOHANNA jumpif 0, Route109_SeashoreHouse_EventScript_160F29 - checktrainerflag 65 + checktrainerflag OPPONENT_SIMON jumpif 0, Route109_SeashoreHouse_EventScript_160F29 setflag 141 release diff --git a/data/scripts/maps/Route110.s b/data/scripts/maps/Route110.s index 41a14fa28..55c8f67df 100644 --- a/data/scripts/maps/Route110.s +++ b/data/scripts/maps/Route110.s @@ -166,17 +166,17 @@ Route110_EventScript_14FA84:: @ 814FA84 end Route110_EventScript_14FA8E:: @ 814FA8E - trainerbattle 0, 232, 0, Route110_Text_1BA699, Route110_Text_1BA6D2 + trainerbattle 0, OPPONENT_EDWARD, 0, Route110_Text_1BA699, Route110_Text_1BA6D2 msgbox Route110_Text_1BA6F8, 6 end Route110_EventScript_14FAA5:: @ 814FAA5 - trainerbattle 0, 243, 0, Route110_Text_1BA72D, Route110_Text_1BA759 + trainerbattle 0, OPPONENT_JACLYN, 0, Route110_Text_1BA72D, Route110_Text_1BA759 msgbox Route110_Text_1BA76C, 6 end Route110_EventScript_14FABC:: @ 814FABC - trainerbattle 0, 512, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 + trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 specialval RESULT, 57 compare RESULT, 1 jumpeq Route110_EventScript_14FAE3 @@ -184,27 +184,27 @@ Route110_EventScript_14FABC:: @ 814FABC end Route110_EventScript_14FAE3:: @ 814FAE3 - trainerbattle 5, 512, 0, Route110_Text_1BA877, Route110_Text_1BA8CD + trainerbattle 5, OPPONENT_EDWIN_1, 0, Route110_Text_1BA877, Route110_Text_1BA8CD msgbox Route110_Text_1BA8E9, 6 end Route110_EventScript_14FAFA:: @ 814FAFA - trainerbattle 0, 341, 0, Route110_Text_1BA913, Route110_Text_1BA93C + trainerbattle 0, OPPONENT_DALE, 0, Route110_Text_1BA913, Route110_Text_1BA93C msgbox Route110_Text_1BA94A, 6 end Route110_EventScript_14FB11:: @ 814FB11 - trainerbattle 0, 351, 0, Route110_Text_1BA22C, Route110_Text_1BA264 + trainerbattle 0, OPPONENT_JACOB, 0, Route110_Text_1BA22C, Route110_Text_1BA264 msgbox Route110_Text_1BA27C, 6 end Route110_EventScript_14FB28:: @ 814FB28 - trainerbattle 0, 352, 0, Route110_Text_1BA2D4, Route110_Text_1BA2FC + trainerbattle 0, OPPONENT_ANTHONY, 0, Route110_Text_1BA2D4, Route110_Text_1BA2FC msgbox Route110_Text_1BA30C, 6 end Route110_EventScript_14FB3F:: @ 814FB3F - trainerbattle 0, 353, 0, Route110_Text_1BA352, Route110_Text_1BA379 + trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 specialval RESULT, 57 compare RESULT, 1 jumpeq Route110_EventScript_14FB66 @@ -212,17 +212,17 @@ Route110_EventScript_14FB3F:: @ 814FB3F end Route110_EventScript_14FB66:: @ 814FB66 - trainerbattle 5, 353, 0, Route110_Text_1BA3EF, Route110_Text_1BA432 + trainerbattle 5, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA3EF, Route110_Text_1BA432 msgbox Route110_Text_1BA456, 6 end Route110_EventScript_14FB7D:: @ 814FB7D - trainerbattle 0, 359, 0, Route110_Text_1BA5FF, Route110_Text_1BA63C + trainerbattle 0, OPPONENT_JASMINE, 0, Route110_Text_1BA5FF, Route110_Text_1BA63C msgbox Route110_Text_1BA65F, 6 end Route110_EventScript_14FB94:: @ 814FB94 - trainerbattle 0, 358, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F + trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F specialval RESULT, 57 compare RESULT, 1 jumpeq Route110_EventScript_14FBBB @@ -230,12 +230,12 @@ Route110_EventScript_14FB94:: @ 814FB94 end Route110_EventScript_14FBBB:: @ 814FBBB - trainerbattle 5, 358, 0, Route110_Text_1BA573, Route110_Text_1BA5A1 + trainerbattle 5, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA573, Route110_Text_1BA5A1 msgbox Route110_Text_1BA5C4, 6 end Route110_EventScript_14FBD2:: @ 814FBD2 - trainerbattle 0, 302, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 + trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 specialval RESULT, 57 compare RESULT, 1 jumpeq Route110_EventScript_14FBF9 @@ -243,12 +243,12 @@ Route110_EventScript_14FBD2:: @ 814FBD2 end Route110_EventScript_14FBF9:: @ 814FBF9 - trainerbattle 5, 302, 0, Route110_Text_1BAA2D, Route110_Text_1BAA76 + trainerbattle 5, OPPONENT_ISABEL_1, 0, Route110_Text_1BAA2D, Route110_Text_1BAA76 msgbox Route110_Text_1BAA8F, 6 end Route110_EventScript_14FC10:: @ 814FC10 - trainerbattle 0, 334, 0, Route110_Text_1BAAC3, Route110_Text_1BAAF7 + trainerbattle 0, OPPONENT_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, 533, 0, Route110_Text_16E826 + trainerbattle 3, OPPONENT_MAY_5, 0, Route110_Text_16E826 jump Route110_EventScript_14FE10 end Route110_EventScript_14FDF0:: @ 814FDF0 - trainerbattle 3, 536, 0, Route110_Text_16E826 + trainerbattle 3, OPPONENT_MAY_8, 0, Route110_Text_16E826 jump Route110_EventScript_14FE10 end Route110_EventScript_14FE00:: @ 814FE00 - trainerbattle 3, 530, 0, Route110_Text_16E826 + trainerbattle 3, OPPONENT_MAY_2, 0, Route110_Text_16E826 jump Route110_EventScript_14FE10 end @@ -398,17 +398,17 @@ Route110_EventScript_14FE2B:: @ 814FE2B end Route110_EventScript_14FE5A:: @ 814FE5A - trainerbattle 3, 524, 0, Route110_Text_16EA0F + trainerbattle 3, OPPONENT_BRENDAN_5, 0, Route110_Text_16EA0F jump Route110_EventScript_14FE8A end Route110_EventScript_14FE6A:: @ 814FE6A - trainerbattle 3, 527, 0, Route110_Text_16EA0F + trainerbattle 3, OPPONENT_BRENDAN_8, 0, Route110_Text_16EA0F jump Route110_EventScript_14FE8A end Route110_EventScript_14FE7A:: @ 814FE7A - trainerbattle 3, 521, 0, Route110_Text_16EA0F + trainerbattle 3, OPPONENT_BRENDAN_2, 0, Route110_Text_16EA0F jump Route110_EventScript_14FE8A end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.s b/data/scripts/maps/Route110_TrickHousePuzzle1.s index df9235c0b..6b6d45af2 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.s +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.s @@ -24,16 +24,16 @@ Route110_TrickHousePuzzle1_EventScript_161D26:: @ 8161D26 end Route110_TrickHousePuzzle1_EventScript_161D31:: @ 8161D31 - trainerbattle 0, 611, 0, Route110_TrickHousePuzzle1_Text_19CB4F, Route110_TrickHousePuzzle1_Text_19CB93 + trainerbattle 0, OPPONENT_SALLY, 0, Route110_TrickHousePuzzle1_Text_19CB4F, Route110_TrickHousePuzzle1_Text_19CB93 msgbox Route110_TrickHousePuzzle1_Text_19CBAB, 6 end Route110_TrickHousePuzzle1_EventScript_161D48:: @ 8161D48 - trainerbattle 0, 332, 0, Route110_TrickHousePuzzle1_Text_19CBD6, Route110_TrickHousePuzzle1_Text_19CC06 + trainerbattle 0, OPPONENT_EDDIE, 0, Route110_TrickHousePuzzle1_Text_19CBD6, Route110_TrickHousePuzzle1_Text_19CC06 msgbox Route110_TrickHousePuzzle1_Text_19CC1B, 6 end Route110_TrickHousePuzzle1_EventScript_161D5F:: @ 8161D5F - trainerbattle 0, 612, 0, Route110_TrickHousePuzzle1_Text_19CC68, Route110_TrickHousePuzzle1_Text_19CC86 + trainerbattle 0, OPPONENT_ROBIN, 0, Route110_TrickHousePuzzle1_Text_19CC68, Route110_TrickHousePuzzle1_Text_19CC86 msgbox Route110_TrickHousePuzzle1_Text_19CCAA, 6 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.s b/data/scripts/maps/Route110_TrickHousePuzzle2.s index e9d4648b0..183431bfc 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.s +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.s @@ -90,16 +90,16 @@ Route110_TrickHousePuzzle2_EventScript_161E65:: @ 8161E65 return Route110_TrickHousePuzzle2_EventScript_161E78:: @ 8161E78 - trainerbattle 0, 274, 0, Route110_TrickHousePuzzle2_Text_19CD46, Route110_TrickHousePuzzle2_Text_19CD66 + trainerbattle 0, OPPONENT_TED, 0, Route110_TrickHousePuzzle2_Text_19CD46, Route110_TrickHousePuzzle2_Text_19CD66 msgbox Route110_TrickHousePuzzle2_Text_19CD91, 6 end Route110_TrickHousePuzzle2_EventScript_161E8F:: @ 8161E8F - trainerbattle 0, 275, 0, Route110_TrickHousePuzzle2_Text_19CDBF, Route110_TrickHousePuzzle2_Text_19CDF0 + trainerbattle 0, OPPONENT_PAUL, 0, Route110_TrickHousePuzzle2_Text_19CDBF, Route110_TrickHousePuzzle2_Text_19CDF0 msgbox Route110_TrickHousePuzzle2_Text_19CE0D, 6 end Route110_TrickHousePuzzle2_EventScript_161EA6:: @ 8161EA6 - trainerbattle 0, 281, 0, Route110_TrickHousePuzzle2_Text_19CE52, Route110_TrickHousePuzzle2_Text_19CE98 + trainerbattle 0, OPPONENT_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_19CE52, Route110_TrickHousePuzzle2_Text_19CE98 msgbox Route110_TrickHousePuzzle2_Text_19CEB8, 6 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.s b/data/scripts/maps/Route110_TrickHousePuzzle3.s index 0a9a1c6a2..b533dbbe5 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.s +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.s @@ -381,16 +381,16 @@ Route110_TrickHousePuzzle3_EventScript_1626FD:: @ 81626FD end Route110_TrickHousePuzzle3_EventScript_162708:: @ 8162708 - trainerbattle 0, 215, 0, Route110_TrickHousePuzzle3_Text_19CF76, Route110_TrickHousePuzzle3_Text_19CF9D + trainerbattle 0, OPPONENT_JUSTIN, 0, Route110_TrickHousePuzzle3_Text_19CF76, Route110_TrickHousePuzzle3_Text_19CF9D msgbox Route110_TrickHousePuzzle3_Text_19CFE6, 6 end Route110_TrickHousePuzzle3_EventScript_16271F:: @ 816271F - trainerbattle 0, 473, 0, Route110_TrickHousePuzzle3_Text_19D026, Route110_TrickHousePuzzle3_Text_19D065 + trainerbattle 0, OPPONENT_MARTHA, 0, Route110_TrickHousePuzzle3_Text_19D026, Route110_TrickHousePuzzle3_Text_19D065 msgbox Route110_TrickHousePuzzle3_Text_19D07A, 6 end Route110_TrickHousePuzzle3_EventScript_162736:: @ 8162736 - trainerbattle 0, 630, 0, Route110_TrickHousePuzzle3_Text_19D0AE, Route110_TrickHousePuzzle3_Text_19D0F0 + trainerbattle 0, OPPONENT_ALAN, 0, Route110_TrickHousePuzzle3_Text_19D0AE, Route110_TrickHousePuzzle3_Text_19D0F0 msgbox Route110_TrickHousePuzzle3_Text_19D110, 6 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.s b/data/scripts/maps/Route110_TrickHousePuzzle4.s index e0f16d739..89d5e45c3 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle4.s +++ b/data/scripts/maps/Route110_TrickHousePuzzle4.s @@ -14,16 +14,16 @@ Route110_TrickHousePuzzle4_EventScript_162760:: @ 8162760 end Route110_TrickHousePuzzle4_EventScript_16276B:: @ 816276B - trainerbattle 0, 428, 0, Route110_TrickHousePuzzle4_Text_19D1DE, Route110_TrickHousePuzzle4_Text_19D21F + trainerbattle 0, OPPONENT_CORA, 0, Route110_TrickHousePuzzle4_Text_19D1DE, Route110_TrickHousePuzzle4_Text_19D21F msgbox Route110_TrickHousePuzzle4_Text_19D253, 6 end Route110_TrickHousePuzzle4_EventScript_162782:: @ 8162782 - trainerbattle 0, 188, 0, Route110_TrickHousePuzzle4_Text_19D295, Route110_TrickHousePuzzle4_Text_19D2D1 + trainerbattle 0, OPPONENT_YUJI, 0, Route110_TrickHousePuzzle4_Text_19D295, Route110_TrickHousePuzzle4_Text_19D2D1 msgbox Route110_TrickHousePuzzle4_Text_19D306, 6 end Route110_TrickHousePuzzle4_EventScript_162799:: @ 8162799 - trainerbattle 0, 429, 0, Route110_TrickHousePuzzle4_Text_19D351, Route110_TrickHousePuzzle4_Text_19D380 + trainerbattle 0, OPPONENT_JILL, 0, Route110_TrickHousePuzzle4_Text_19D351, Route110_TrickHousePuzzle4_Text_19D380 msgbox Route110_TrickHousePuzzle4_Text_19D386, 6 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.s b/data/scripts/maps/Route110_TrickHousePuzzle6.s index fa9b00e95..56d350871 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.s +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.s @@ -28,16 +28,16 @@ Route110_TrickHousePuzzle6_EventScript_1630FC:: @ 81630FC end Route110_TrickHousePuzzle6_EventScript_163107:: @ 8163107 - trainerbattle 0, 561, 0, Route110_TrickHousePuzzle6_Text_19DC87, Route110_TrickHousePuzzle6_Text_19DCC6 + trainerbattle 0, OPPONENT_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_19DC87, Route110_TrickHousePuzzle6_Text_19DCC6 msgbox Route110_TrickHousePuzzle6_Text_19DCE7, 6 end Route110_TrickHousePuzzle6_EventScript_16311E:: @ 816311E - trainerbattle 0, 407, 0, Route110_TrickHousePuzzle6_Text_19DD49, Route110_TrickHousePuzzle6_Text_19DD83 + trainerbattle 0, OPPONENT_BENNY, 0, Route110_TrickHousePuzzle6_Text_19DD49, Route110_TrickHousePuzzle6_Text_19DD83 msgbox Route110_TrickHousePuzzle6_Text_19DD96, 6 end Route110_TrickHousePuzzle6_EventScript_163135:: @ 8163135 - trainerbattle 0, 554, 0, Route110_TrickHousePuzzle6_Text_19DDCF, Route110_TrickHousePuzzle6_Text_19DDFE + trainerbattle 0, OPPONENT_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_19DDCF, Route110_TrickHousePuzzle6_Text_19DDFE msgbox Route110_TrickHousePuzzle6_Text_19DE44, 6 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.s b/data/scripts/maps/Route110_TrickHousePuzzle7.s index 835cce0a1..1276562d0 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.s +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.s @@ -244,16 +244,16 @@ Route110_TrickHousePuzzle7_EventScript_1633D1:: @ 81633D1 end Route110_TrickHousePuzzle7_EventScript_1633D6:: @ 81633D6 - trainerbattle 0, 237, 0, Route110_TrickHousePuzzle7_Text_19DF0B, Route110_TrickHousePuzzle7_Text_19DF4B + trainerbattle 0, OPPONENT_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_19DF0B, Route110_TrickHousePuzzle7_Text_19DF4B msgbox Route110_TrickHousePuzzle7_Text_19DF7E, 6 end Route110_TrickHousePuzzle7_EventScript_1633ED:: @ 81633ED - trainerbattle 0, 105, 0, Route110_TrickHousePuzzle7_Text_19DFBB, Route110_TrickHousePuzzle7_Text_19DFF2 + trainerbattle 0, OPPONENT_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_19DFBB, Route110_TrickHousePuzzle7_Text_19DFF2 msgbox Route110_TrickHousePuzzle7_Text_19E00F, 6 end Route110_TrickHousePuzzle7_EventScript_163404:: @ 8163404 - trainerbattle 0, 248, 0, Route110_TrickHousePuzzle7_Text_19E054, Route110_TrickHousePuzzle7_Text_19E098 + trainerbattle 0, OPPONENT_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_19E054, Route110_TrickHousePuzzle7_Text_19E098 msgbox Route110_TrickHousePuzzle7_Text_19E0B2, 6 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.s b/data/scripts/maps/Route110_TrickHousePuzzle8.s index d22fe8edc..a31c868be 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle8.s +++ b/data/scripts/maps/Route110_TrickHousePuzzle8.s @@ -14,16 +14,16 @@ Route110_TrickHousePuzzle8_EventScript_16342E:: @ 816342E end Route110_TrickHousePuzzle8_EventScript_163439:: @ 8163439 - trainerbattle 0, 76, 0, Route110_TrickHousePuzzle8_Text_19E178, Route110_TrickHousePuzzle8_Text_19E1A1 + trainerbattle 0, OPPONENT_VINCENT, 0, Route110_TrickHousePuzzle8_Text_19E178, Route110_TrickHousePuzzle8_Text_19E1A1 msgbox Route110_TrickHousePuzzle8_Text_19E1C5, 6 end Route110_TrickHousePuzzle8_EventScript_163450:: @ 8163450 - trainerbattle 0, 93, 0, Route110_TrickHousePuzzle8_Text_19E201, Route110_TrickHousePuzzle8_Text_19E22C + trainerbattle 0, OPPONENT_ELAINE, 0, Route110_TrickHousePuzzle8_Text_19E201, Route110_TrickHousePuzzle8_Text_19E22C msgbox Route110_TrickHousePuzzle8_Text_19E24C, 6 end Route110_TrickHousePuzzle8_EventScript_163467:: @ 8163467 - trainerbattle 0, 77, 0, Route110_TrickHousePuzzle8_Text_19E284, Route110_TrickHousePuzzle8_Text_19E2C1 + trainerbattle 0, OPPONENT_LEROY, 0, Route110_TrickHousePuzzle8_Text_19E284, Route110_TrickHousePuzzle8_Text_19E2C1 msgbox Route110_TrickHousePuzzle8_Text_19E2EE, 6 end diff --git a/data/scripts/maps/Route111.s b/data/scripts/maps/Route111.s index 17cf1cdc7..10b34cf5f 100644 --- a/data/scripts/maps/Route111.s +++ b/data/scripts/maps/Route111.s @@ -16,7 +16,7 @@ Route111_EventScript_14FFA6:: @ 814FFA6 Route111_MapScript1_14FFB9:: @ 814FFB9 call Route111_EventScript_14FFCD call Route111_EventScript_1AE313 - checktrainerflag 312 + checktrainerflag OPPONENT_VICKY jumpif 0, Route111_EventScript_15000D end @@ -44,9 +44,9 @@ Route111_EventScript_15000D:: @ 815000D setflag 769 setflag 770 setflag 771 - settrainerflag 292 - settrainerflag 299 - settrainerflag 606 + settrainerflag OPPONENT_VICTOR + settrainerflag OPPONENT_VICTORIA + settrainerflag OPPONENT_VIVI end Route111_EventScript_150023:: @ 8150023 @@ -246,7 +246,7 @@ Route111_EventScript_1501D1:: @ 81501D1 Route111_EventScript_1501F3:: @ 81501F3 msgbox Route111_Text_16F7B3, 4 - trainerbattle 3, 292, 0, Route111_Text_16F7D2 + trainerbattle 3, OPPONENT_VICTOR, 0, Route111_Text_16F7D2 move 1, Route111_Movement_1A0841 waitmove 0 call Route111_EventScript_150348 @@ -264,7 +264,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmove 0 call Route111_EventScript_15034F msgbox Route111_Text_16F82D, 4 - trainerbattle 3, 299, 0, Route111_Text_16F8A6 + trainerbattle 3, OPPONENT_VICTORIA, 0, Route111_Text_16F8A6 move 2, Route111_Movement_1A0841 waitmove 0 call Route111_EventScript_150348 @@ -282,7 +282,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmove 0 call Route111_EventScript_15034F msgbox Route111_Text_16F90E, 4 - trainerbattle 3, 606, 0, Route111_Text_16F956 + trainerbattle 3, OPPONENT_VIVI, 0, Route111_Text_16F956 move 3, Route111_Movement_1A0841 waitmove 0 call Route111_EventScript_150348 @@ -300,7 +300,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmove 0 call Route111_EventScript_15034F msgbox Route111_Text_16F991, 4 - trainerbattle 3, 312, 0, Route111_Text_16F9EC + trainerbattle 3, OPPONENT_VICKY, 0, Route111_Text_16F9EC msgbox Route111_Text_16FA22, 4 closebutton move 4, Route111_Movement_1A0841 @@ -371,27 +371,27 @@ Route111_EventScript_15039E:: @ 815039E end Route111_EventScript_1503A7:: @ 81503A7 - trainerbattle 0, 211, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7 + trainerbattle 0, OPPONENT_DREW, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7 msgbox Route111_Text_1BAC10, 6 end Route111_EventScript_1503BE:: @ 81503BE - trainerbattle 0, 469, 0, Route111_Text_1BAC60, Route111_Text_1BACC5 + trainerbattle 0, OPPONENT_HEIDI, 0, Route111_Text_1BAC60, Route111_Text_1BACC5 msgbox Route111_Text_1BACD8, 6 end Route111_EventScript_1503D5:: @ 81503D5 - trainerbattle 0, 212, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3 + trainerbattle 0, OPPONENT_CLIFF, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3 msgbox Route111_Text_1BADC2, 6 end Route111_EventScript_1503EC:: @ 81503EC - trainerbattle 0, 470, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E + trainerbattle 0, OPPONENT_BECKY, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E msgbox Route111_Text_1BAE81, 6 end Route111_EventScript_150403:: @ 8150403 - trainerbattle 0, 44, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 + trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 specialval RESULT, 57 compare RESULT, 1 jumpeq Route111_EventScript_15042A @@ -399,27 +399,27 @@ Route111_EventScript_150403:: @ 8150403 end Route111_EventScript_15042A:: @ 815042A - trainerbattle 5, 44, 0, Route111_Text_1BAFC1, Route111_Text_1BB034 + trainerbattle 5, OPPONENT_DUSTY_1, 0, Route111_Text_1BAFC1, Route111_Text_1BB034 msgbox Route111_Text_1BB070, 6 end Route111_EventScript_150441:: @ 8150441 - trainerbattle 0, 218, 0, Route111_Text_1BB111, Route111_Text_1BB140 + trainerbattle 0, OPPONENT_TRAVIS, 0, Route111_Text_1BB111, Route111_Text_1BB140 msgbox Route111_Text_1BB15B, 6 end Route111_EventScript_150458:: @ 8150458 - trainerbattle 0, 476, 0, Route111_Text_1BB199, Route111_Text_1BB1D8 + trainerbattle 0, OPPONENT_IRENE, 0, Route111_Text_1BB199, Route111_Text_1BB1D8 msgbox Route111_Text_1BB1F6, 6 end Route111_EventScript_15046F:: @ 815046F - trainerbattle 0, 189, 0, Route111_Text_1BB250, Route111_Text_1BB27E + trainerbattle 0, OPPONENT_DAISUKE, 0, Route111_Text_1BB250, Route111_Text_1BB27E msgbox Route111_Text_1BB290, 6 end Route111_EventScript_150486:: @ 8150486 - trainerbattle 0, 78, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 + trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 specialval RESULT, 57 compare RESULT, 1 jumpeq Route111_EventScript_1504AD @@ -427,12 +427,12 @@ Route111_EventScript_150486:: @ 8150486 end Route111_EventScript_1504AD:: @ 81504AD - trainerbattle 5, 78, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA + trainerbattle 5, OPPONENT_WILTON_1, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA msgbox Route111_Text_1BB40E, 6 end Route111_EventScript_1504C4:: @ 81504C4 - trainerbattle 0, 94, 0, Route111_Text_1BB44F, Route111_Text_1BB49F + trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F specialval RESULT, 57 compare RESULT, 1 jumpeq Route111_EventScript_1504EB @@ -440,6 +440,6 @@ Route111_EventScript_1504C4:: @ 81504C4 end Route111_EventScript_1504EB:: @ 81504EB - trainerbattle 5, 94, 0, Route111_Text_1BB529, Route111_Text_1BB5A2 + trainerbattle 5, OPPONENT_BROOKE_1, 0, Route111_Text_1BB529, Route111_Text_1BB5A2 msgbox Route111_Text_1BB5C1, 6 end diff --git a/data/scripts/maps/Route112.s b/data/scripts/maps/Route112.s index e6853005d..c2ad14a02 100644 --- a/data/scripts/maps/Route112.s +++ b/data/scripts/maps/Route112.s @@ -32,12 +32,12 @@ Route112_EventScript_150540:: @ 8150540 end Route112_EventScript_150549:: @ 8150549 - trainerbattle 0, 626, 0, Route112_Text_1BB619, Route112_Text_1BB655 + trainerbattle 0, OPPONENT_BRICE, 0, Route112_Text_1BB619, Route112_Text_1BB655 msgbox Route112_Text_1BB667, 6 end Route112_EventScript_150560:: @ 8150560 - trainerbattle 0, 627, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 + trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 specialval RESULT, 57 compare RESULT, 1 jumpeq Route112_EventScript_150587 @@ -45,16 +45,16 @@ Route112_EventScript_150560:: @ 8150560 end Route112_EventScript_150587:: @ 8150587 - trainerbattle 5, 627, 0, Route112_Text_1BB7C7, Route112_Text_1BB801 + trainerbattle 5, OPPONENT_TRENT_1, 0, Route112_Text_1BB7C7, Route112_Text_1BB801 msgbox Route112_Text_1BB819, 6 end Route112_EventScript_15059E:: @ 815059E - trainerbattle 0, 213, 0, Route112_Text_1BB893, Route112_Text_1BB8B6 + trainerbattle 0, OPPONENT_LARRY, 0, Route112_Text_1BB893, Route112_Text_1BB8B6 msgbox Route112_Text_1BB8BE, 6 end Route112_EventScript_1505B5:: @ 81505B5 - trainerbattle 0, 471, 0, Route112_Text_1BB8F0, Route112_Text_1BB942 + trainerbattle 0, OPPONENT_CAROL, 0, Route112_Text_1BB8F0, Route112_Text_1BB942 msgbox Route112_Text_1BB958, 6 end diff --git a/data/scripts/maps/Route113.s b/data/scripts/maps/Route113.s index a7a6807d4..c07f537d1 100644 --- a/data/scripts/maps/Route113.s +++ b/data/scripts/maps/Route113.s @@ -49,17 +49,17 @@ Route113_EventScript_150632:: @ 8150632 end Route113_EventScript_15063B:: @ 815063B - trainerbattle 0, 326, 0, Route113_Text_1BB9BA, Route113_Text_1BB9E6 + trainerbattle 0, OPPONENT_NEAL, 0, Route113_Text_1BB9BA, Route113_Text_1BB9E6 msgbox Route113_Text_1BB9FB, 6 end Route113_EventScript_150652:: @ 8150652 - trainerbattle 0, 327, 0, Route113_Text_1BBA62, Route113_Text_1BBA9B + trainerbattle 0, OPPONENT_DILLON, 0, Route113_Text_1BBA62, Route113_Text_1BBA9B msgbox Route113_Text_1BBAB7, 6 end Route113_EventScript_150669:: @ 8150669 - trainerbattle 0, 434, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A + trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A specialval RESULT, 57 compare RESULT, 1 jumpeq Route113_EventScript_150690 @@ -67,12 +67,12 @@ Route113_EventScript_150669:: @ 8150669 end Route113_EventScript_150690:: @ 8150690 - trainerbattle 5, 434, 0, Route113_Text_1BBBCE, Route113_Text_1BBC0D + trainerbattle 5, OPPONENT_MADELINE_1, 0, Route113_Text_1BBBCE, Route113_Text_1BBC0D msgbox Route113_Text_1BBC1C, 6 end Route113_EventScript_1506A7:: @ 81506A7 - trainerbattle 0, 419, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 + trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 specialval RESULT, 57 compare RESULT, 1 jumpeq Route113_EventScript_1506CE @@ -80,21 +80,21 @@ Route113_EventScript_1506A7:: @ 81506A7 end Route113_EventScript_1506CE:: @ 81506CE - trainerbattle 5, 419, 0, Route113_Text_1BBCE6, Route113_Text_1BBD1D + trainerbattle 5, OPPONENT_LAO_1, 0, Route113_Text_1BBCE6, Route113_Text_1BBD1D msgbox Route113_Text_1BBD38, 6 end Route113_EventScript_1506E5:: @ 81506E5 - trainerbattle 0, 420, 0, Route113_Text_1BBD92, Route113_Text_1BBDC6 + trainerbattle 0, OPPONENT_LUNG, 0, Route113_Text_1BBD92, Route113_Text_1BBDC6 msgbox Route113_Text_1BBE1D, 6 end Route113_EventScript_1506FC:: @ 81506FC - trainerbattle 4, 677, 0, Route113_Text_1BBE65, Route113_Text_1BBEA1, Route113_Text_1BBF25 + trainerbattle 4, OPPONENT_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, 677, 0, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021 + trainerbattle 4, OPPONENT_TORI_AND_TIA, 0, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021 msgbox Route113_Text_1BBFE2, 6 end diff --git a/data/scripts/maps/Route114.s b/data/scripts/maps/Route114.s index 4f43cf3ad..33e89be70 100644 --- a/data/scripts/maps/Route114.s +++ b/data/scripts/maps/Route114.s @@ -66,27 +66,27 @@ Route114_EventScript_1507E8:: @ 81507E8 end Route114_EventScript_1507F1:: @ 81507F1 - trainerbattle 0, 628, 0, Route114_Text_1BC05B, Route114_Text_1BC0B5 + trainerbattle 0, OPPONENT_LENNY, 0, Route114_Text_1BC05B, Route114_Text_1BC0B5 msgbox Route114_Text_1BC0C3, 6 end Route114_EventScript_150808:: @ 8150808 - trainerbattle 0, 629, 0, Route114_Text_1BC125, Route114_Text_1BC163 + trainerbattle 0, OPPONENT_LUCAS_1, 0, Route114_Text_1BC125, Route114_Text_1BC163 msgbox Route114_Text_1BC184, 6 end Route114_EventScript_15081F:: @ 815081F - trainerbattle 0, 214, 0, Route114_Text_1BC1C8, Route114_Text_1BC23F + trainerbattle 0, OPPONENT_SHANE, 0, Route114_Text_1BC1C8, Route114_Text_1BC23F msgbox Route114_Text_1BC24F, 6 end Route114_EventScript_150836:: @ 8150836 - trainerbattle 0, 472, 0, Route114_Text_1BC289, Route114_Text_1BC2BE + trainerbattle 0, OPPONENT_NANCY, 0, Route114_Text_1BC289, Route114_Text_1BC2BE msgbox Route114_Text_1BC2C6, 6 end Route114_EventScript_15084D:: @ 815084D - trainerbattle 0, 143, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 + trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 specialval RESULT, 57 compare RESULT, 1 jumpeq Route114_EventScript_150874 @@ -94,12 +94,12 @@ Route114_EventScript_15084D:: @ 815084D end Route114_EventScript_150874:: @ 8150874 - trainerbattle 5, 143, 0, Route114_Text_1BC3B3, Route114_Text_1BC3E0 + trainerbattle 5, OPPONENT_STEVE_1, 0, Route114_Text_1BC3B3, Route114_Text_1BC3E0 msgbox Route114_Text_1BC40F, 6 end Route114_EventScript_15088B:: @ 815088B - trainerbattle 0, 206, 0, Route114_Text_1BC45A, Route114_Text_1BC499 + trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 specialval RESULT, 57 compare RESULT, 1 jumpeq Route114_EventScript_1508B2 @@ -107,26 +107,26 @@ Route114_EventScript_15088B:: @ 815088B end Route114_EventScript_1508B2:: @ 81508B2 - trainerbattle 5, 206, 0, Route114_Text_1BC525, Route114_Text_1BC559 + trainerbattle 5, OPPONENT_BERNIE_1, 0, Route114_Text_1BC525, Route114_Text_1BC559 msgbox Route114_Text_1BC58C, 6 end Route114_EventScript_1508C9:: @ 81508C9 - trainerbattle 0, 338, 0, Route114_Text_1BC5FC, Route114_Text_1BC653 + trainerbattle 0, OPPONENT_CLAUDE, 0, Route114_Text_1BC5FC, Route114_Text_1BC653 msgbox Route114_Text_1BC679, 6 end Route114_EventScript_1508E0:: @ 81508E0 - trainerbattle 0, 342, 0, Route114_Text_1BC6EC, Route114_Text_1BC750 + trainerbattle 0, OPPONENT_NOLAN, 0, Route114_Text_1BC6EC, Route114_Text_1BC750 msgbox Route114_Text_1BC78A, 6 end Route114_EventScript_1508F7:: @ 81508F7 - trainerbattle 4, 679, 0, Route114_Text_1BC7E3, Route114_Text_1BC834, Route114_Text_1BC88A + trainerbattle 4, OPPONENT_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, 679, 0, Route114_Text_1BC8D8, Route114_Text_1BC8FB, Route114_Text_1BC96A + trainerbattle 4, OPPONENT_TYRA_AND_IVY, 0, Route114_Text_1BC8D8, Route114_Text_1BC8FB, Route114_Text_1BC96A msgbox Route114_Text_1BC91E, 6 end diff --git a/data/scripts/maps/Route115.s b/data/scripts/maps/Route115.s index f6a51ddac..e2c00f6fc 100644 --- a/data/scripts/maps/Route115.s +++ b/data/scripts/maps/Route115.s @@ -14,7 +14,7 @@ Route115_EventScript_150940:: @ 8150940 end Route115_EventScript_150949:: @ 8150949 - trainerbattle 0, 307, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 + trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 specialval RESULT, 57 compare RESULT, 1 jumpeq Route115_EventScript_150970 @@ -22,17 +22,17 @@ Route115_EventScript_150949:: @ 8150949 end Route115_EventScript_150970:: @ 8150970 - trainerbattle 5, 307, 0, Route115_Text_1BCA6B, Route115_Text_1BCAB3 + trainerbattle 5, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BCA6B, Route115_Text_1BCAB3 msgbox Route115_Text_1BCAC6, 6 end Route115_EventScript_150987:: @ 8150987 - trainerbattle 0, 182, 0, Route115_Text_1BCB0D, Route115_Text_1BCB2E + trainerbattle 0, OPPONENT_KOICHI, 0, Route115_Text_1BCB0D, Route115_Text_1BCB2E msgbox Route115_Text_1BCB40, 6 end Route115_EventScript_15099E:: @ 815099E - trainerbattle 0, 183, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 + trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 specialval RESULT, 57 compare RESULT, 1 jumpeq Route115_EventScript_1509C5 @@ -40,12 +40,12 @@ Route115_EventScript_15099E:: @ 815099E end Route115_EventScript_1509C5:: @ 81509C5 - trainerbattle 5, 183, 0, Route115_Text_1BCC4C, Route115_Text_1BCCA2 + trainerbattle 5, OPPONENT_NOB_1, 0, Route115_Text_1BCC4C, Route115_Text_1BCCA2 msgbox Route115_Text_1BCCBA, 6 end Route115_EventScript_1509DC:: @ 81509DC - trainerbattle 0, 427, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 + trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 specialval RESULT, 57 compare RESULT, 1 jumpeq Route115_EventScript_150A03 @@ -53,7 +53,7 @@ Route115_EventScript_1509DC:: @ 81509DC end Route115_EventScript_150A03:: @ 8150A03 - trainerbattle 5, 427, 0, Route115_Text_1BCDB0, Route115_Text_1BCDD0 + trainerbattle 5, OPPONENT_CYNDY_1, 0, Route115_Text_1BCDB0, Route115_Text_1BCDD0 msgbox Route115_Text_1BCDEF, 6 end diff --git a/data/scripts/maps/Route116.s b/data/scripts/maps/Route116.s index 2a1a29409..c563dce46 100644 --- a/data/scripts/maps/Route116.s +++ b/data/scripts/maps/Route116.s @@ -229,17 +229,17 @@ Route116_Movement_150C57:: @ 8150C57 step_end Route116_EventScript_150C62:: @ 8150C62 - trainerbattle 0, 322, 0, Route116_Text_1BD02B, Route116_Text_1BD04C + trainerbattle 0, OPPONENT_JOEY, 0, Route116_Text_1BD02B, Route116_Text_1BD04C msgbox Route116_Text_1BD078, 6 end Route116_EventScript_150C79:: @ 8150C79 - trainerbattle 0, 617, 0, Route116_Text_1BD0AF, Route116_Text_1BD0D7 + trainerbattle 0, OPPONENT_JOSE, 0, Route116_Text_1BD0AF, Route116_Text_1BD0D7 msgbox Route116_Text_1BD0F4, 6 end Route116_EventScript_150C90:: @ 8150C90 - trainerbattle 0, 273, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A + trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A specialval RESULT, 57 compare RESULT, 1 jumpeq Route116_EventScript_150CB7 @@ -247,22 +247,22 @@ Route116_EventScript_150C90:: @ 8150C90 end Route116_EventScript_150CB7:: @ 8150CB7 - trainerbattle 5, 273, 0, Route116_Text_1BD2A5, Route116_Text_1BD2FE + trainerbattle 5, OPPONENT_JERRY_1, 0, Route116_Text_1BD2A5, Route116_Text_1BD2FE msgbox Route116_Text_1BD31A, 6 end Route116_EventScript_150CCE:: @ 8150CCE - trainerbattle 0, 631, 0, Route116_Text_1BCF79, Route116_Text_1BCFBB + trainerbattle 0, OPPONENT_CLARK, 0, Route116_Text_1BCF79, Route116_Text_1BCFBB msgbox Route116_Text_1BCFE3, 6 end Route116_EventScript_150CE5:: @ 8150CE5 - trainerbattle 0, 605, 0, Route116_Text_1BD131, Route116_Text_1BD165 + trainerbattle 0, OPPONENT_JANICE, 0, Route116_Text_1BD131, Route116_Text_1BD165 msgbox Route116_Text_1BD180, 6 end Route116_EventScript_150CFC:: @ 8150CFC - trainerbattle 0, 280, 0, Route116_Text_1BD377, Route116_Text_1BD3AC + trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC specialval RESULT, 57 compare RESULT, 1 jumpeq Route116_EventScript_150D23 @@ -270,6 +270,6 @@ Route116_EventScript_150CFC:: @ 8150CFC end Route116_EventScript_150D23:: @ 8150D23 - trainerbattle 5, 280, 0, Route116_Text_1BD405, Route116_Text_1BD44A + trainerbattle 5, OPPONENT_KAREN_1, 0, Route116_Text_1BD405, Route116_Text_1BD44A msgbox Route116_Text_1BD466, 6 end diff --git a/data/scripts/maps/Route117.s b/data/scripts/maps/Route117.s index 155a94bce..8c738ffff 100644 --- a/data/scripts/maps/Route117.s +++ b/data/scripts/maps/Route117.s @@ -39,7 +39,7 @@ Route117_EventScript_150D84:: @ 8150D84 end Route117_EventScript_150D8D:: @ 8150D8D - trainerbattle 0, 538, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 + trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 specialval RESULT, 57 compare RESULT, 1 jumpeq Route117_EventScript_150DB4 @@ -47,12 +47,12 @@ Route117_EventScript_150D8D:: @ 8150D8D end Route117_EventScript_150DB4:: @ 8150DB4 - trainerbattle 5, 538, 0, Route117_Text_1BD569, Route117_Text_1BD5AB + trainerbattle 5, OPPONENT_ISAAC_1, 0, Route117_Text_1BD569, Route117_Text_1BD5AB msgbox Route117_Text_1BD5F2, 6 end Route117_EventScript_150DCB:: @ 8150DCB - trainerbattle 0, 545, 0, Route117_Text_1BD634, Route117_Text_1BD67B + trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B specialval RESULT, 57 compare RESULT, 1 jumpeq Route117_EventScript_150DF2 @@ -60,12 +60,12 @@ Route117_EventScript_150DCB:: @ 8150DCB end Route117_EventScript_150DF2:: @ 8150DF2 - trainerbattle 5, 545, 0, Route117_Text_1BD6F2, Route117_Text_1BD733 + trainerbattle 5, OPPONENT_LYDIA_1, 0, Route117_Text_1BD6F2, Route117_Text_1BD733 msgbox Route117_Text_1BD74F, 6 end Route117_EventScript_150E09:: @ 8150E09 - trainerbattle 0, 364, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 + trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 specialval RESULT, 57 compare RESULT, 1 jumpeq Route117_EventScript_150E30 @@ -73,12 +73,12 @@ Route117_EventScript_150E09:: @ 8150E09 end Route117_EventScript_150E30:: @ 8150E30 - trainerbattle 5, 364, 0, Route117_Text_1BD83F, Route117_Text_1BD8A2 + trainerbattle 5, OPPONENT_DYLAN_1, 0, Route117_Text_1BD83F, Route117_Text_1BD8A2 msgbox Route117_Text_1BD8BD, 6 end Route117_EventScript_150E47:: @ 8150E47 - trainerbattle 0, 369, 0, Route117_Text_1BD914, Route117_Text_1BD965 + trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 specialval RESULT, 57 compare RESULT, 1 jumpeq Route117_EventScript_150E6E @@ -86,17 +86,17 @@ Route117_EventScript_150E47:: @ 8150E47 end Route117_EventScript_150E6E:: @ 8150E6E - trainerbattle 5, 369, 0, Route117_Text_1BD9F1, Route117_Text_1BDA41 + trainerbattle 5, OPPONENT_MARIA_1, 0, Route117_Text_1BD9F1, Route117_Text_1BDA41 msgbox Route117_Text_1BDA6B, 6 end Route117_EventScript_150E85:: @ 8150E85 - trainerbattle 0, 227, 0, Route117_Text_1BDAA7, Route117_Text_1BDAFC + trainerbattle 0, OPPONENT_DEREK, 0, Route117_Text_1BDAA7, Route117_Text_1BDAFC msgbox Route117_Text_1BDB24, 6 end Route117_EventScript_150E9C:: @ 8150E9C - trainerbattle 4, 287, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 + trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 specialval RESULT, 57 compare RESULT, 1 jumpeq Route117_EventScript_150EC7 @@ -104,12 +104,12 @@ Route117_EventScript_150E9C:: @ 8150E9C end Route117_EventScript_150EC7:: @ 8150EC7 - trainerbattle 7, 287, 0, Route117_Text_1BDDEF, Route117_Text_1BDE2F, Route117_Text_1BDEA7 + trainerbattle 7, OPPONENT_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, 287, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B + trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B specialval RESULT, 57 compare RESULT, 1 jumpeq Route117_EventScript_150F0D @@ -117,6 +117,6 @@ Route117_EventScript_150EE2:: @ 8150EE2 end Route117_EventScript_150F0D:: @ 8150F0D - trainerbattle 7, 287, 0, Route117_Text_1BDEE3, Route117_Text_1BDF26, Route117_Text_1BDF90 + trainerbattle 7, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDEE3, Route117_Text_1BDF26, Route117_Text_1BDF90 msgbox Route117_Text_1BDF37, 6 end diff --git a/data/scripts/maps/Route118.s b/data/scripts/maps/Route118.s index f8e25a002..4d739ce68 100644 --- a/data/scripts/maps/Route118.s +++ b/data/scripts/maps/Route118.s @@ -160,7 +160,7 @@ Route118_Movement_151086:: @ 8151086 step_end Route118_EventScript_15108F:: @ 815108F - trainerbattle 0, 37, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C + trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C specialval RESULT, 57 compare RESULT, 1 jumpeq Route118_EventScript_1510B6 @@ -168,22 +168,22 @@ Route118_EventScript_15108F:: @ 815108F end Route118_EventScript_1510B6:: @ 81510B6 - trainerbattle 5, 37, 0, Route118_Text_1BE0AB, Route118_Text_1BE0D3 + trainerbattle 5, OPPONENT_ROSE_1, 0, Route118_Text_1BE0AB, Route118_Text_1BE0D3 msgbox Route118_Text_1BE104, 6 end Route118_EventScript_1510CD:: @ 81510CD - trainerbattle 0, 343, 0, Route118_Text_1BE24A, Route118_Text_1BE291 + trainerbattle 0, OPPONENT_BARNY, 0, Route118_Text_1BE24A, Route118_Text_1BE291 msgbox Route118_Text_1BE2BE, 6 end Route118_EventScript_1510E4:: @ 81510E4 - trainerbattle 0, 344, 0, Route118_Text_1BE318, Route118_Text_1BE385 + trainerbattle 0, OPPONENT_WADE, 0, Route118_Text_1BE318, Route118_Text_1BE385 msgbox Route118_Text_1BE39C, 6 end Route118_EventScript_1510FB:: @ 81510FB - trainerbattle 0, 196, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 + trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 specialval RESULT, 57 compare RESULT, 1 jumpeq Route118_EventScript_151122 @@ -191,16 +191,16 @@ Route118_EventScript_1510FB:: @ 81510FB end Route118_EventScript_151122:: @ 8151122 - trainerbattle 5, 196, 0, Route118_Text_1BE489, Route118_Text_1BE4CC + trainerbattle 5, OPPONENT_DALTON_1, 0, Route118_Text_1BE489, Route118_Text_1BE4CC msgbox Route118_Text_1BE4D9, 6 end Route118_EventScript_151139:: @ 8151139 - trainerbattle 0, 398, 0, Route118_Text_1BE148, Route118_Text_1BE188 + trainerbattle 0, OPPONENT_PERRY, 0, Route118_Text_1BE148, Route118_Text_1BE188 msgbox Route118_Text_1BE19D, 6 end Route118_EventScript_151150:: @ 8151150 - trainerbattle 0, 408, 0, Route118_Text_1BE1D7, Route118_Text_1BE1F5 + trainerbattle 0, OPPONENT_CHESTER, 0, Route118_Text_1BE1D7, Route118_Text_1BE1F5 msgbox Route118_Text_1BE20D, 6 end diff --git a/data/scripts/maps/Route119.s b/data/scripts/maps/Route119.s index 4bf0e6888..1ccc972bb 100644 --- a/data/scripts/maps/Route119.s +++ b/data/scripts/maps/Route119.s @@ -96,17 +96,17 @@ Route119_EventScript_15125E:: @ 815125E end Route119_EventScript_15128D:: @ 815128D - trainerbattle 3, 534, 0, Route119_Text_171156 + trainerbattle 3, OPPONENT_MAY_6, 0, Route119_Text_171156 jump Route119_EventScript_1512BD end Route119_EventScript_15129D:: @ 815129D - trainerbattle 3, 537, 0, Route119_Text_171156 + trainerbattle 3, OPPONENT_MAY_9, 0, Route119_Text_171156 jump Route119_EventScript_1512BD end Route119_EventScript_1512AD:: @ 81512AD - trainerbattle 3, 531, 0, Route119_Text_171156 + trainerbattle 3, OPPONENT_MAY_3, 0, Route119_Text_171156 jump Route119_EventScript_1512BD end @@ -126,17 +126,17 @@ Route119_EventScript_1512D8:: @ 81512D8 end Route119_EventScript_151307:: @ 8151307 - trainerbattle 3, 525, 0, Route119_Text_1713E2 + trainerbattle 3, OPPONENT_BRENDAN_6, 0, Route119_Text_1713E2 jump Route119_EventScript_151337 end Route119_EventScript_151317:: @ 8151317 - trainerbattle 3, 528, 0, Route119_Text_1713E2 + trainerbattle 3, OPPONENT_BRENDAN_9, 0, Route119_Text_1713E2 jump Route119_EventScript_151337 end Route119_EventScript_151327:: @ 8151327 - trainerbattle 3, 522, 0, Route119_Text_1713E2 + trainerbattle 3, OPPONENT_BRENDAN_3, 0, Route119_Text_1713E2 jump Route119_EventScript_151337 end @@ -265,37 +265,37 @@ Route119_EventScript_15142C:: @ 815142C end Route119_EventScript_151435:: @ 8151435 - trainerbattle 0, 223, 0, Route119_Text_1BE521, Route119_Text_1BE54F + trainerbattle 0, OPPONENT_BRENT, 0, Route119_Text_1BE521, Route119_Text_1BE54F msgbox Route119_Text_1BE561, 6 end Route119_EventScript_15144C:: @ 815144C - trainerbattle 0, 224, 0, Route119_Text_1BE5A4, Route119_Text_1BE5DF + trainerbattle 0, OPPONENT_DONALD, 0, Route119_Text_1BE5A4, Route119_Text_1BE5DF msgbox Route119_Text_1BE5F8, 6 end Route119_EventScript_151463:: @ 8151463 - trainerbattle 0, 225, 0, Route119_Text_1BE632, Route119_Text_1BE67B + trainerbattle 0, OPPONENT_TAYLOR, 0, Route119_Text_1BE632, Route119_Text_1BE67B msgbox Route119_Text_1BE695, 6 end Route119_EventScript_15147A:: @ 815147A - trainerbattle 0, 618, 0, Route119_Text_1BE6EA, Route119_Text_1BE729 + trainerbattle 0, OPPONENT_DOUG, 0, Route119_Text_1BE6EA, Route119_Text_1BE729 msgbox Route119_Text_1BE748, 6 end Route119_EventScript_151491:: @ 8151491 - trainerbattle 0, 619, 0, Route119_Text_1BE784, Route119_Text_1BE7D3 + trainerbattle 0, OPPONENT_GREG, 0, Route119_Text_1BE784, Route119_Text_1BE7D3 msgbox Route119_Text_1BE7E9, 6 end Route119_EventScript_1514A8:: @ 81514A8 - trainerbattle 0, 620, 0, Route119_Text_1BE82F, Route119_Text_1BE88D + trainerbattle 0, OPPONENT_KENT, 0, Route119_Text_1BE82F, Route119_Text_1BE88D msgbox Route119_Text_1BE89A, 6 end Route119_EventScript_1514BF:: @ 81514BF - trainerbattle 0, 552, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E + trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E specialval RESULT, 57 compare RESULT, 1 jumpeq Route119_EventScript_1514E6 @@ -303,12 +303,12 @@ Route119_EventScript_1514BF:: @ 81514BF end Route119_EventScript_1514E6:: @ 81514E6 - trainerbattle 5, 552, 0, Route119_Text_1BE98D, Route119_Text_1BE9D0 + trainerbattle 5, OPPONENT_JACKSON_1, 0, Route119_Text_1BE98D, Route119_Text_1BE9D0 msgbox Route119_Text_1BE9E8, 6 end Route119_EventScript_1514FD:: @ 81514FD - trainerbattle 0, 559, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 + trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 specialval RESULT, 57 compare RESULT, 1 jumpeq Route119_EventScript_151524 @@ -316,37 +316,37 @@ Route119_EventScript_1514FD:: @ 81514FD end Route119_EventScript_151524:: @ 8151524 - trainerbattle 5, 559, 0, Route119_Text_1BEB22, Route119_Text_1BEB49 + trainerbattle 5, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEB22, Route119_Text_1BEB49 msgbox Route119_Text_1BEB68, 6 end Route119_EventScript_15153B:: @ 815153B - trainerbattle 0, 399, 0, Route119_Text_1BEBC0, Route119_Text_1BEC1C + trainerbattle 0, OPPONENT_HUGH, 0, Route119_Text_1BEBC0, Route119_Text_1BEC1C msgbox Route119_Text_1BEC2A, 6 end Route119_EventScript_151552:: @ 8151552 - trainerbattle 0, 400, 0, Route119_Text_1BEC5E, Route119_Text_1BEC9A + trainerbattle 0, OPPONENT_PHIL, 0, Route119_Text_1BEC5E, Route119_Text_1BEC9A msgbox Route119_Text_1BECB1, 6 end Route119_EventScript_151569:: @ 8151569 - trainerbattle 0, 415, 0, Route119_Text_1BECF1, Route119_Text_1BED4C + trainerbattle 0, OPPONENT_YASU, 0, Route119_Text_1BECF1, Route119_Text_1BED4C msgbox Route119_Text_1BED5C, 6 end Route119_EventScript_151580:: @ 8151580 - trainerbattle 0, 416, 0, Route119_Text_1BEDB6, Route119_Text_1BEDEC + trainerbattle 0, OPPONENT_TAKASHI, 0, Route119_Text_1BEDB6, Route119_Text_1BEDEC msgbox Route119_Text_1BEE06, 6 end Route119_EventScript_151597:: @ 8151597 - trainerbattle 0, 651, 0, Route119_Text_1BEE2D, Route119_Text_1BEE4B + trainerbattle 0, OPPONENT_HIDEO_2, 0, Route119_Text_1BEE2D, Route119_Text_1BEE4B msgbox Route119_Text_1BEE66, 6 end Route119_EventScript_1515AE:: @ 81515AE - trainerbattle 0, 693, 0, Route119_Text_1BEED0, Route119_Text_1BEF37 + trainerbattle 0, OPPONENT_EUGENE, 0, Route119_Text_1BEED0, Route119_Text_1BEF37 msgbox Route119_Text_1BEF67, 6 end diff --git a/data/scripts/maps/Route120.s b/data/scripts/maps/Route120.s index 9d8f4cd5c..ada773ffd 100644 --- a/data/scripts/maps/Route120.s +++ b/data/scripts/maps/Route120.s @@ -286,12 +286,12 @@ Route120_EventScript_1519AA:: @ 81519AA end Route120_EventScript_1519B3:: @ 81519B3 - trainerbattle 0, 405, 0, Route120_Text_1BEFC8, Route120_Text_1BF000 + trainerbattle 0, OPPONENT_COLIN, 0, Route120_Text_1BEFC8, Route120_Text_1BF000 msgbox Route120_Text_1BF015, 6 end Route120_EventScript_1519CA:: @ 81519CA - trainerbattle 0, 406, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 + trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 specialval RESULT, 57 compare RESULT, 1 jumpeq Route120_EventScript_1519F1 @@ -299,22 +299,22 @@ Route120_EventScript_1519CA:: @ 81519CA end Route120_EventScript_1519F1:: @ 81519F1 - trainerbattle 5, 406, 0, Route120_Text_1BF0FA, Route120_Text_1BF131 + trainerbattle 5, OPPONENT_ROBERT_1, 0, Route120_Text_1BF0FA, Route120_Text_1BF131 msgbox Route120_Text_1BF154, 6 end Route120_EventScript_151A08:: @ 8151A08 - trainerbattle 0, 553, 0, Route120_Text_1BF193, Route120_Text_1BF1D4 + trainerbattle 0, OPPONENT_CARLOS, 0, Route120_Text_1BF193, Route120_Text_1BF1D4 msgbox Route120_Text_1BF215, 6 end Route120_EventScript_151A1F:: @ 8151A1F - trainerbattle 0, 560, 0, Route120_Text_1BF26E, Route120_Text_1BF2D2 + trainerbattle 0, OPPONENT_JENNA, 0, Route120_Text_1BF26E, Route120_Text_1BF2D2 msgbox Route120_Text_1BF2EA, 6 end Route120_EventScript_151A36:: @ 8151A36 - trainerbattle 0, 226, 0, Route120_Text_1BF32B, Route120_Text_1BF36B + trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B specialval RESULT, 57 compare RESULT, 1 jumpeq Route120_EventScript_151A5D @@ -322,36 +322,36 @@ Route120_EventScript_151A36:: @ 8151A36 end Route120_EventScript_151A5D:: @ 8151A5D - trainerbattle 5, 226, 0, Route120_Text_1BF3D0, Route120_Text_1BF416 + trainerbattle 5, OPPONENT_BRANDON_1, 0, Route120_Text_1BF3D0, Route120_Text_1BF416 msgbox Route120_Text_1BF43E, 6 end Route120_EventScript_151A74:: @ 8151A74 - trainerbattle 0, 95, 0, Route120_Text_1BF4A0, Route120_Text_1BF504 + trainerbattle 0, OPPONENT_JENNIFER, 0, Route120_Text_1BF4A0, Route120_Text_1BF504 msgbox Route120_Text_1BF51F, 6 end Route120_EventScript_151A8B:: @ 8151A8B - trainerbattle 0, 45, 0, Route120_Text_1BF560, Route120_Text_1BF5D6 + trainerbattle 0, OPPONENT_CHIP, 0, Route120_Text_1BF560, Route120_Text_1BF5D6 msgbox Route120_Text_1BF5F4, 6 end Route120_EventScript_151AA2:: @ 8151AA2 - trainerbattle 0, 435, 0, Route120_Text_1BF65B, Route120_Text_1BF6A4 + trainerbattle 0, OPPONENT_CLARISSA, 0, Route120_Text_1BF65B, Route120_Text_1BF6A4 msgbox Route120_Text_1BF6D0, 6 end Route120_EventScript_151AB9:: @ 8151AB9 - trainerbattle 0, 436, 0, Route120_Text_1BF728, Route120_Text_1BF78C + trainerbattle 0, OPPONENT_ANGELICA, 0, Route120_Text_1BF728, Route120_Text_1BF78C msgbox Route120_Text_1BF7B2, 6 end Route120_EventScript_151AD0:: @ 8151AD0 - trainerbattle 0, 652, 0, Route120_Text_1BF80B, Route120_Text_1BF852 + trainerbattle 0, OPPONENT_KEIGO, 0, Route120_Text_1BF80B, Route120_Text_1BF852 msgbox Route120_Text_1BF891, 6 end Route120_EventScript_151AE7:: @ 8151AE7 - trainerbattle 0, 653, 0, Route120_Text_1BF8C5, Route120_Text_1BF920 + trainerbattle 0, OPPONENT_TSUNAO, 0, Route120_Text_1BF8C5, Route120_Text_1BF920 msgbox Route120_Text_1BF946, 6 end diff --git a/data/scripts/maps/Route121.s b/data/scripts/maps/Route121.s index 49b6031bc..54912b0bc 100644 --- a/data/scripts/maps/Route121.s +++ b/data/scripts/maps/Route121.s @@ -67,12 +67,12 @@ Route121_Movement_151B69:: @ 8151B69 step_end Route121_EventScript_151B72:: @ 8151B72 - trainerbattle 0, 300, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1 + trainerbattle 0, OPPONENT_VANESSA, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1 msgbox Route121_Text_1BF9BA, 6 end Route121_EventScript_151B89:: @ 8151B89 - trainerbattle 0, 254, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C + trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C specialval RESULT, 57 compare RESULT, 1 jumpeq Route121_EventScript_151BB0 @@ -80,27 +80,27 @@ Route121_EventScript_151B89:: @ 8151B89 end Route121_EventScript_151BB0:: @ 8151BB0 - trainerbattle 5, 254, 0, Route121_Text_1BFADA, Route121_Text_1BFB4B + trainerbattle 5, OPPONENT_WALTER_1, 0, Route121_Text_1BFADA, Route121_Text_1BFB4B msgbox Route121_Text_1BFB5C, 6 end Route121_EventScript_151BC7:: @ 8151BC7 - trainerbattle 0, 107, 0, Route121_Text_1BFBB4, Route121_Text_1BFBEE + trainerbattle 0, OPPONENT_TAMMY, 0, Route121_Text_1BFBB4, Route121_Text_1BFBEE msgbox Route121_Text_1BFBFD, 6 end Route121_EventScript_151BDE:: @ 8151BDE - trainerbattle 4, 286, 0, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08 + trainerbattle 4, OPPONENT_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, 286, 0, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D + trainerbattle 4, OPPONENT_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, 127, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 + trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 specialval RESULT, 57 compare RESULT, 1 jumpeq Route121_EventScript_151C3B @@ -108,6 +108,6 @@ Route121_EventScript_151C14:: @ 8151C14 end Route121_EventScript_151C3B:: @ 8151C3B - trainerbattle 5, 127, 0, Route121_Text_1BFEDE, Route121_Text_1BFF0A + trainerbattle 5, OPPONENT_JESSICA_1, 0, Route121_Text_1BFEDE, Route121_Text_1BFF0A msgbox Route121_Text_1BFF3A, 6 end diff --git a/data/scripts/maps/Route123.s b/data/scripts/maps/Route123.s index 958f83c2d..e9248c230 100644 --- a/data/scripts/maps/Route123.s +++ b/data/scripts/maps/Route123.s @@ -46,22 +46,22 @@ Route123_EventScript_151CC8:: @ 8151CC8 end Route123_EventScript_151CD1:: @ 8151CD1 - trainerbattle 0, 92, 0, Route123_Text_1BFF6A, Route123_Text_1BFFA2 + trainerbattle 0, OPPONENT_WENDY, 0, Route123_Text_1BFF6A, Route123_Text_1BFFA2 msgbox Route123_Text_1BFFC1, 6 end Route123_EventScript_151CE8:: @ 8151CE8 - trainerbattle 0, 75, 0, Route123_Text_1BFFF0, Route123_Text_1C0057 + trainerbattle 0, OPPONENT_CLYDE, 0, Route123_Text_1BFFF0, Route123_Text_1C0057 msgbox Route123_Text_1C0075, 6 end Route123_EventScript_151CFF:: @ 8151CFF - trainerbattle 0, 39, 0, Route123_Text_1C009E, Route123_Text_1C00D4 + trainerbattle 0, OPPONENT_VIOLET, 0, Route123_Text_1C009E, Route123_Text_1C00D4 msgbox Route123_Text_1C0100, 6 end Route123_EventScript_151D16:: @ 8151D16 - trainerbattle 0, 238, 0, Route123_Text_1C013F, Route123_Text_1C01A3 + trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 specialval RESULT, 57 compare RESULT, 1 jumpeq Route123_EventScript_151D3D @@ -69,12 +69,12 @@ Route123_EventScript_151D16:: @ 8151D16 end Route123_EventScript_151D3D:: @ 8151D3D - trainerbattle 5, 238, 0, Route123_Text_1C01F9, Route123_Text_1C0240 + trainerbattle 5, OPPONENT_CAMERON_1, 0, Route123_Text_1C01F9, Route123_Text_1C0240 msgbox Route123_Text_1C024E, 6 end Route123_EventScript_151D54:: @ 8151D54 - trainerbattle 0, 249, 0, Route123_Text_1C028C, Route123_Text_1C0303 + trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 specialval RESULT, 57 compare RESULT, 1 jumpeq Route123_EventScript_151D7B @@ -82,21 +82,21 @@ Route123_EventScript_151D54:: @ 8151D54 end Route123_EventScript_151D7B:: @ 8151D7B - trainerbattle 5, 249, 0, Route123_Text_1C0351, Route123_Text_1C0380 + trainerbattle 5, OPPONENT_JACKI_1, 0, Route123_Text_1C0351, Route123_Text_1C0380 msgbox Route123_Text_1C038C, 6 end Route123_EventScript_151D92:: @ 8151D92 - trainerbattle 4, 484, 0, Route123_Text_1C03CB, Route123_Text_1C040E, Route123_Text_1C0462 + trainerbattle 4, OPPONENT_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, 484, 0, Route123_Text_1C049C, Route123_Text_1C04CD, Route123_Text_1C0519 + trainerbattle 4, OPPONENT_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, 106, 0, Route123_Text_1C0554, Route123_Text_1C059F + trainerbattle 0, OPPONENT_KINDRA, 0, Route123_Text_1C0554, Route123_Text_1C059F msgbox Route123_Text_1C05BC, 6 end diff --git a/data/scripts/maps/Route124.s b/data/scripts/maps/Route124.s index 9a665f3b7..ea288daa0 100644 --- a/data/scripts/maps/Route124.s +++ b/data/scripts/maps/Route124.s @@ -12,17 +12,17 @@ Route124_EventScript_151DEF:: @ 8151DEF end Route124_EventScript_151DF8:: @ 8151DF8 - trainerbattle 0, 159, 0, Route124_Text_1C0624, Route124_Text_1C0675 + trainerbattle 0, OPPONENT_SPENCER, 0, Route124_Text_1C0624, Route124_Text_1C0675 msgbox Route124_Text_1C0693, 6 end Route124_EventScript_151E0F:: @ 8151E0F - trainerbattle 0, 160, 0, Route124_Text_1C06F7, Route124_Text_1C0741 + trainerbattle 0, OPPONENT_ROLAND, 0, Route124_Text_1C06F7, Route124_Text_1C0741 msgbox Route124_Text_1C0750, 6 end Route124_EventScript_151E26:: @ 8151E26 - trainerbattle 0, 449, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 + trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 specialval RESULT, 57 compare RESULT, 1 jumpeq Route124_EventScript_151E4D @@ -30,22 +30,22 @@ Route124_EventScript_151E26:: @ 8151E26 end Route124_EventScript_151E4D:: @ 8151E4D - trainerbattle 5, 449, 0, Route124_Text_1C0888, Route124_Text_1C08C8 + trainerbattle 5, OPPONENT_JENNY_1, 0, Route124_Text_1C0888, Route124_Text_1C08C8 msgbox Route124_Text_1C08EA, 6 end Route124_EventScript_151E64:: @ 8151E64 - trainerbattle 0, 450, 0, Route124_Text_1C0936, Route124_Text_1C096B + trainerbattle 0, OPPONENT_GRACE, 0, Route124_Text_1C0936, Route124_Text_1C096B msgbox Route124_Text_1C0994, 6 end Route124_EventScript_151E7B:: @ 8151E7B - trainerbattle 0, 174, 0, Route124_Text_1C09CE, Route124_Text_1C0A2F + trainerbattle 0, OPPONENT_CHAD, 0, Route124_Text_1C09CE, Route124_Text_1C0A2F msgbox Route124_Text_1C0A52, 6 end Route124_EventScript_151E92:: @ 8151E92 - trainerbattle 4, 687, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 + trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 specialval RESULT, 57 compare RESULT, 1 jumpeq Route124_EventScript_151EBD @@ -53,12 +53,12 @@ Route124_EventScript_151E92:: @ 8151E92 end Route124_EventScript_151EBD:: @ 8151EBD - trainerbattle 7, 687, 0, Route124_Text_1C0D1F, Route124_Text_1C0DB5, Route124_Text_1C0E5C + trainerbattle 7, OPPONENT_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, 687, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 + trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 specialval RESULT, 57 compare RESULT, 1 jumpeq Route124_EventScript_151F03 @@ -66,6 +66,6 @@ Route124_EventScript_151ED8:: @ 8151ED8 end Route124_EventScript_151F03:: @ 8151F03 - trainerbattle 7, 687, 0, Route124_Text_1C0EA2, Route124_Text_1C0EE5, Route124_Text_1C0F90 + trainerbattle 7, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0EA2, Route124_Text_1C0EE5, Route124_Text_1C0F90 msgbox Route124_Text_1C0F19, 6 end diff --git a/data/scripts/maps/Route125.s b/data/scripts/maps/Route125.s index 664d25622..0059fe6aa 100644 --- a/data/scripts/maps/Route125.s +++ b/data/scripts/maps/Route125.s @@ -8,27 +8,27 @@ Route125_MapScript1_151F24:: @ 8151F24 end Route125_EventScript_151F2E:: @ 8151F2E - trainerbattle 0, 161, 0, Route125_Text_1C0FCF, Route125_Text_1C1002 + trainerbattle 0, OPPONENT_CODY, 0, Route125_Text_1C0FCF, Route125_Text_1C1002 msgbox Route125_Text_1C1013, 6 end Route125_EventScript_151F45:: @ 8151F45 - trainerbattle 0, 162, 0, Route125_Text_1C104B, Route125_Text_1C1073 + trainerbattle 0, OPPONENT_STAN, 0, Route125_Text_1C104B, Route125_Text_1C1073 msgbox Route125_Text_1C1083, 6 end Route125_EventScript_151F5C:: @ 8151F5C - trainerbattle 0, 451, 0, Route125_Text_1C10C3, Route125_Text_1C10FB + trainerbattle 0, OPPONENT_TANYA, 0, Route125_Text_1C10C3, Route125_Text_1C10FB msgbox Route125_Text_1C110C, 6 end Route125_EventScript_151F73:: @ 8151F73 - trainerbattle 0, 452, 0, Route125_Text_1C1136, Route125_Text_1C1175 + trainerbattle 0, OPPONENT_SHARON, 0, Route125_Text_1C1136, Route125_Text_1C1175 msgbox Route125_Text_1C117F, 6 end Route125_EventScript_151F8A:: @ 8151F8A - trainerbattle 0, 492, 0, Route125_Text_1C11AF, Route125_Text_1C11ED + trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED specialval RESULT, 57 compare RESULT, 1 jumpeq Route125_EventScript_151FB1 @@ -36,16 +36,16 @@ Route125_EventScript_151F8A:: @ 8151F8A end Route125_EventScript_151FB1:: @ 8151FB1 - trainerbattle 5, 492, 0, Route125_Text_1C1282, Route125_Text_1C12C5 + trainerbattle 5, OPPONENT_ERNEST_1, 0, Route125_Text_1C1282, Route125_Text_1C12C5 msgbox Route125_Text_1C12EE, 6 end Route125_EventScript_151FC8:: @ 8151FC8 - trainerbattle 4, 678, 0, Route125_Text_1C13A1, Route125_Text_1C13FF, Route125_Text_1C146E + trainerbattle 4, OPPONENT_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, 678, 0, Route125_Text_1C14AB, Route125_Text_1C14E7, Route125_Text_1C154F + trainerbattle 4, OPPONENT_KIM_AND_IRIS, 0, Route125_Text_1C14AB, Route125_Text_1C14E7, Route125_Text_1C154F msgbox Route125_Text_1C1508, 6 end diff --git a/data/scripts/maps/Route126.s b/data/scripts/maps/Route126.s index 27fee871e..f3d1a77f9 100644 --- a/data/scripts/maps/Route126.s +++ b/data/scripts/maps/Route126.s @@ -8,21 +8,21 @@ Route126_MapScript1_152004:: @ 8152004 end Route126_EventScript_15200E:: @ 815200E - trainerbattle 0, 163, 0, Route126_Text_1C1590, Route126_Text_1C15C3 + trainerbattle 0, OPPONENT_BARRY, 0, Route126_Text_1C1590, Route126_Text_1C15C3 msgbox Route126_Text_1C15D8, 6 end Route126_EventScript_152025:: @ 8152025 - trainerbattle 0, 164, 0, Route126_Text_1C1627, Route126_Text_1C1660 + trainerbattle 0, OPPONENT_DEAN, 0, Route126_Text_1C1627, Route126_Text_1C1660 msgbox Route126_Text_1C166F, 6 end Route126_EventScript_15203C:: @ 815203C - trainerbattle 0, 453, 0, Route126_Text_1C16AB, Route126_Text_1C16C5 + trainerbattle 0, OPPONENT_NIKKI, 0, Route126_Text_1C16AB, Route126_Text_1C16C5 msgbox Route126_Text_1C1702, 6 end Route126_EventScript_152053:: @ 8152053 - trainerbattle 0, 454, 0, Route126_Text_1C1741, Route126_Text_1C1766 + trainerbattle 0, OPPONENT_BRENDA, 0, Route126_Text_1C1741, Route126_Text_1C1766 msgbox Route126_Text_1C1773, 6 end diff --git a/data/scripts/maps/Route127.s b/data/scripts/maps/Route127.s index 4605c3ffe..b4461b253 100644 --- a/data/scripts/maps/Route127.s +++ b/data/scripts/maps/Route127.s @@ -8,36 +8,36 @@ Route127_MapScript1_152070:: @ 8152070 end Route127_EventScript_15207A:: @ 815207A - trainerbattle 0, 374, 0, Route127_Text_1C17A8, Route127_Text_1C17DD + trainerbattle 0, OPPONENT_CALEB, 0, Route127_Text_1C17A8, Route127_Text_1C17DD msgbox Route127_Text_1C17EC, 6 end Route127_EventScript_152091:: @ 8152091 - trainerbattle 0, 384, 0, Route127_Text_1C1828, Route127_Text_1C1860 + trainerbattle 0, OPPONENT_CONNOR, 0, Route127_Text_1C1828, Route127_Text_1C1860 msgbox Route127_Text_1C1877, 6 end Route127_EventScript_1520A8:: @ 81520A8 - trainerbattle 0, 667, 0, Route127_Text_1C18CC, Route127_Text_1C1930 + trainerbattle 0, OPPONENT_JONAH, 0, Route127_Text_1C18CC, Route127_Text_1C1930 msgbox Route127_Text_1C195D, 6 end Route127_EventScript_1520BF:: @ 81520BF - trainerbattle 0, 668, 0, Route127_Text_1C19A3, Route127_Text_1C19D6 + trainerbattle 0, OPPONENT_HENRY, 0, Route127_Text_1C19A3, Route127_Text_1C19D6 msgbox Route127_Text_1C19E7, 6 end Route127_EventScript_1520D6:: @ 81520D6 - trainerbattle 0, 669, 0, Route127_Text_1C1A2E, Route127_Text_1C1A73 + trainerbattle 0, OPPONENT_ROGER, 0, Route127_Text_1C1A2E, Route127_Text_1C1A73 msgbox Route127_Text_1C1AA0, 6 end Route127_EventScript_1520ED:: @ 81520ED - trainerbattle 0, 672, 0, Route127_Text_1C1AE2, Route127_Text_1C1B2A + trainerbattle 0, OPPONENT_KOJI, 0, Route127_Text_1C1AE2, Route127_Text_1C1B2A msgbox Route127_Text_1C1B39, 6 end Route127_EventScript_152104:: @ 8152104 - trainerbattle 0, 674, 0, Route127_Text_1C1B92, Route127_Text_1C1BD9 + trainerbattle 0, OPPONENT_BYRON, 0, Route127_Text_1C1B92, Route127_Text_1C1BD9 msgbox Route127_Text_1C1BEC, 6 end diff --git a/data/scripts/maps/Route128.s b/data/scripts/maps/Route128.s index 9e3c3e924..28317c4e3 100644 --- a/data/scripts/maps/Route128.s +++ b/data/scripts/maps/Route128.s @@ -181,7 +181,7 @@ Route128_Movement_1522A1:: @ 81522A1 step_end Route128_EventScript_1522A4:: @ 81522A4 - trainerbattle 0, 376, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 + trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 specialval RESULT, 57 compare RESULT, 1 jumpeq Route128_EventScript_1522CB @@ -189,12 +189,12 @@ Route128_EventScript_1522A4:: @ 81522A4 end Route128_EventScript_1522CB:: @ 81522CB - trainerbattle 5, 376, 0, Route128_Text_1C1D02, Route128_Text_1C1D45 + trainerbattle 5, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1D02, Route128_Text_1C1D45 msgbox Route128_Text_1C1D6B, 6 end Route128_EventScript_1522E2:: @ 81522E2 - trainerbattle 0, 386, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 + trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 specialval RESULT, 57 compare RESULT, 1 jumpeq Route128_EventScript_152309 @@ -202,21 +202,21 @@ Route128_EventScript_1522E2:: @ 81522E2 end Route128_EventScript_152309:: @ 8152309 - trainerbattle 5, 386, 0, Route128_Text_1C1E90, Route128_Text_1C1EFA + trainerbattle 5, OPPONENT_KATELYN_1, 0, Route128_Text_1C1E90, Route128_Text_1C1EFA msgbox Route128_Text_1C1F2E, 6 end Route128_EventScript_152320:: @ 8152320 - trainerbattle 0, 670, 0, Route128_Text_1C1F6D, Route128_Text_1C1FCC + trainerbattle 0, OPPONENT_ALEXA, 0, Route128_Text_1C1F6D, Route128_Text_1C1FCC msgbox Route128_Text_1C1FE8, 6 end Route128_EventScript_152337:: @ 8152337 - trainerbattle 0, 671, 0, Route128_Text_1C202C, Route128_Text_1C2051 + trainerbattle 0, OPPONENT_RUBEN, 0, Route128_Text_1C202C, Route128_Text_1C2051 msgbox Route128_Text_1C2060, 6 end Route128_EventScript_15234E:: @ 815234E - trainerbattle 0, 673, 0, Route128_Text_1C2090, Route128_Text_1C20FC + trainerbattle 0, OPPONENT_WAYNE, 0, Route128_Text_1C2090, Route128_Text_1C20FC msgbox Route128_Text_1C210D, 6 end diff --git a/data/scripts/maps/Route129.s b/data/scripts/maps/Route129.s index 186c8ad42..ea43c5eab 100644 --- a/data/scripts/maps/Route129.s +++ b/data/scripts/maps/Route129.s @@ -2,21 +2,21 @@ Route129_MapScripts:: @ 8152365 .byte 0 Route129_EventScript_152366:: @ 8152366 - trainerbattle 0, 378, 0, Route129_Text_1C2161, Route129_Text_1C2198 + trainerbattle 0, OPPONENT_CHASE, 0, Route129_Text_1C2161, Route129_Text_1C2198 msgbox Route129_Text_1C21B4, 6 end Route129_EventScript_15237D:: @ 815237D - trainerbattle 0, 387, 0, Route129_Text_1C21ED, Route129_Text_1C222F + trainerbattle 0, OPPONENT_ALLISON, 0, Route129_Text_1C21ED, Route129_Text_1C222F msgbox Route129_Text_1C2243, 6 end Route129_EventScript_152394:: @ 8152394 - trainerbattle 0, 675, 0, Route129_Text_1C22C8, Route129_Text_1C22EC + trainerbattle 0, OPPONENT_REED, 0, Route129_Text_1C22C8, Route129_Text_1C22EC msgbox Route129_Text_1C230F, 6 end Route129_EventScript_1523AB:: @ 81523AB - trainerbattle 0, 676, 0, Route129_Text_1C2349, Route129_Text_1C2378 + trainerbattle 0, OPPONENT_TISHA, 0, Route129_Text_1C2349, Route129_Text_1C2378 msgbox Route129_Text_1C23A3, 6 end diff --git a/data/scripts/maps/Route130.s b/data/scripts/maps/Route130.s index ba2e702bc..38818dba3 100644 --- a/data/scripts/maps/Route130.s +++ b/data/scripts/maps/Route130.s @@ -30,11 +30,11 @@ Route130_EventScript_15240C:: @ 815240C end Route130_EventScript_152410:: @ 8152410 - trainerbattle 0, 165, 0, Route130_Text_1C2401, Route130_Text_1C245D + trainerbattle 0, OPPONENT_RODNEY, 0, Route130_Text_1C2401, Route130_Text_1C245D msgbox Route130_Text_1C2479, 6 end Route130_EventScript_152427:: @ 8152427 - trainerbattle 0, 455, 0, Route130_Text_1C24DC, Route130_Text_1C2525 + trainerbattle 0, OPPONENT_KATIE, 0, Route130_Text_1C24DC, Route130_Text_1C2525 msgbox Route130_Text_1C256E, 6 end diff --git a/data/scripts/maps/Route131.s b/data/scripts/maps/Route131.s index d09ba2852..81cb7dc02 100644 --- a/data/scripts/maps/Route131.s +++ b/data/scripts/maps/Route131.s @@ -12,31 +12,31 @@ Route131_EventScript_15244E:: @ 815244E return Route131_EventScript_152452:: @ 8152452 - trainerbattle 0, 166, 0, Route131_Text_1C25B3, Route131_Text_1C25F8 + trainerbattle 0, OPPONENT_RICHARD, 0, Route131_Text_1C25B3, Route131_Text_1C25F8 msgbox Route131_Text_1C262A, 6 end Route131_EventScript_152469:: @ 8152469 - trainerbattle 0, 167, 0, Route131_Text_1C26B9, Route131_Text_1C271F + trainerbattle 0, OPPONENT_HERMAN, 0, Route131_Text_1C26B9, Route131_Text_1C271F msgbox Route131_Text_1C2726, 6 end Route131_EventScript_152480:: @ 8152480 - trainerbattle 0, 456, 0, Route131_Text_1C2774, Route131_Text_1C27A4 + trainerbattle 0, OPPONENT_SUSIE, 0, Route131_Text_1C2774, Route131_Text_1C27A4 msgbox Route131_Text_1C27CF, 6 end Route131_EventScript_152497:: @ 8152497 - trainerbattle 0, 457, 0, Route131_Text_1C284A, Route131_Text_1C2883 + trainerbattle 0, OPPONENT_KARA, 0, Route131_Text_1C284A, Route131_Text_1C2883 msgbox Route131_Text_1C2898, 6 end Route131_EventScript_1524AE:: @ 81524AE - trainerbattle 4, 686, 0, Route131_Text_1C28E2, Route131_Text_1C2918, Route131_Text_1C29B2 + trainerbattle 4, OPPONENT_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, 686, 0, Route131_Text_1C29F3, Route131_Text_1C2A20, Route131_Text_1C2ACA + trainerbattle 4, OPPONENT_RELI_AND_IAN, 0, Route131_Text_1C29F3, Route131_Text_1C2A20, Route131_Text_1C2ACA msgbox Route131_Text_1C2A5D, 6 end diff --git a/data/scripts/maps/Route132.s b/data/scripts/maps/Route132.s index 9922c8dfa..642330fd4 100644 --- a/data/scripts/maps/Route132.s +++ b/data/scripts/maps/Route132.s @@ -2,21 +2,21 @@ Route132_MapScripts:: @ 81524E4 .byte 0 Route132_EventScript_1524E5:: @ 81524E5 - trainerbattle 0, 169, 0, Route132_Text_1C2AFB, Route132_Text_1C2B5B + trainerbattle 0, OPPONENT_GILBERT, 0, Route132_Text_1C2AFB, Route132_Text_1C2B5B msgbox Route132_Text_1C2B71, 6 end Route132_EventScript_1524FC:: @ 81524FC - trainerbattle 0, 458, 0, Route132_Text_1C2BB5, Route132_Text_1C2BEA + trainerbattle 0, OPPONENT_DANA, 0, Route132_Text_1C2BB5, Route132_Text_1C2BEA msgbox Route132_Text_1C2BFA, 6 end Route132_EventScript_152513:: @ 8152513 - trainerbattle 0, 350, 0, Route132_Text_1C2C32, Route132_Text_1C2C60 + trainerbattle 0, OPPONENT_RONALD, 0, Route132_Text_1C2C32, Route132_Text_1C2C60 msgbox Route132_Text_1C2C78, 6 end Route132_EventScript_15252A:: @ 815252A - trainerbattle 0, 181, 0, Route132_Text_1C2CD9, Route132_Text_1C2D1F + trainerbattle 0, OPPONENT_KIYO, 0, Route132_Text_1C2CD9, Route132_Text_1C2D1F msgbox Route132_Text_1C2D3E, 6 end diff --git a/data/scripts/maps/Route133.s b/data/scripts/maps/Route133.s index 5840c9b2c..78bec4141 100644 --- a/data/scripts/maps/Route133.s +++ b/data/scripts/maps/Route133.s @@ -2,26 +2,26 @@ Route133_MapScripts:: @ 8152541 .byte 0 Route133_EventScript_152542:: @ 8152542 - trainerbattle 0, 170, 0, Route133_Text_1C2DA5, Route133_Text_1C2DF4 + trainerbattle 0, OPPONENT_FRANKLIN, 0, Route133_Text_1C2DA5, Route133_Text_1C2DF4 msgbox Route133_Text_1C2E09, 6 end Route133_EventScript_152559:: @ 8152559 - trainerbattle 0, 460, 0, Route133_Text_1C2E61, Route133_Text_1C2EBD + trainerbattle 0, OPPONENT_DEBRA, 0, Route133_Text_1C2E61, Route133_Text_1C2EBD msgbox Route133_Text_1C2ECD, 6 end Route133_EventScript_152570:: @ 8152570 - trainerbattle 0, 461, 0, Route133_Text_1C2EF7, Route133_Text_1C2F19 + trainerbattle 0, OPPONENT_LINDA, 0, Route133_Text_1C2EF7, Route133_Text_1C2F19 msgbox Route133_Text_1C2F25, 6 end Route133_EventScript_152587:: @ 8152587 - trainerbattle 0, 88, 0, Route133_Text_1C2F53, Route133_Text_1C2FA3 + trainerbattle 0, OPPONENT_WARREN, 0, Route133_Text_1C2F53, Route133_Text_1C2FA3 msgbox Route133_Text_1C2FC7, 6 end Route133_EventScript_15259E:: @ 815259E - trainerbattle 0, 414, 0, Route133_Text_1C302D, Route133_Text_1C305F + trainerbattle 0, OPPONENT_BECK, 0, Route133_Text_1C302D, Route133_Text_1C305F msgbox Route133_Text_1C307E, 6 end diff --git a/data/scripts/maps/Route134.s b/data/scripts/maps/Route134.s index 6c82dc7ac..b1f77fac1 100644 --- a/data/scripts/maps/Route134.s +++ b/data/scripts/maps/Route134.s @@ -7,26 +7,26 @@ Route134_MapScript1_1525BB:: @ 81525BB end Route134_EventScript_1525C4:: @ 81525C4 - trainerbattle 0, 172, 0, Route134_Text_1C30C6, Route134_Text_1C3110 + trainerbattle 0, OPPONENT_JACK, 0, Route134_Text_1C30C6, Route134_Text_1C3110 msgbox Route134_Text_1C311A, 6 end Route134_EventScript_1525DB:: @ 81525DB - trainerbattle 0, 463, 0, Route134_Text_1C315E, Route134_Text_1C3198 + trainerbattle 0, OPPONENT_LAUREL, 0, Route134_Text_1C315E, Route134_Text_1C3198 msgbox Route134_Text_1C31A0, 6 end Route134_EventScript_1525F2:: @ 81525F2 - trainerbattle 0, 413, 0, Route134_Text_1C31D7, Route134_Text_1C3213 + trainerbattle 0, OPPONENT_ALEX, 0, Route134_Text_1C31D7, Route134_Text_1C3213 msgbox Route134_Text_1C3229, 6 end Route134_EventScript_152609:: @ 8152609 - trainerbattle 0, 397, 0, Route134_Text_1C3319, Route134_Text_1C335C + trainerbattle 0, OPPONENT_AARON, 0, Route134_Text_1C3319, Route134_Text_1C335C msgbox Route134_Text_1C336E, 6 end Route134_EventScript_152620:: @ 8152620 - trainerbattle 0, 180, 0, Route134_Text_1C3262, Route134_Text_1C329E + trainerbattle 0, OPPONENT_HITOSHI, 0, Route134_Text_1C3262, Route134_Text_1C329E msgbox Route134_Text_1C32D6, 6 end diff --git a/data/scripts/maps/RustboroCity_Gym.s b/data/scripts/maps/RustboroCity_Gym.s index 4d4a3d87d..e4f91f82e 100644 --- a/data/scripts/maps/RustboroCity_Gym.s +++ b/data/scripts/maps/RustboroCity_Gym.s @@ -2,7 +2,7 @@ RustboroCity_Gym_MapScripts:: @ 81578D8 .byte 0 RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 - trainerbattle 1, 265, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE + trainerbattle 1, OPPONENT_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE checkflag 165 jumpif 0, RustboroCity_Gym_EventScript_15793C msgbox RustboroCity_Gym_Text_184252, 4 @@ -35,12 +35,12 @@ RustboroCity_Gym_EventScript_15793C:: @ 815793C end RustboroCity_Gym_EventScript_157960:: @ 8157960 - trainerbattle 0, 320, 0, RustboroCity_Gym_Text_183D99, RustboroCity_Gym_Text_183DDD + trainerbattle 0, OPPONENT_JOSH, 0, RustboroCity_Gym_Text_183D99, RustboroCity_Gym_Text_183DDD msgbox RustboroCity_Gym_Text_183DF9, 6 end RustboroCity_Gym_EventScript_157977:: @ 8157977 - trainerbattle 0, 321, 0, RustboroCity_Gym_Text_183E38, RustboroCity_Gym_Text_183E78 + trainerbattle 0, OPPONENT_TOMMY, 0, RustboroCity_Gym_Text_183E38, RustboroCity_Gym_Text_183E78 msgbox RustboroCity_Gym_Text_183E98, 6 end diff --git a/data/scripts/maps/RusturfTunnel.s b/data/scripts/maps/RusturfTunnel.s index 989f1657b..129bef7c9 100644 --- a/data/scripts/maps/RusturfTunnel.s +++ b/data/scripts/maps/RusturfTunnel.s @@ -416,6 +416,6 @@ RusturfTunnel_Movement_15CAC3:: @ 815CAC3 step_end RusturfTunnel_EventScript_15CACD:: @ 815CACD - trainerbattle 0, 635, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 + trainerbattle 0, OPPONENT_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 msgbox RusturfTunnel_Text_1948C4, 6 end diff --git a/data/scripts/maps/SSTidalCorridor.s b/data/scripts/maps/SSTidalCorridor.s index e5e8c0e7e..ff4857852 100644 --- a/data/scripts/maps/SSTidalCorridor.s +++ b/data/scripts/maps/SSTidalCorridor.s @@ -176,21 +176,21 @@ SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A end SSTidalCorridor_EventScript_15FE84:: @ 815FE84 - checktrainerflag 494 + checktrainerflag OPPONENT_PHILLIP jumpif 0, SSTidalCorridor_EventScript_15FED5 - checktrainerflag 495 + checktrainerflag OPPONENT_LEONARD jumpif 0, SSTidalCorridor_EventScript_15FED5 - checktrainerflag 294 + checktrainerflag OPPONENT_COLTON jumpif 0, SSTidalCorridor_EventScript_15FED5 - checktrainerflag 255 + checktrainerflag OPPONENT_TUCKER jumpif 0, SSTidalCorridor_EventScript_15FED5 - checktrainerflag 256 + checktrainerflag OPPONENT_THOMAS jumpif 0, SSTidalCorridor_EventScript_15FED5 - checktrainerflag 641 + checktrainerflag OPPONENT_LEA_AND_JED jumpif 0, SSTidalCorridor_EventScript_15FED5 - checktrainerflag 138 + checktrainerflag OPPONENT_GARRET jumpif 0, SSTidalCorridor_EventScript_15FED5 - checktrainerflag 119 + checktrainerflag OPPONENT_ANETTE jumpif 0, SSTidalCorridor_EventScript_15FED5 setflag 247 jump SSTidalCorridor_EventScript_15FE7A diff --git a/data/scripts/maps/SSTidalLowerDeck.s b/data/scripts/maps/SSTidalLowerDeck.s index 8911f5802..e91c20625 100644 --- a/data/scripts/maps/SSTidalLowerDeck.s +++ b/data/scripts/maps/SSTidalLowerDeck.s @@ -2,11 +2,11 @@ SSTidalLowerDeck_MapScripts:: @ 815FED6 .byte 0 SSTidalLowerDeck_EventScript_15FED7:: @ 815FED7 - trainerbattle 0, 494, 0, SSTidalLowerDeck_Text_1993C1, SSTidalLowerDeck_Text_19941A + trainerbattle 0, OPPONENT_PHILLIP, 0, SSTidalLowerDeck_Text_1993C1, SSTidalLowerDeck_Text_19941A msgbox SSTidalLowerDeck_Text_19942E, 6 end SSTidalLowerDeck_EventScript_15FEEE:: @ 815FEEE - trainerbattle 0, 495, 0, SSTidalLowerDeck_Text_199491, SSTidalLowerDeck_Text_1994F7 + trainerbattle 0, OPPONENT_LEONARD, 0, SSTidalLowerDeck_Text_199491, SSTidalLowerDeck_Text_1994F7 msgbox SSTidalLowerDeck_Text_199508, 6 end diff --git a/data/scripts/maps/SSTidalRooms.s b/data/scripts/maps/SSTidalRooms.s index 7de0557a1..4d588cd46 100644 --- a/data/scripts/maps/SSTidalRooms.s +++ b/data/scripts/maps/SSTidalRooms.s @@ -30,36 +30,36 @@ SSTidalRooms_EventScript_15FF47:: @ 815FF47 end SSTidalRooms_EventScript_15FF5D:: @ 815FF5D - trainerbattle 0, 294, 0, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613 + trainerbattle 0, OPPONENT_COLTON, 0, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613 msgbox SSTidalRooms_Text_199630, 6 end SSTidalRooms_EventScript_15FF74:: @ 815FF74 - trainerbattle 0, 255, 0, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF + trainerbattle 0, OPPONENT_TUCKER, 0, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF msgbox SSTidalRooms_Text_1996E1, 6 end SSTidalRooms_EventScript_15FF8B:: @ 815FF8B - trainerbattle 0, 256, 0, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747 + trainerbattle 0, OPPONENT_THOMAS, 0, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747 msgbox SSTidalRooms_Text_199778, 6 end SSTidalRooms_EventScript_15FFA2:: @ 815FFA2 - trainerbattle 4, 641, 0, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887 + trainerbattle 4, OPPONENT_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, 641, 0, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975 + trainerbattle 4, OPPONENT_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, 138, 0, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF + trainerbattle 0, OPPONENT_GARRET, 0, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF msgbox SSTidalRooms_Text_199A10, 6 end SSTidalRooms_EventScript_15FFEF:: @ 815FFEF - trainerbattle 0, 119, 0, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF + trainerbattle 0, OPPONENT_ANETTE, 0, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF msgbox SSTidalRooms_Text_199ADE, 6 end diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.s b/data/scripts/maps/SootopolisCity_Gym_1F.s index 7328302b2..e28ab4547 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.s +++ b/data/scripts/maps/SootopolisCity_Gym_1F.s @@ -86,7 +86,7 @@ SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD step_end SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF - trainerbattle 1, 272, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D + trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D checkflag 172 jumpif 0, SootopolisCity_Gym_1F_EventScript_15B056 checkflag 2060 diff --git a/data/scripts/maps/SootopolisCity_Gym_B1F.s b/data/scripts/maps/SootopolisCity_Gym_B1F.s index 9c17d617a..e54970701 100644 --- a/data/scripts/maps/SootopolisCity_Gym_B1F.s +++ b/data/scripts/maps/SootopolisCity_Gym_B1F.s @@ -2,41 +2,41 @@ SootopolisCity_Gym_B1F_MapScripts:: @ 815B0D7 .byte 0 SootopolisCity_Gym_B1F_EventScript_15B0D8:: @ 815B0D8 - trainerbattle 0, 613, 0, SootopolisCity_Gym_B1F_Text_18EA87, SootopolisCity_Gym_B1F_Text_18EACF + trainerbattle 0, OPPONENT_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, 614, 0, SootopolisCity_Gym_B1F_Text_18EB22, SootopolisCity_Gym_B1F_Text_18EB81 + trainerbattle 0, OPPONENT_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, 118, 0, SootopolisCity_Gym_B1F_Text_18EBFA, SootopolisCity_Gym_B1F_Text_18EC5E + trainerbattle 0, OPPONENT_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, 128, 0, SootopolisCity_Gym_B1F_Text_18ECEB, SootopolisCity_Gym_B1F_Text_18ED18 + trainerbattle 0, OPPONENT_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, 129, 0, SootopolisCity_Gym_B1F_Text_18ED91, SootopolisCity_Gym_B1F_Text_18EDE8 + trainerbattle 0, OPPONENT_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, 130, 0, SootopolisCity_Gym_B1F_Text_18EE96, SootopolisCity_Gym_B1F_Text_18EEDC + trainerbattle 0, OPPONENT_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, 131, 0, SootopolisCity_Gym_B1F_Text_18EF39, SootopolisCity_Gym_B1F_Text_18EFB8 + trainerbattle 0, OPPONENT_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, 301, 0, SootopolisCity_Gym_B1F_Text_18F037, SootopolisCity_Gym_B1F_Text_18F07F + trainerbattle 0, OPPONENT_MARISSA, 0, SootopolisCity_Gym_B1F_Text_18F037, SootopolisCity_Gym_B1F_Text_18F07F msgbox SootopolisCity_Gym_B1F_Text_18F085, 6 end diff --git a/data/scripts/maps/VictoryRoad_1F.s b/data/scripts/maps/VictoryRoad_1F.s index 02c6411fb..b1f6e732b 100644 --- a/data/scripts/maps/VictoryRoad_1F.s +++ b/data/scripts/maps/VictoryRoad_1F.s @@ -39,7 +39,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 move 255, VictoryRoad_1F_Movement_1A083F waitmove 0 msgbox VictoryRoad_1F_Text_19782B, 4 - trainerbattle 3, 519, 0, VictoryRoad_1F_Text_197943 + trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943 msgbox VictoryRoad_1F_Text_197967, 4 clearflag 858 moveoffscreen 4 @@ -92,7 +92,7 @@ VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 end VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 - trainerbattle 0, 657, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 + trainerbattle 0, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 specialval RESULT, 57 compare RESULT, 1 jumpeq VictoryRoad_1F_EventScript_15DF58 @@ -100,21 +100,21 @@ VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 end VictoryRoad_1F_EventScript_15DF58:: @ 815DF58 - trainerbattle 5, 657, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 + trainerbattle 5, OPPONENT_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, 79, 0, VictoryRoad_1F_Text_197AD1, VictoryRoad_1F_Text_197B1A + trainerbattle 0, OPPONENT_EDGAR, 0, VictoryRoad_1F_Text_197AD1, VictoryRoad_1F_Text_197B1A msgbox VictoryRoad_1F_Text_197B36, 6 end VictoryRoad_1F_EventScript_15DF86:: @ 815DF86 - trainerbattle 0, 80, 0, VictoryRoad_1F_Text_197B99, VictoryRoad_1F_Text_197BE1 + trainerbattle 0, OPPONENT_ALBERT, 0, VictoryRoad_1F_Text_197B99, VictoryRoad_1F_Text_197BE1 msgbox VictoryRoad_1F_Text_197BF7, 6 end VictoryRoad_1F_EventScript_15DF9D:: @ 815DF9D - trainerbattle 0, 96, 0, VictoryRoad_1F_Text_197C45, VictoryRoad_1F_Text_197C8D + trainerbattle 0, OPPONENT_HOPE, 0, VictoryRoad_1F_Text_197C45, VictoryRoad_1F_Text_197C8D msgbox VictoryRoad_1F_Text_197CAF, 6 end diff --git a/data/scripts/maps/VictoryRoad_B1F.s b/data/scripts/maps/VictoryRoad_B1F.s index d355bf919..e07cd4286 100644 --- a/data/scripts/maps/VictoryRoad_B1F.s +++ b/data/scripts/maps/VictoryRoad_B1F.s @@ -2,16 +2,16 @@ VictoryRoad_B1F_MapScripts:: @ 815DFB4 .byte 0 VictoryRoad_B1F_EventScript_15DFB5:: @ 815DFB5 - trainerbattle 0, 81, 0, VictoryRoad_B1F_Text_197CE9, VictoryRoad_B1F_Text_197D42 + trainerbattle 0, OPPONENT_SAMUEL, 0, VictoryRoad_B1F_Text_197CE9, VictoryRoad_B1F_Text_197D42 msgbox VictoryRoad_B1F_Text_197D5B, 6 end VictoryRoad_B1F_EventScript_15DFCC:: @ 815DFCC - trainerbattle 0, 97, 0, VictoryRoad_B1F_Text_197D98, VictoryRoad_B1F_Text_197DE8 + trainerbattle 0, OPPONENT_SHANNON, 0, VictoryRoad_B1F_Text_197D98, VictoryRoad_B1F_Text_197DE8 msgbox VictoryRoad_B1F_Text_197E13, 6 end VictoryRoad_B1F_EventScript_15DFE3:: @ 815DFE3 - trainerbattle 0, 98, 0, VictoryRoad_B1F_Text_197E5D, VictoryRoad_B1F_Text_197EA6 + trainerbattle 0, OPPONENT_MICHELLE, 0, VictoryRoad_B1F_Text_197E5D, VictoryRoad_B1F_Text_197EA6 msgbox VictoryRoad_B1F_Text_197EB6, 6 end diff --git a/data/scripts/maps/VictoryRoad_B2F.s b/data/scripts/maps/VictoryRoad_B2F.s index 427c492ce..6b8fe2569 100644 --- a/data/scripts/maps/VictoryRoad_B2F.s +++ b/data/scripts/maps/VictoryRoad_B2F.s @@ -2,21 +2,21 @@ VictoryRoad_B2F_MapScripts:: @ 815DFFA .byte 0 VictoryRoad_B2F_EventScript_15DFFB:: @ 815DFFB - trainerbattle 0, 82, 0, VictoryRoad_B2F_Text_197EF2, VictoryRoad_B2F_Text_197F46 + trainerbattle 0, OPPONENT_VITO, 0, VictoryRoad_B2F_Text_197EF2, VictoryRoad_B2F_Text_197F46 msgbox VictoryRoad_B2F_Text_197F71, 6 end VictoryRoad_B2F_EventScript_15E012:: @ 815E012 - trainerbattle 0, 83, 0, VictoryRoad_B2F_Text_197FE5, VictoryRoad_B2F_Text_19802B + trainerbattle 0, OPPONENT_OWEN, 0, VictoryRoad_B2F_Text_197FE5, VictoryRoad_B2F_Text_19802B msgbox VictoryRoad_B2F_Text_198047, 6 end VictoryRoad_B2F_EventScript_15E029:: @ 815E029 - trainerbattle 0, 99, 0, VictoryRoad_B2F_Text_198089, VictoryRoad_B2F_Text_1980AD + trainerbattle 0, OPPONENT_CAROLINE, 0, VictoryRoad_B2F_Text_198089, VictoryRoad_B2F_Text_1980AD msgbox VictoryRoad_B2F_Text_1980C8, 6 end VictoryRoad_B2F_EventScript_15E040:: @ 815E040 - trainerbattle 0, 100, 0, VictoryRoad_B2F_Text_198121, VictoryRoad_B2F_Text_1981A3 + trainerbattle 0, OPPONENT_JULIE, 0, VictoryRoad_B2F_Text_198121, VictoryRoad_B2F_Text_1981A3 msgbox VictoryRoad_B2F_Text_1981BA, 6 end |