diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index 3ab6ce298..37f4651ed 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -35,9 +35,16 @@ CeladonCity_Gym_EventScript_NoRoomForTM19:: end CeladonCity_Gym_EventScript_Kay:: - trainerbattle_single TRAINER_LASS_KAY, CeladonCity_Gym_Text_KayIntro, CeladonCity_Gym_Text_KayDefeat - msgbox CeladonCity_Gym_Text_KayPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_LASS_KAY, CeladonCity_Gym_Text_KayIntro, CeladonCity_Gym_Text_KayDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, CeladonCity_Gym_EventScript_KayRematch + msgbox CeladonCity_Gym_Text_KayPostBattle, MSGBOX_AUTOCLOSE + end + +CeladonCity_Gym_EventScript_KayRematch:: + trainerbattle_rematch TRAINER_LASS_KAY, CeladonCity_Gym_Text_KayIntro, CeladonCity_Gym_Text_KayDefeat + msgbox CeladonCity_Gym_Text_KayPostBattle, MSGBOX_AUTOCLOSE + end CeladonCity_Gym_EventScript_Lisa:: trainerbattle_single TRAINER_LASS_LISA, CeladonCity_Gym_Text_LisaIntro, CeladonCity_Gym_Text_LisaDefeat @@ -46,14 +53,28 @@ CeladonCity_Gym_EventScript_Lisa:: end CeladonCity_Gym_EventScript_Tina:: - trainerbattle_single TRAINER_PICNICKER_TINA, CeladonCity_Gym_Text_TinaIntro, CeladonCity_Gym_Text_TinaDefeat - msgbox CeladonCity_Gym_Text_TinaPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_PICNICKER_TINA, CeladonCity_Gym_Text_TinaIntro, CeladonCity_Gym_Text_TinaDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, CeladonCity_Gym_EventScript_TinaRematch + msgbox CeladonCity_Gym_Text_TinaPostBattle, MSGBOX_AUTOCLOSE + end + +CeladonCity_Gym_EventScript_TinaRematch:: + trainerbattle_rematch TRAINER_PICNICKER_TINA, CeladonCity_Gym_Text_TinaIntro, CeladonCity_Gym_Text_TinaDefeat + msgbox CeladonCity_Gym_Text_TinaPostBattle, MSGBOX_AUTOCLOSE + end CeladonCity_Gym_EventScript_Bridget:: - trainerbattle_single TRAINER_BEAUTY_BRIDGET, CeladonCity_Gym_Text_BridgetIntro, CeladonCity_Gym_Text_BridgetDefeat - msgbox CeladonCity_Gym_Text_BridgetPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BEAUTY_BRIDGET, CeladonCity_Gym_Text_BridgetIntro, CeladonCity_Gym_Text_BridgetDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, CeladonCity_Gym_EventScript_BridgetRematch + msgbox CeladonCity_Gym_Text_BridgetPostBattle, MSGBOX_AUTOCLOSE + end + +CeladonCity_Gym_EventScript_BridgetRematch:: + trainerbattle_rematch TRAINER_BEAUTY_BRIDGET, CeladonCity_Gym_Text_BridgetIntro, CeladonCity_Gym_Text_BridgetDefeat + msgbox CeladonCity_Gym_Text_BridgetPostBattle, MSGBOX_AUTOCLOSE + end CeladonCity_Gym_EventScript_Tamia:: trainerbattle_single TRAINER_BEAUTY_TAMIA, CeladonCity_Gym_Text_TamiaIntro, CeladonCity_Gym_Text_TamiaDefeat @@ -62,14 +83,28 @@ CeladonCity_Gym_EventScript_Tamia:: end CeladonCity_Gym_EventScript_Lori:: - trainerbattle_single TRAINER_BEAUTY_LORI, CeladonCity_Gym_Text_LoriIntro, CeladonCity_Gym_Text_LoriDefeat - msgbox CeladonCity_Gym_Text_LoriPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BEAUTY_LORI, CeladonCity_Gym_Text_LoriIntro, CeladonCity_Gym_Text_LoriDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, CeladonCity_Gym_EventScript_LoriRematch + msgbox CeladonCity_Gym_Text_LoriPostBattle, MSGBOX_AUTOCLOSE + end + +CeladonCity_Gym_EventScript_LoriRematch:: + trainerbattle_rematch TRAINER_BEAUTY_LORI, CeladonCity_Gym_Text_LoriIntro, CeladonCity_Gym_Text_LoriDefeat + msgbox CeladonCity_Gym_Text_LoriPostBattle, MSGBOX_AUTOCLOSE + end CeladonCity_Gym_EventScript_Mary:: - trainerbattle_single TRAINER_COOLTRAINER_MARY, CeladonCity_Gym_Text_MaryIntro, CeladonCity_Gym_Text_MaryDefeat - msgbox CeladonCity_Gym_Text_MaryPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_COOLTRAINER_MARY, CeladonCity_Gym_Text_MaryIntro, CeladonCity_Gym_Text_MaryDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, CeladonCity_Gym_EventScript_MaryRematch + msgbox CeladonCity_Gym_Text_MaryPostBattle, MSGBOX_AUTOCLOSE + end + +CeladonCity_Gym_EventScript_MaryRematch:: + trainerbattle_rematch TRAINER_COOLTRAINER_MARY, CeladonCity_Gym_Text_MaryIntro, CeladonCity_Gym_Text_MaryDefeat + msgbox CeladonCity_Gym_Text_MaryPostBattle, MSGBOX_AUTOCLOSE + end CeladonCity_Gym_EventScript_GymStatue:: lockall @@ -82,3 +117,4 @@ CeladonCity_Gym_EventScript_GymStatuePostVictory:: msgbox CeladonCity_Gym_Text_GymStatuePlayerWon releaseall end + diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index 108f40a1c..207bdbe0d 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -34,9 +34,16 @@ CeruleanCity_Gym_EventScript_NoRoomForTM03:: end CeruleanCity_Gym_EventScript_Diana:: - trainerbattle_single TRAINER_PICNICKER_DIANA, CeruleanCity_Gym_Text_DianaIntro, CeruleanCity_Gym_Text_DianaDefeat - msgbox CeruleanCity_Gym_Text_DianaPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_PICNICKER_DIANA, CeruleanCity_Gym_Text_DianaIntro, CeruleanCity_Gym_Text_DianaDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, CeruleanCity_Gym_EventScript_DianaRematch + msgbox CeruleanCity_Gym_Text_DianaPostBattle, MSGBOX_AUTOCLOSE + end + +CeruleanCity_Gym_EventScript_DianaRematch:: + trainerbattle_rematch TRAINER_PICNICKER_DIANA, CeruleanCity_Gym_Text_DianaIntro, CeruleanCity_Gym_Text_DianaDefeat + msgbox CeruleanCity_Gym_Text_DianaPostBattle, MSGBOX_AUTOCLOSE + end CeruleanCity_Gym_EventScript_Luis:: trainerbattle_single TRAINER_SWIMMER_MALE_LUIS, CeruleanCity_Gym_Text_LuisIntro, CeruleanCity_Gym_Text_LuisDefeat @@ -68,3 +75,4 @@ CeruleanCity_Gym_EventScript_GymStatuePostVictory:: msgbox CeruleanCity_Gym_Text_GymStatuePlayerWon releaseall end + diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index b160155e0..aae9188c8 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -80,9 +80,16 @@ CinnabarIsland_Gym_EventScript_NoRoomForTM38:: end CinnabarIsland_Gym_EventScript_Erik:: - trainerbattle_single TRAINER_SUPER_NERD_ERIK, CinnabarIsland_Gym_Text_ErikIntro, CinnabarIsland_Gym_Text_ErikDefeat - msgbox CinnabarIsland_Gym_Text_ErikPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SUPER_NERD_ERIK, CinnabarIsland_Gym_Text_ErikIntro, CinnabarIsland_Gym_Text_ErikDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, CinnabarIsland_Gym_EventScript_ErikRematch + msgbox CinnabarIsland_Gym_Text_ErikPostBattle, MSGBOX_AUTOCLOSE + end + +CinnabarIsland_Gym_EventScript_ErikRematch:: + trainerbattle_rematch TRAINER_SUPER_NERD_ERIK, CinnabarIsland_Gym_Text_ErikIntro, CinnabarIsland_Gym_Text_ErikDefeat + msgbox CinnabarIsland_Gym_Text_ErikPostBattle, MSGBOX_AUTOCLOSE + end CinnabarIsland_Gym_EventScript_Avery:: trainerbattle_single TRAINER_SUPER_NERD_AVERY, CinnabarIsland_Gym_Text_AveryIntro, CinnabarIsland_Gym_Text_AveryDefeat, CinnabarIsland_Gym_EventScript_DefeatedAvery @@ -708,3 +715,4 @@ CinnabarIsland_Gym_EventScript_OpenDoor6:: setmetatile 6, 10, METATILE_CinnabarGym_Floor, 0 setmetatile 7, 10, METATILE_CinnabarGym_Floor_ShadeDiagonal, 0 return + diff --git a/data/maps/FiveIsland_LostCave_Room1/scripts.inc b/data/maps/FiveIsland_LostCave_Room1/scripts.inc index 471f0cb07..bb44c7a7b 100644 --- a/data/maps/FiveIsland_LostCave_Room1/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room1/scripts.inc @@ -2,6 +2,14 @@ FiveIsland_LostCave_Room1_MapScripts:: .byte 0 FiveIsland_LostCave_Room1_EventScript_Lawson:: - trainerbattle_single TRAINER_RUIN_MANIAC_LAWSON, FiveIsland_LostCave_Room1_Text_LawsonIntro, FiveIsland_LostCave_Room1_Text_LawsonDefeat - msgbox FiveIsland_LostCave_Room1_Text_LawsonPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_RUIN_MANIAC_LAWSON, FiveIsland_LostCave_Room1_Text_LawsonIntro, FiveIsland_LostCave_Room1_Text_LawsonDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, FiveIsland_LostCave_Room1_EventScript_LawsonRematch + msgbox FiveIsland_LostCave_Room1_Text_LawsonPostBattle, MSGBOX_AUTOCLOSE + end + +FiveIsland_LostCave_Room1_EventScript_LawsonRematch:: + trainerbattle_rematch TRAINER_RUIN_MANIAC_LAWSON, FiveIsland_LostCave_Room1_Text_LawsonIntro, FiveIsland_LostCave_Room1_Text_LawsonDefeat + msgbox FiveIsland_LostCave_Room1_Text_LawsonPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/FiveIsland_LostCave_Room4/scripts.inc b/data/maps/FiveIsland_LostCave_Room4/scripts.inc index 15978c382..313f2a1e6 100644 --- a/data/maps/FiveIsland_LostCave_Room4/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room4/scripts.inc @@ -2,6 +2,14 @@ FiveIsland_LostCave_Room4_MapScripts:: .byte 0 FiveIsland_LostCave_Room4_EventScript_Laura:: - trainerbattle_single TRAINER_PSYCHIC_LAURA, FiveIsland_LostCave_Room4_Text_LauraIntro, FiveIsland_LostCave_Room4_Text_LauraDefeat - msgbox FiveIsland_LostCave_Room4_Text_LauraPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_PSYCHIC_LAURA, FiveIsland_LostCave_Room4_Text_LauraIntro, FiveIsland_LostCave_Room4_Text_LauraDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, FiveIsland_LostCave_Room4_EventScript_LauraRematch + msgbox FiveIsland_LostCave_Room4_Text_LauraPostBattle, MSGBOX_AUTOCLOSE + end + +FiveIsland_LostCave_Room4_EventScript_LauraRematch:: + trainerbattle_rematch TRAINER_PSYCHIC_LAURA, FiveIsland_LostCave_Room4_Text_LauraIntro, FiveIsland_LostCave_Room4_Text_LauraDefeat + msgbox FiveIsland_LostCave_Room4_Text_LauraPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index 2b9951634..3907ea735 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -36,16 +36,38 @@ FiveIsland_Meadow_EventScript_SetWarehouseDoorUnlocked:: return FiveIsland_Meadow_EventScript_Rocket1:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_49, FiveIsland_Meadow_Text_Rocket1Intro, FiveIsland_Meadow_Text_Rocket1Defeat - msgbox FiveIsland_Meadow_Text_Rocket1PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_49, FiveIsland_Meadow_Text_Rocket1Intro, FiveIsland_Meadow_Text_Rocket1Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, FiveIsland_Meadow_EventScript_Rocket1Rematch + msgbox FiveIsland_Meadow_Text_Rocket1PostBattle, MSGBOX_AUTOCLOSE + end + +FiveIsland_Meadow_EventScript_Rocket1Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_49, FiveIsland_Meadow_Text_Rocket1Intro, FiveIsland_Meadow_Text_Rocket1Defeat + msgbox FiveIsland_Meadow_Text_Rocket1PostBattle, MSGBOX_AUTOCLOSE + end FiveIsland_Meadow_EventScript_Rocket2:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_50, FiveIsland_Meadow_Text_Rocket2Intro, FiveIsland_Meadow_Text_Rocket2Defeat - msgbox FiveIsland_Meadow_Text_Rocket2PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_50, FiveIsland_Meadow_Text_Rocket2Intro, FiveIsland_Meadow_Text_Rocket2Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, FiveIsland_Meadow_EventScript_Rocket2Rematch + msgbox FiveIsland_Meadow_Text_Rocket2PostBattle, MSGBOX_AUTOCLOSE + end + +FiveIsland_Meadow_EventScript_Rocket2Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_50, FiveIsland_Meadow_Text_Rocket2Intro, FiveIsland_Meadow_Text_Rocket2Defeat + msgbox FiveIsland_Meadow_Text_Rocket2PostBattle, MSGBOX_AUTOCLOSE + end FiveIsland_Meadow_EventScript_Rocket3:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_51, FiveIsland_Meadow_Text_Rocket3Intro, FiveIsland_Meadow_Text_Rocket3Defeat - msgbox FiveIsland_Meadow_Text_Rocket3PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_51, FiveIsland_Meadow_Text_Rocket3Intro, FiveIsland_Meadow_Text_Rocket3Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, FiveIsland_Meadow_EventScript_Rocket3Rematch + msgbox FiveIsland_Meadow_Text_Rocket3PostBattle, MSGBOX_AUTOCLOSE + end + +FiveIsland_Meadow_EventScript_Rocket3Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_51, FiveIsland_Meadow_Text_Rocket3Intro, FiveIsland_Meadow_Text_Rocket3Defeat + msgbox FiveIsland_Meadow_Text_Rocket3PostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 846909f0c..79314f482 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -62,14 +62,28 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedGideon:: end FiveIsland_RocketWarehouse_EventScript_Grunt2:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, FiveIsland_RocketWarehouse_Text_Grunt2Intro, FiveIsland_RocketWarehouse_Text_Grunt2Defeat - msgbox FiveIsland_RocketWarehouse_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, FiveIsland_RocketWarehouse_Text_Grunt2Intro, FiveIsland_RocketWarehouse_Text_Grunt2Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, FiveIsland_RocketWarehouse_EventScript_Grunt2Rematch + msgbox FiveIsland_RocketWarehouse_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end + +FiveIsland_RocketWarehouse_EventScript_Grunt2Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_47, FiveIsland_RocketWarehouse_Text_Grunt2Intro, FiveIsland_RocketWarehouse_Text_Grunt2Defeat + msgbox FiveIsland_RocketWarehouse_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end FiveIsland_RocketWarehouse_EventScript_Grunt3:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, FiveIsland_RocketWarehouse_Text_Grunt3Intro, FiveIsland_RocketWarehouse_Text_Grunt3Defeat - msgbox FiveIsland_RocketWarehouse_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, FiveIsland_RocketWarehouse_Text_Grunt3Intro, FiveIsland_RocketWarehouse_Text_Grunt3Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, FiveIsland_RocketWarehouse_EventScript_Grunt3Rematch + msgbox FiveIsland_RocketWarehouse_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE + end + +FiveIsland_RocketWarehouse_EventScript_Grunt3Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_48, FiveIsland_RocketWarehouse_Text_Grunt3Intro, FiveIsland_RocketWarehouse_Text_Grunt3Defeat + msgbox FiveIsland_RocketWarehouse_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE + end FiveIsland_RocketWarehouse_EventScript_Admin2:: trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN_2, FiveIsland_RocketWarehouse_Text_Admin2Intro, FiveIsland_RocketWarehouse_Text_Admin2Defeat, FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2 @@ -99,9 +113,16 @@ FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2:: return FiveIsland_RocketWarehouse_EventScript_Grunt1:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, FiveIsland_RocketWarehouse_Text_Grunt1Intro, FiveIsland_RocketWarehouse_Text_Grunt1Defeat - msgbox FiveIsland_RocketWarehouse_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, FiveIsland_RocketWarehouse_Text_Grunt1Intro, FiveIsland_RocketWarehouse_Text_Grunt1Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, FiveIsland_RocketWarehouse_EventScript_Grunt1Rematch + msgbox FiveIsland_RocketWarehouse_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end + +FiveIsland_RocketWarehouse_EventScript_Grunt1Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_42, FiveIsland_RocketWarehouse_Text_Grunt1Intro, FiveIsland_RocketWarehouse_Text_Grunt1Defeat + msgbox FiveIsland_RocketWarehouse_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end FiveIsland_RocketWarehouse_EventScript_Admin1:: trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN, FiveIsland_RocketWarehouse_Text_Admin1Intro, FiveIsland_RocketWarehouse_Text_Admin1Defeat, FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1 @@ -171,3 +192,4 @@ FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch:: walk_right walk_in_place_faster_up step_end + diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index 86d0a1a7f..1487b817c 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -34,14 +34,28 @@ FuchsiaCity_Gym_EventScript_NoRoomForTM06:: end FuchsiaCity_Gym_EventScript_Phil:: - trainerbattle_single TRAINER_TAMER_PHIL, FuchsiaCity_Gym_Text_PhilIntro, FuchsiaCity_Gym_Text_PhilDefeat - msgbox FuchsiaCity_Gym_Text_PhilPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TAMER_PHIL, FuchsiaCity_Gym_Text_PhilIntro, FuchsiaCity_Gym_Text_PhilDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, FuchsiaCity_Gym_EventScript_PhilRematch + msgbox FuchsiaCity_Gym_Text_PhilPostBattle, MSGBOX_AUTOCLOSE + end + +FuchsiaCity_Gym_EventScript_PhilRematch:: + trainerbattle_rematch TRAINER_TAMER_PHIL, FuchsiaCity_Gym_Text_PhilIntro, FuchsiaCity_Gym_Text_PhilDefeat + msgbox FuchsiaCity_Gym_Text_PhilPostBattle, MSGBOX_AUTOCLOSE + end FuchsiaCity_Gym_EventScript_Edgar:: - trainerbattle_single TRAINER_TAMER_EDGAR, FuchsiaCity_Gym_Text_EdgarIntro, FuchsiaCity_Gym_Text_EdgarDefeat - msgbox FuchsiaCity_Gym_Text_EdgarPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TAMER_EDGAR, FuchsiaCity_Gym_Text_EdgarIntro, FuchsiaCity_Gym_Text_EdgarDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, FuchsiaCity_Gym_EventScript_EdgarRematch + msgbox FuchsiaCity_Gym_Text_EdgarPostBattle, MSGBOX_AUTOCLOSE + end + +FuchsiaCity_Gym_EventScript_EdgarRematch:: + trainerbattle_rematch TRAINER_TAMER_EDGAR, FuchsiaCity_Gym_Text_EdgarIntro, FuchsiaCity_Gym_Text_EdgarDefeat + msgbox FuchsiaCity_Gym_Text_EdgarPostBattle, MSGBOX_AUTOCLOSE + end FuchsiaCity_Gym_EventScript_Kirk:: trainerbattle_single TRAINER_JUGGLER_KIRK, FuchsiaCity_Gym_Text_KirkIntro, FuchsiaCity_Gym_Text_KirkDefeat @@ -50,19 +64,40 @@ FuchsiaCity_Gym_EventScript_Kirk:: end FuchsiaCity_Gym_EventScript_Shawn:: - trainerbattle_single TRAINER_JUGGLER_SHAWN, FuchsiaCity_Gym_Text_ShawnIntro, FuchsiaCity_Gym_Text_ShawnDefeat - msgbox FuchsiaCity_Gym_Text_ShawnPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_JUGGLER_SHAWN, FuchsiaCity_Gym_Text_ShawnIntro, FuchsiaCity_Gym_Text_ShawnDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, FuchsiaCity_Gym_EventScript_ShawnRematch + msgbox FuchsiaCity_Gym_Text_ShawnPostBattle, MSGBOX_AUTOCLOSE + end + +FuchsiaCity_Gym_EventScript_ShawnRematch:: + trainerbattle_rematch TRAINER_JUGGLER_SHAWN, FuchsiaCity_Gym_Text_ShawnIntro, FuchsiaCity_Gym_Text_ShawnDefeat + msgbox FuchsiaCity_Gym_Text_ShawnPostBattle, MSGBOX_AUTOCLOSE + end FuchsiaCity_Gym_EventScript_Kayden:: - trainerbattle_single TRAINER_JUGGLER_KAYDEN, FuchsiaCity_Gym_Text_KaydenIntro, FuchsiaCity_Gym_Text_KaydenDefeat - msgbox FuchsiaCity_Gym_Text_KaydenPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_JUGGLER_KAYDEN, FuchsiaCity_Gym_Text_KaydenIntro, FuchsiaCity_Gym_Text_KaydenDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, FuchsiaCity_Gym_EventScript_KaydenRematch + msgbox FuchsiaCity_Gym_Text_KaydenPostBattle, MSGBOX_AUTOCLOSE + end + +FuchsiaCity_Gym_EventScript_KaydenRematch:: + trainerbattle_rematch TRAINER_JUGGLER_KAYDEN, FuchsiaCity_Gym_Text_KaydenIntro, FuchsiaCity_Gym_Text_KaydenDefeat + msgbox FuchsiaCity_Gym_Text_KaydenPostBattle, MSGBOX_AUTOCLOSE + end FuchsiaCity_Gym_EventScript_Nate:: - trainerbattle_single TRAINER_JUGGLER_NATE, FuchsiaCity_Gym_Text_NateIntro, FuchsiaCity_Gym_Text_NateDefeat - msgbox FuchsiaCity_Gym_Text_NatePostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_JUGGLER_NATE, FuchsiaCity_Gym_Text_NateIntro, FuchsiaCity_Gym_Text_NateDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, FuchsiaCity_Gym_EventScript_NateRematch + msgbox FuchsiaCity_Gym_Text_NatePostBattle, MSGBOX_AUTOCLOSE + end + +FuchsiaCity_Gym_EventScript_NateRematch:: + trainerbattle_rematch TRAINER_JUGGLER_NATE, FuchsiaCity_Gym_Text_NateIntro, FuchsiaCity_Gym_Text_NateDefeat + msgbox FuchsiaCity_Gym_Text_NatePostBattle, MSGBOX_AUTOCLOSE + end FuchsiaCity_Gym_EventScript_GymGuy:: lock @@ -88,3 +123,4 @@ FuchsiaCity_Gym_EventScript_GymStatuePostVictory:: msgbox FuchsiaCity_Gym_Text_GymStatuePlayerWon releaseall end + diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index fb8c5392f..a92bc89ce 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -108,16 +108,38 @@ MtEmber_Exterior_EventScript_RocketPasswordScene:: end MtEmber_Exterior_EventScript_Logan:: - trainerbattle_single TRAINER_PKMN_RANGER_LOGAN, MtEmber_Exterior_Text_LoganIntro, MtEmber_Exterior_Text_LoganDefeat - msgbox MtEmber_Exterior_Text_LoganPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_PKMN_RANGER_LOGAN, MtEmber_Exterior_Text_LoganIntro, MtEmber_Exterior_Text_LoganDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, MtEmber_Exterior_EventScript_LoganRematch + msgbox MtEmber_Exterior_Text_LoganPostBattle, MSGBOX_AUTOCLOSE + end + +MtEmber_Exterior_EventScript_LoganRematch:: + trainerbattle_rematch TRAINER_PKMN_RANGER_LOGAN, MtEmber_Exterior_Text_LoganIntro, MtEmber_Exterior_Text_LoganDefeat + msgbox MtEmber_Exterior_Text_LoganPostBattle, MSGBOX_AUTOCLOSE + end MtEmber_Exterior_EventScript_Beth:: - trainerbattle_single TRAINER_PKMN_RANGER_BETH, MtEmber_Exterior_Text_BethIntro, MtEmber_Exterior_Text_BethDefeat - msgbox MtEmber_Exterior_Text_BethPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_PKMN_RANGER_BETH, MtEmber_Exterior_Text_BethIntro, MtEmber_Exterior_Text_BethDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, MtEmber_Exterior_EventScript_BethRematch + msgbox MtEmber_Exterior_Text_BethPostBattle, MSGBOX_AUTOCLOSE + end + +MtEmber_Exterior_EventScript_BethRematch:: + trainerbattle_rematch TRAINER_PKMN_RANGER_BETH, MtEmber_Exterior_Text_BethIntro, MtEmber_Exterior_Text_BethDefeat + msgbox MtEmber_Exterior_Text_BethPostBattle, MSGBOX_AUTOCLOSE + end MtEmber_Exterior_EventScript_Jocelyn:: - trainerbattle_single TRAINER_CRUSH_GIRL_JOCELYN, MtEmber_Exterior_Text_JocelynIntro, MtEmber_Exterior_Text_JocelynDefeat - msgbox MtEmber_Exterior_Text_JocelynPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_CRUSH_GIRL_JOCELYN, MtEmber_Exterior_Text_JocelynIntro, MtEmber_Exterior_Text_JocelynDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, MtEmber_Exterior_EventScript_JocelynRematch + msgbox MtEmber_Exterior_Text_JocelynPostBattle, MSGBOX_AUTOCLOSE + end + +MtEmber_Exterior_EventScript_JocelynRematch:: + trainerbattle_rematch TRAINER_CRUSH_GIRL_JOCELYN, MtEmber_Exterior_Text_JocelynIntro, MtEmber_Exterior_Text_JocelynDefeat + msgbox MtEmber_Exterior_Text_JocelynPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc index 5aefc39b1..f7ab843d8 100644 --- a/data/maps/MtMoon_1F/scripts.inc +++ b/data/maps/MtMoon_1F/scripts.inc @@ -11,36 +11,86 @@ MtMoon_1F_EventScript_ZubatSign:: end MtMoon_1F_EventScript_Marcos:: - trainerbattle_single TRAINER_HIKER_MARCOS, MtMoon_1F_Text_MarcosIntro, MtMoon_1F_Text_MarcosDefeat - msgbox MtMoon_1F_Text_MarcosPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_HIKER_MARCOS, MtMoon_1F_Text_MarcosIntro, MtMoon_1F_Text_MarcosDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, MtMoon_1F_EventScript_MarcosRematch + msgbox MtMoon_1F_Text_MarcosPostBattle, MSGBOX_AUTOCLOSE + end + +MtMoon_1F_EventScript_MarcosRematch:: + trainerbattle_rematch TRAINER_HIKER_MARCOS, MtMoon_1F_Text_MarcosIntro, MtMoon_1F_Text_MarcosDefeat + msgbox MtMoon_1F_Text_MarcosPostBattle, MSGBOX_AUTOCLOSE + end MtMoon_1F_EventScript_Josh:: - trainerbattle_single TRAINER_YOUNGSTER_JOSH, MtMoon_1F_Text_JoshIntro, MtMoon_1F_Text_JoshDefeat - msgbox MtMoon_1F_Text_JoshPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_YOUNGSTER_JOSH, MtMoon_1F_Text_JoshIntro, MtMoon_1F_Text_JoshDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, MtMoon_1F_EventScript_JoshRematch + msgbox MtMoon_1F_Text_JoshPostBattle, MSGBOX_AUTOCLOSE + end + +MtMoon_1F_EventScript_JoshRematch:: + trainerbattle_rematch TRAINER_YOUNGSTER_JOSH, MtMoon_1F_Text_JoshIntro, MtMoon_1F_Text_JoshDefeat + msgbox MtMoon_1F_Text_JoshPostBattle, MSGBOX_AUTOCLOSE + end MtMoon_1F_EventScript_Miriam:: - trainerbattle_single TRAINER_LASS_MIRIAM, MtMoon_1F_Text_MiriamIntro, MtMoon_1F_Text_MiriamDefeat - msgbox MtMoon_1F_Text_MiriamPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_LASS_MIRIAM, MtMoon_1F_Text_MiriamIntro, MtMoon_1F_Text_MiriamDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, MtMoon_1F_EventScript_MiriamRematch + msgbox MtMoon_1F_Text_MiriamPostBattle, MSGBOX_AUTOCLOSE + end + +MtMoon_1F_EventScript_MiriamRematch:: + trainerbattle_rematch TRAINER_LASS_MIRIAM, MtMoon_1F_Text_MiriamIntro, MtMoon_1F_Text_MiriamDefeat + msgbox MtMoon_1F_Text_MiriamPostBattle, MSGBOX_AUTOCLOSE + end MtMoon_1F_EventScript_Iris:: - trainerbattle_single TRAINER_LASS_IRIS, MtMoon_1F_Text_IrisIntro, MtMoon_1F_Text_IrisDefeat - msgbox MtMoon_1F_Text_IrisPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_LASS_IRIS, MtMoon_1F_Text_IrisIntro, MtMoon_1F_Text_IrisDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, MtMoon_1F_EventScript_IrisRematch + msgbox MtMoon_1F_Text_IrisPostBattle, MSGBOX_AUTOCLOSE + end + +MtMoon_1F_EventScript_IrisRematch:: + trainerbattle_rematch TRAINER_LASS_IRIS, MtMoon_1F_Text_IrisIntro, MtMoon_1F_Text_IrisDefeat + msgbox MtMoon_1F_Text_IrisPostBattle, MSGBOX_AUTOCLOSE + end MtMoon_1F_EventScript_Jovan:: - trainerbattle_single TRAINER_SUPER_NERD_JOVAN, MtMoon_1F_Text_JovanIntro, MtMoon_1F_Text_JovanDefeat - msgbox MtMoon_1F_Text_JovanPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SUPER_NERD_JOVAN, MtMoon_1F_Text_JovanIntro, MtMoon_1F_Text_JovanDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, MtMoon_1F_EventScript_JovanRematch + msgbox MtMoon_1F_Text_JovanPostBattle, MSGBOX_AUTOCLOSE + end + +MtMoon_1F_EventScript_JovanRematch:: + trainerbattle_rematch TRAINER_SUPER_NERD_JOVAN, MtMoon_1F_Text_JovanIntro, MtMoon_1F_Text_JovanDefeat + msgbox MtMoon_1F_Text_JovanPostBattle, MSGBOX_AUTOCLOSE + end MtMoon_1F_EventScript_Kent:: - trainerbattle_single TRAINER_BUG_CATCHER_KENT, MtMoon_1F_Text_KentIntro, MtMoon_1F_Text_KentDefeat - msgbox MtMoon_1F_Text_KentPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BUG_CATCHER_KENT, MtMoon_1F_Text_KentIntro, MtMoon_1F_Text_KentDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, MtMoon_1F_EventScript_KentRematch + msgbox MtMoon_1F_Text_KentPostBattle, MSGBOX_AUTOCLOSE + end + +MtMoon_1F_EventScript_KentRematch:: + trainerbattle_rematch TRAINER_BUG_CATCHER_KENT, MtMoon_1F_Text_KentIntro, MtMoon_1F_Text_KentDefeat + msgbox MtMoon_1F_Text_KentPostBattle, MSGBOX_AUTOCLOSE + end MtMoon_1F_EventScript_Robby:: - trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, MtMoon_1F_Text_RobbyIntro, MtMoon_1F_Text_RobbyDefeat - msgbox MtMoon_1F_Text_RobbyPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, MtMoon_1F_Text_RobbyIntro, MtMoon_1F_Text_RobbyDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, MtMoon_1F_EventScript_RobbyRematch + msgbox MtMoon_1F_Text_RobbyPostBattle, MSGBOX_AUTOCLOSE + end + +MtMoon_1F_EventScript_RobbyRematch:: + trainerbattle_rematch TRAINER_BUG_CATCHER_ROBBY, MtMoon_1F_Text_RobbyIntro, MtMoon_1F_Text_RobbyDefeat + msgbox MtMoon_1F_Text_RobbyPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 2cd079852..1872c90b8 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -116,21 +116,50 @@ MtMoon_B2F_Movement_MiguelToDomeFossil:: step_end MtMoon_B2F_EventScript_Grunt1:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, MtMoon_B2F_Text_Grunt1Intro, MtMoon_B2F_Text_Grunt1Defeat - msgbox MtMoon_B2F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, MtMoon_B2F_Text_Grunt1Intro, MtMoon_B2F_Text_Grunt1Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, MtMoon_B2F_EventScript_Grunt1Rematch + msgbox MtMoon_B2F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end + +MtMoon_B2F_EventScript_Grunt1Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT, MtMoon_B2F_Text_Grunt1Intro, MtMoon_B2F_Text_Grunt1Defeat + msgbox MtMoon_B2F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end MtMoon_B2F_EventScript_Grunt2:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, MtMoon_B2F_Text_Grunt2Intro, MtMoon_B2F_Text_Grunt2Defeat - msgbox MtMoon_B2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, MtMoon_B2F_Text_Grunt2Intro, MtMoon_B2F_Text_Grunt2Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, MtMoon_B2F_EventScript_Grunt2Rematch + msgbox MtMoon_B2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end + +MtMoon_B2F_EventScript_Grunt2Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_2, MtMoon_B2F_Text_Grunt2Intro, MtMoon_B2F_Text_Grunt2Defeat + msgbox MtMoon_B2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end MtMoon_B2F_EventScript_Grunt3:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, MtMoon_B2F_Text_Grunt3Intro, MtMoon_B2F_Text_Grunt3Defeat - msgbox MtMoon_B2F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, MtMoon_B2F_Text_Grunt3Intro, MtMoon_B2F_Text_Grunt3Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, MtMoon_B2F_EventScript_Grunt3Rematch + msgbox MtMoon_B2F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE + end + +MtMoon_B2F_EventScript_Grunt3Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_3, MtMoon_B2F_Text_Grunt3Intro, MtMoon_B2F_Text_Grunt3Defeat + msgbox MtMoon_B2F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE + end MtMoon_B2F_EventScript_Grunt4:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, MtMoon_B2F_Text_Grunt4Intro, MtMoon_B2F_Text_Grunt4Defeat - msgbox MtMoon_B2F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, MtMoon_B2F_Text_Grunt4Intro, MtMoon_B2F_Text_Grunt4Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, MtMoon_B2F_EventScript_Grunt4Rematch + msgbox MtMoon_B2F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE + end + +MtMoon_B2F_EventScript_Grunt4Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_4, MtMoon_B2F_Text_Grunt4Intro, MtMoon_B2F_Text_Grunt4Defeat + msgbox MtMoon_B2F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index dfc7ed92d..3504f039b 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -36,9 +36,16 @@ PewterCity_Gym_EventScript_NoRoomForTM39:: end PewterCity_Gym_EventScript_Liam:: - trainerbattle_single TRAINER_CAMPER_LIAM, PewterCity_Gym_Text_LiamIntro, PewterCity_Gym_Text_LiamDefeat - msgbox PewterCity_Gym_Text_LiamPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_CAMPER_LIAM, PewterCity_Gym_Text_LiamIntro, PewterCity_Gym_Text_LiamDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PewterCity_Gym_EventScript_LiamRematch + msgbox PewterCity_Gym_Text_LiamPostBattle, MSGBOX_AUTOCLOSE + end + +PewterCity_Gym_EventScript_LiamRematch:: + trainerbattle_rematch TRAINER_CAMPER_LIAM, PewterCity_Gym_Text_LiamIntro, PewterCity_Gym_Text_LiamDefeat + msgbox PewterCity_Gym_Text_LiamPostBattle, MSGBOX_AUTOCLOSE + end PewterCity_Gym_EventScript_GymGuy:: lock @@ -80,3 +87,4 @@ PewterCity_Gym_EventScript_GymStatuePostVictory:: msgbox PewterCity_Gym_Text_GymStatuePlayerWon releaseall end + diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index 7e2a67e52..db62c19d4 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -22,11 +22,26 @@ PokemonMansion_1F_EventScript_Statue:: end PokemonMansion_1F_EventScript_Ted:: - trainerbattle_single TRAINER_SCIENTIST_TED, PokemonMansion_1F_Text_TedIntro, PokemonMansion_1F_Text_TedDefeat - msgbox PokemonMansion_1F_Text_TedPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SCIENTIST_TED, PokemonMansion_1F_Text_TedIntro, PokemonMansion_1F_Text_TedDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonMansion_1F_EventScript_TedRematch + msgbox PokemonMansion_1F_Text_TedPostBattle, MSGBOX_AUTOCLOSE + end + +PokemonMansion_1F_EventScript_TedRematch:: + trainerbattle_rematch TRAINER_SCIENTIST_TED, PokemonMansion_1F_Text_TedIntro, PokemonMansion_1F_Text_TedDefeat + msgbox PokemonMansion_1F_Text_TedPostBattle, MSGBOX_AUTOCLOSE + end PokemonMansion_1F_EventScript_Johnson:: - trainerbattle_single TRAINER_YOUNGSTER_JOHNSON, PokemonMansion_1F_Text_JohnsonIntro, PokemonMansion_1F_Text_JohnsonDefeat - msgbox PokemonMansion_1F_Text_JohnsonPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_YOUNGSTER_JOHNSON, PokemonMansion_1F_Text_JohnsonIntro, PokemonMansion_1F_Text_JohnsonDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonMansion_1F_EventScript_JohnsonRematch + msgbox PokemonMansion_1F_Text_JohnsonPostBattle, MSGBOX_AUTOCLOSE + end + +PokemonMansion_1F_EventScript_JohnsonRematch:: + trainerbattle_rematch TRAINER_YOUNGSTER_JOHNSON, PokemonMansion_1F_Text_JohnsonIntro, PokemonMansion_1F_Text_JohnsonDefeat + msgbox PokemonMansion_1F_Text_JohnsonPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc index b2f686148..ef1ff8144 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -25,6 +25,14 @@ PokemonMansion_2F_EventScript_DiaryJuly10th:: end PokemonMansion_2F_EventScript_Arnie:: - trainerbattle_single TRAINER_BURGLAR_ARNIE, PokemonMansion_1F_Text_ArnieIntro, PokemonMansion_1F_Text_ArnieDefeat - msgbox PokemonMansion_1F_Text_ArniePostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BURGLAR_ARNIE, PokemonMansion_1F_Text_ArnieIntro, PokemonMansion_1F_Text_ArnieDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonMansion_2F_EventScript_ArnieRematch + msgbox PokemonMansion_1F_Text_ArniePostBattle, MSGBOX_AUTOCLOSE + end + +PokemonMansion_2F_EventScript_ArnieRematch:: + trainerbattle_rematch TRAINER_BURGLAR_ARNIE, PokemonMansion_1F_Text_ArnieIntro, PokemonMansion_1F_Text_ArnieDefeat + msgbox PokemonMansion_1F_Text_ArniePostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc index 83dd077dd..1dd707757 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -21,11 +21,26 @@ PokemonMansion_3F_EventScript_DiaryFeb6th:: end PokemonMansion_3F_EventScript_Simon:: - trainerbattle_single TRAINER_BURGLAR_SIMON, PokemonMansion_1F_Text_SimonIntro, PokemonMansion_1F_Text_SimonDefeat - msgbox PokemonMansion_1F_Text_SimonPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BURGLAR_SIMON, PokemonMansion_1F_Text_SimonIntro, PokemonMansion_1F_Text_SimonDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonMansion_3F_EventScript_SimonRematch + msgbox PokemonMansion_1F_Text_SimonPostBattle, MSGBOX_AUTOCLOSE + end + +PokemonMansion_3F_EventScript_SimonRematch:: + trainerbattle_rematch TRAINER_BURGLAR_SIMON, PokemonMansion_1F_Text_SimonIntro, PokemonMansion_1F_Text_SimonDefeat + msgbox PokemonMansion_1F_Text_SimonPostBattle, MSGBOX_AUTOCLOSE + end PokemonMansion_3F_EventScript_Braydon:: - trainerbattle_single TRAINER_SCIENTIST_BRAYDON, PokemonMansion_1F_Text_BraydonIntro, PokemonMansion_1F_Text_BraydonDefeat - msgbox PokemonMansion_1F_Text_BraydonPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SCIENTIST_BRAYDON, PokemonMansion_1F_Text_BraydonIntro, PokemonMansion_1F_Text_BraydonDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonMansion_3F_EventScript_BraydonRematch + msgbox PokemonMansion_1F_Text_BraydonPostBattle, MSGBOX_AUTOCLOSE + end + +PokemonMansion_3F_EventScript_BraydonRematch:: + trainerbattle_rematch TRAINER_SCIENTIST_BRAYDON, PokemonMansion_1F_Text_BraydonIntro, PokemonMansion_1F_Text_BraydonDefeat + msgbox PokemonMansion_1F_Text_BraydonPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc index d4429afe1..e84b3408e 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -21,11 +21,26 @@ PokemonMansion_B1F_EventScript_DiarySep1st:: end PokemonMansion_B1F_EventScript_Lewis:: - trainerbattle_single TRAINER_BURGLAR_LEWIS, PokemonMansion_B1F_Text_LewisIntro, PokemonMansion_B1F_Text_LewisDefeat - msgbox PokemonMansion_B1F_Text_LewisPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BURGLAR_LEWIS, PokemonMansion_B1F_Text_LewisIntro, PokemonMansion_B1F_Text_LewisDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonMansion_B1F_EventScript_LewisRematch + msgbox PokemonMansion_B1F_Text_LewisPostBattle, MSGBOX_AUTOCLOSE + end + +PokemonMansion_B1F_EventScript_LewisRematch:: + trainerbattle_rematch TRAINER_BURGLAR_LEWIS, PokemonMansion_B1F_Text_LewisIntro, PokemonMansion_B1F_Text_LewisDefeat + msgbox PokemonMansion_B1F_Text_LewisPostBattle, MSGBOX_AUTOCLOSE + end PokemonMansion_B1F_EventScript_Ivan:: - trainerbattle_single TRAINER_SCIENTIST_IVAN, PokemonMansion_B1F_Text_IvanIntro, PokemonMansion_B1F_Text_IvanDefeat - msgbox PokemonMansion_B1F_Text_IvanPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SCIENTIST_IVAN, PokemonMansion_B1F_Text_IvanIntro, PokemonMansion_B1F_Text_IvanDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonMansion_B1F_EventScript_IvanRematch + msgbox PokemonMansion_B1F_Text_IvanPostBattle, MSGBOX_AUTOCLOSE + end + +PokemonMansion_B1F_EventScript_IvanRematch:: + trainerbattle_rematch TRAINER_SCIENTIST_IVAN, PokemonMansion_B1F_Text_IvanIntro, PokemonMansion_B1F_Text_IvanDefeat + msgbox PokemonMansion_B1F_Text_IvanPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/PokemonTower_3F/scripts.inc b/data/maps/PokemonTower_3F/scripts.inc index 76368c142..c8cfaea63 100644 --- a/data/maps/PokemonTower_3F/scripts.inc +++ b/data/maps/PokemonTower_3F/scripts.inc @@ -2,16 +2,38 @@ PokemonTower_3F_MapScripts:: .byte 0 PokemonTower_3F_EventScript_Patricia:: - trainerbattle_single TRAINER_CHANNELER_PATRICIA, PokemonTower_3F_Text_PatriciaIntro, PokemonTower_3F_Text_PatriciaDefeat - msgbox PokemonTower_3F_Text_PatriciaPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_CHANNELER_PATRICIA, PokemonTower_3F_Text_PatriciaIntro, PokemonTower_3F_Text_PatriciaDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonTower_3F_EventScript_PatriciaRematch + msgbox PokemonTower_3F_Text_PatriciaPostBattle, MSGBOX_AUTOCLOSE + end + +PokemonTower_3F_EventScript_PatriciaRematch:: + trainerbattle_rematch TRAINER_CHANNELER_PATRICIA, PokemonTower_3F_Text_PatriciaIntro, PokemonTower_3F_Text_PatriciaDefeat + msgbox PokemonTower_3F_Text_PatriciaPostBattle, MSGBOX_AUTOCLOSE + end PokemonTower_3F_EventScript_Carly:: - trainerbattle_single TRAINER_CHANNELER_CARLY, PokemonTower_3F_Text_CarlyIntro, PokemonTower_3F_Text_CarlyDefeat - msgbox PokemonTower_3F_Text_CarlyPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_CHANNELER_CARLY, PokemonTower_3F_Text_CarlyIntro, PokemonTower_3F_Text_CarlyDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonTower_3F_EventScript_CarlyRematch + msgbox PokemonTower_3F_Text_CarlyPostBattle, MSGBOX_AUTOCLOSE + end + +PokemonTower_3F_EventScript_CarlyRematch:: + trainerbattle_rematch TRAINER_CHANNELER_CARLY, PokemonTower_3F_Text_CarlyIntro, PokemonTower_3F_Text_CarlyDefeat + msgbox PokemonTower_3F_Text_CarlyPostBattle, MSGBOX_AUTOCLOSE + end PokemonTower_3F_EventScript_Hope:: - trainerbattle_single TRAINER_CHANNELER_HOPE, PokemonTower_3F_Text_HopeIntro, PokemonTower_3F_Text_HopeDefeat - msgbox PokemonTower_3F_Text_HopePostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_CHANNELER_HOPE, PokemonTower_3F_Text_HopeIntro, PokemonTower_3F_Text_HopeDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonTower_3F_EventScript_HopeRematch + msgbox PokemonTower_3F_Text_HopePostBattle, MSGBOX_AUTOCLOSE + end + +PokemonTower_3F_EventScript_HopeRematch:: + trainerbattle_rematch TRAINER_CHANNELER_HOPE, PokemonTower_3F_Text_HopeIntro, PokemonTower_3F_Text_HopeDefeat + msgbox PokemonTower_3F_Text_HopePostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/PokemonTower_4F/scripts.inc b/data/maps/PokemonTower_4F/scripts.inc index e777bdb01..5c40ce49c 100644 --- a/data/maps/PokemonTower_4F/scripts.inc +++ b/data/maps/PokemonTower_4F/scripts.inc @@ -2,16 +2,38 @@ PokemonTower_4F_MapScripts:: .byte 0 PokemonTower_4F_EventScript_Paula:: - trainerbattle_single TRAINER_CHANNELER_PAULA, PokemonTower_4F_Text_PaulaIntro, PokemonTower_4F_Text_PaulaDefeat - msgbox PokemonTower_4F_Text_PaulaPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_CHANNELER_PAULA, PokemonTower_4F_Text_PaulaIntro, PokemonTower_4F_Text_PaulaDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonTower_4F_EventScript_PaulaRematch + msgbox PokemonTower_4F_Text_PaulaPostBattle, MSGBOX_AUTOCLOSE + end + +PokemonTower_4F_EventScript_PaulaRematch:: + trainerbattle_rematch TRAINER_CHANNELER_PAULA, PokemonTower_4F_Text_PaulaIntro, PokemonTower_4F_Text_PaulaDefeat + msgbox PokemonTower_4F_Text_PaulaPostBattle, MSGBOX_AUTOCLOSE + end PokemonTower_4F_EventScript_Laurel:: - trainerbattle_single TRAINER_CHANNELER_LAUREL, PokemonTower_4F_Text_LaurelIntro, PokemonTower_4F_Text_LaurelDefeat - msgbox PokemonTower_4F_Text_LaurelPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_CHANNELER_LAUREL, PokemonTower_4F_Text_LaurelIntro, PokemonTower_4F_Text_LaurelDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonTower_4F_EventScript_LaurelRematch + msgbox PokemonTower_4F_Text_LaurelPostBattle, MSGBOX_AUTOCLOSE + end + +PokemonTower_4F_EventScript_LaurelRematch:: + trainerbattle_rematch TRAINER_CHANNELER_LAUREL, PokemonTower_4F_Text_LaurelIntro, PokemonTower_4F_Text_LaurelDefeat + msgbox PokemonTower_4F_Text_LaurelPostBattle, MSGBOX_AUTOCLOSE + end PokemonTower_4F_EventScript_Jody:: - trainerbattle_single TRAINER_CHANNELER_JODY, PokemonTower_4F_Text_JodyIntro, PokemonTower_4F_Text_JodyDefeat - msgbox PokemonTower_4F_Text_JodyPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_CHANNELER_JODY, PokemonTower_4F_Text_JodyIntro, PokemonTower_4F_Text_JodyDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonTower_4F_EventScript_JodyRematch + msgbox PokemonTower_4F_Text_JodyPostBattle, MSGBOX_AUTOCLOSE + end + +PokemonTower_4F_EventScript_JodyRematch:: + trainerbattle_rematch TRAINER_CHANNELER_JODY, PokemonTower_4F_Text_JodyIntro, PokemonTower_4F_Text_JodyDefeat + msgbox PokemonTower_4F_Text_JodyPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc index 5a70571fa..ed3c13587 100644 --- a/data/maps/PokemonTower_5F/scripts.inc +++ b/data/maps/PokemonTower_5F/scripts.inc @@ -22,21 +22,50 @@ PokemonTower_5F_EventScript_ExitPurifiedZone:: end PokemonTower_5F_EventScript_Tammy:: - trainerbattle_single TRAINER_CHANNELER_TAMMY, PokemonTower_5F_Text_TammyIntro, PokemonTower_5F_Text_TammyDefeat - msgbox PokemonTower_5F_Text_TammyPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_CHANNELER_TAMMY, PokemonTower_5F_Text_TammyIntro, PokemonTower_5F_Text_TammyDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonTower_5F_EventScript_TammyRematch + msgbox PokemonTower_5F_Text_TammyPostBattle, MSGBOX_AUTOCLOSE + end + +PokemonTower_5F_EventScript_TammyRematch:: + trainerbattle_rematch TRAINER_CHANNELER_TAMMY, PokemonTower_5F_Text_TammyIntro, PokemonTower_5F_Text_TammyDefeat + msgbox PokemonTower_5F_Text_TammyPostBattle, MSGBOX_AUTOCLOSE + end PokemonTower_5F_EventScript_Ruth:: - trainerbattle_single TRAINER_CHANNELER_RUTH, PokemonTower_5F_Text_RuthIntro, PokemonTower_5F_Text_RuthDefeat - msgbox PokemonTower_5F_Text_RuthPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_CHANNELER_RUTH, PokemonTower_5F_Text_RuthIntro, PokemonTower_5F_Text_RuthDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonTower_5F_EventScript_RuthRematch + msgbox PokemonTower_5F_Text_RuthPostBattle, MSGBOX_AUTOCLOSE + end + +PokemonTower_5F_EventScript_RuthRematch:: + trainerbattle_rematch TRAINER_CHANNELER_RUTH, PokemonTower_5F_Text_RuthIntro, PokemonTower_5F_Text_RuthDefeat + msgbox PokemonTower_5F_Text_RuthPostBattle, MSGBOX_AUTOCLOSE + end PokemonTower_5F_EventScript_Karina:: - trainerbattle_single TRAINER_CHANNELER_KARINA, PokemonTower_5F_Text_KarinaIntro, PokemonTower_5F_Text_KarinaDefeat - msgbox PokemonTower_5F_Text_KarinaPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_CHANNELER_KARINA, PokemonTower_5F_Text_KarinaIntro, PokemonTower_5F_Text_KarinaDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonTower_5F_EventScript_KarinaRematch + msgbox PokemonTower_5F_Text_KarinaPostBattle, MSGBOX_AUTOCLOSE + end + +PokemonTower_5F_EventScript_KarinaRematch:: + trainerbattle_rematch TRAINER_CHANNELER_KARINA, PokemonTower_5F_Text_KarinaIntro, PokemonTower_5F_Text_KarinaDefeat + msgbox PokemonTower_5F_Text_KarinaPostBattle, MSGBOX_AUTOCLOSE + end PokemonTower_5F_EventScript_Janae:: - trainerbattle_single TRAINER_CHANNELER_JANAE, PokemonTower_5F_Text_JanaeIntro, PokemonTower_5F_Text_JanaeDefeat - msgbox PokemonTower_5F_Text_JanaePostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_CHANNELER_JANAE, PokemonTower_5F_Text_JanaeIntro, PokemonTower_5F_Text_JanaeDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonTower_5F_EventScript_JanaeRematch + msgbox PokemonTower_5F_Text_JanaePostBattle, MSGBOX_AUTOCLOSE + end + +PokemonTower_5F_EventScript_JanaeRematch:: + trainerbattle_rematch TRAINER_CHANNELER_JANAE, PokemonTower_5F_Text_JanaeIntro, PokemonTower_5F_Text_JanaeDefeat + msgbox PokemonTower_5F_Text_JanaePostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index ba5969ab1..5faff7883 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -33,16 +33,38 @@ PokemonTower_6F_Movement_ForcePlayerUp:: step_end PokemonTower_6F_EventScript_Angelica:: - trainerbattle_single TRAINER_CHANNELER_ANGELICA, PokemonTower_6F_Text_AngelicaIntro, PokemonTower_6F_Text_AngelicaDefeat - msgbox PokemonTower_6F_Text_AngelicaPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_CHANNELER_ANGELICA, PokemonTower_6F_Text_AngelicaIntro, PokemonTower_6F_Text_AngelicaDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonTower_6F_EventScript_AngelicaRematch + msgbox PokemonTower_6F_Text_AngelicaPostBattle, MSGBOX_AUTOCLOSE + end + +PokemonTower_6F_EventScript_AngelicaRematch:: + trainerbattle_rematch TRAINER_CHANNELER_ANGELICA, PokemonTower_6F_Text_AngelicaIntro, PokemonTower_6F_Text_AngelicaDefeat + msgbox PokemonTower_6F_Text_AngelicaPostBattle, MSGBOX_AUTOCLOSE + end PokemonTower_6F_EventScript_Emilia:: - trainerbattle_single TRAINER_CHANNELER_EMILIA, PokemonTower_6F_Text_EmiliaIntro, PokemonTower_6F_Text_EmiliaDefeat - msgbox PokemonTower_6F_Text_EmiliaPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_CHANNELER_EMILIA, PokemonTower_6F_Text_EmiliaIntro, PokemonTower_6F_Text_EmiliaDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonTower_6F_EventScript_EmiliaRematch + msgbox PokemonTower_6F_Text_EmiliaPostBattle, MSGBOX_AUTOCLOSE + end + +PokemonTower_6F_EventScript_EmiliaRematch:: + trainerbattle_rematch TRAINER_CHANNELER_EMILIA, PokemonTower_6F_Text_EmiliaIntro, PokemonTower_6F_Text_EmiliaDefeat + msgbox PokemonTower_6F_Text_EmiliaPostBattle, MSGBOX_AUTOCLOSE + end PokemonTower_6F_EventScript_Jennifer:: - trainerbattle_single TRAINER_CHANNELER_JENNIFER, PokemonTower_6F_Text_JenniferIntro, PokemonTower_6F_Text_JenniferDefeat - msgbox PokemonTower_6F_Text_JenniferPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_CHANNELER_JENNIFER, PokemonTower_6F_Text_JenniferIntro, PokemonTower_6F_Text_JenniferDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, PokemonTower_6F_EventScript_JenniferRematch + msgbox PokemonTower_6F_Text_JenniferPostBattle, MSGBOX_AUTOCLOSE + end + +PokemonTower_6F_EventScript_JenniferRematch:: + trainerbattle_rematch TRAINER_CHANNELER_JENNIFER, PokemonTower_6F_Text_JenniferIntro, PokemonTower_6F_Text_JenniferDefeat + msgbox PokemonTower_6F_Text_JenniferPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc index 6ab2e4506..902ef76b3 100644 --- a/data/maps/RockTunnel_1F/scripts.inc +++ b/data/maps/RockTunnel_1F/scripts.inc @@ -11,36 +11,86 @@ RockTunnel_1F_EventScript_RouteSign:: end RockTunnel_1F_EventScript_Lenny:: - trainerbattle_single TRAINER_HIKER_LENNY, RockTunnel_1F_Text_LennyIntro, RockTunnel_1F_Text_LennyDefeat - msgbox RockTunnel_1F_Text_LennyPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_HIKER_LENNY, RockTunnel_1F_Text_LennyIntro, RockTunnel_1F_Text_LennyDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RockTunnel_1F_EventScript_LennyRematch + msgbox RockTunnel_1F_Text_LennyPostBattle, MSGBOX_AUTOCLOSE + end + +RockTunnel_1F_EventScript_LennyRematch:: + trainerbattle_rematch TRAINER_HIKER_LENNY, RockTunnel_1F_Text_LennyIntro, RockTunnel_1F_Text_LennyDefeat + msgbox RockTunnel_1F_Text_LennyPostBattle, MSGBOX_AUTOCLOSE + end RockTunnel_1F_EventScript_Oliver:: - trainerbattle_single TRAINER_HIKER_OLIVER, RockTunnel_1F_Text_OliverIntro, RockTunnel_1F_Text_OliverDefeat - msgbox RockTunnel_1F_Text_OliverPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_HIKER_OLIVER, RockTunnel_1F_Text_OliverIntro, RockTunnel_1F_Text_OliverDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RockTunnel_1F_EventScript_OliverRematch + msgbox RockTunnel_1F_Text_OliverPostBattle, MSGBOX_AUTOCLOSE + end + +RockTunnel_1F_EventScript_OliverRematch:: + trainerbattle_rematch TRAINER_HIKER_OLIVER, RockTunnel_1F_Text_OliverIntro, RockTunnel_1F_Text_OliverDefeat + msgbox RockTunnel_1F_Text_OliverPostBattle, MSGBOX_AUTOCLOSE + end RockTunnel_1F_EventScript_Lucas:: - trainerbattle_single TRAINER_HIKER_LUCAS, RockTunnel_1F_Text_LucasIntro, RockTunnel_1F_Text_LucasDefeat - msgbox RockTunnel_1F_Text_LucasPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_HIKER_LUCAS, RockTunnel_1F_Text_LucasIntro, RockTunnel_1F_Text_LucasDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RockTunnel_1F_EventScript_LucasRematch + msgbox RockTunnel_1F_Text_LucasPostBattle, MSGBOX_AUTOCLOSE + end + +RockTunnel_1F_EventScript_LucasRematch:: + trainerbattle_rematch TRAINER_HIKER_LUCAS, RockTunnel_1F_Text_LucasIntro, RockTunnel_1F_Text_LucasDefeat + msgbox RockTunnel_1F_Text_LucasPostBattle, MSGBOX_AUTOCLOSE + end RockTunnel_1F_EventScript_Ashton:: - trainerbattle_single TRAINER_POKEMANIAC_ASHTON, RockTunnel_1F_Text_AshtonIntro, RockTunnel_1F_Text_AshtonDefeat - msgbox RockTunnel_1F_Text_AshtonPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_POKEMANIAC_ASHTON, RockTunnel_1F_Text_AshtonIntro, RockTunnel_1F_Text_AshtonDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RockTunnel_1F_EventScript_AshtonRematch + msgbox RockTunnel_1F_Text_AshtonPostBattle, MSGBOX_AUTOCLOSE + end + +RockTunnel_1F_EventScript_AshtonRematch:: + trainerbattle_rematch TRAINER_POKEMANIAC_ASHTON, RockTunnel_1F_Text_AshtonIntro, RockTunnel_1F_Text_AshtonDefeat + msgbox RockTunnel_1F_Text_AshtonPostBattle, MSGBOX_AUTOCLOSE + end RockTunnel_1F_EventScript_Leah:: - trainerbattle_single TRAINER_PICNICKER_LEAH, RockTunnel_1F_Text_LeahIntro, RockTunnel_1F_Text_LeahDefeat - msgbox RockTunnel_1F_Text_LeahPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_PICNICKER_LEAH, RockTunnel_1F_Text_LeahIntro, RockTunnel_1F_Text_LeahDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RockTunnel_1F_EventScript_LeahRematch + msgbox RockTunnel_1F_Text_LeahPostBattle, MSGBOX_AUTOCLOSE + end + +RockTunnel_1F_EventScript_LeahRematch:: + trainerbattle_rematch TRAINER_PICNICKER_LEAH, RockTunnel_1F_Text_LeahIntro, RockTunnel_1F_Text_LeahDefeat + msgbox RockTunnel_1F_Text_LeahPostBattle, MSGBOX_AUTOCLOSE + end RockTunnel_1F_EventScript_Ariana:: - trainerbattle_single TRAINER_PICNICKER_ARIANA, RockTunnel_1F_Text_ArianaIntro, RockTunnel_1F_Text_ArianaDefeat - msgbox RockTunnel_1F_Text_ArianaPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_PICNICKER_ARIANA, RockTunnel_1F_Text_ArianaIntro, RockTunnel_1F_Text_ArianaDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RockTunnel_1F_EventScript_ArianaRematch + msgbox RockTunnel_1F_Text_ArianaPostBattle, MSGBOX_AUTOCLOSE + end + +RockTunnel_1F_EventScript_ArianaRematch:: + trainerbattle_rematch TRAINER_PICNICKER_ARIANA, RockTunnel_1F_Text_ArianaIntro, RockTunnel_1F_Text_ArianaDefeat + msgbox RockTunnel_1F_Text_ArianaPostBattle, MSGBOX_AUTOCLOSE + end RockTunnel_1F_EventScript_Dana:: - trainerbattle_single TRAINER_PICNICKER_DANA, RockTunnel_1F_Text_DanaIntro, RockTunnel_1F_Text_DanaDefeat - msgbox RockTunnel_1F_Text_DanaPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_PICNICKER_DANA, RockTunnel_1F_Text_DanaIntro, RockTunnel_1F_Text_DanaDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RockTunnel_1F_EventScript_DanaRematch + msgbox RockTunnel_1F_Text_DanaPostBattle, MSGBOX_AUTOCLOSE + end + +RockTunnel_1F_EventScript_DanaRematch:: + trainerbattle_rematch TRAINER_PICNICKER_DANA, RockTunnel_1F_Text_DanaIntro, RockTunnel_1F_Text_DanaDefeat + msgbox RockTunnel_1F_Text_DanaPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/RockTunnel_B1F/scripts.inc b/data/maps/RockTunnel_B1F/scripts.inc index 028414b8a..61d8d26db 100644 --- a/data/maps/RockTunnel_B1F/scripts.inc +++ b/data/maps/RockTunnel_B1F/scripts.inc @@ -2,41 +2,98 @@ RockTunnel_B1F_MapScripts:: .byte 0 RockTunnel_B1F_EventScript_Sofia:: - trainerbattle_single TRAINER_PICNICKER_SOFIA, RockTunnel_B1F_Text_SofiaIntro, RockTunnel_B1F_Text_SofiaDefeat - msgbox RockTunnel_B1F_Text_SofiaPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_PICNICKER_SOFIA, RockTunnel_B1F_Text_SofiaIntro, RockTunnel_B1F_Text_SofiaDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RockTunnel_B1F_EventScript_SofiaRematch + msgbox RockTunnel_B1F_Text_SofiaPostBattle, MSGBOX_AUTOCLOSE + end + +RockTunnel_B1F_EventScript_SofiaRematch:: + trainerbattle_rematch TRAINER_PICNICKER_SOFIA, RockTunnel_B1F_Text_SofiaIntro, RockTunnel_B1F_Text_SofiaDefeat + msgbox RockTunnel_B1F_Text_SofiaPostBattle, MSGBOX_AUTOCLOSE + end RockTunnel_B1F_EventScript_Martha:: - trainerbattle_single TRAINER_PICNICKER_MARTHA, RockTunnel_B1F_Text_MarthaIntro, RockTunnel_B1F_Text_MarthaDefeat - msgbox RockTunnel_B1F_Text_MarthaPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_PICNICKER_MARTHA, RockTunnel_B1F_Text_MarthaIntro, RockTunnel_B1F_Text_MarthaDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RockTunnel_B1F_EventScript_MarthaRematch + msgbox RockTunnel_B1F_Text_MarthaPostBattle, MSGBOX_AUTOCLOSE + end + +RockTunnel_B1F_EventScript_MarthaRematch:: + trainerbattle_rematch TRAINER_PICNICKER_MARTHA, RockTunnel_B1F_Text_MarthaIntro, RockTunnel_B1F_Text_MarthaDefeat + msgbox RockTunnel_B1F_Text_MarthaPostBattle, MSGBOX_AUTOCLOSE + end RockTunnel_B1F_EventScript_Dudley:: - trainerbattle_single TRAINER_HIKER_DUDLEY, RockTunnel_B1F_Text_DudleyIntro, RockTunnel_B1F_Text_DudleyDefeat - msgbox RockTunnel_B1F_Text_DudleyPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_HIKER_DUDLEY, RockTunnel_B1F_Text_DudleyIntro, RockTunnel_B1F_Text_DudleyDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RockTunnel_B1F_EventScript_DudleyRematch + msgbox RockTunnel_B1F_Text_DudleyPostBattle, MSGBOX_AUTOCLOSE + end + +RockTunnel_B1F_EventScript_DudleyRematch:: + trainerbattle_rematch TRAINER_HIKER_DUDLEY, RockTunnel_B1F_Text_DudleyIntro, RockTunnel_B1F_Text_DudleyDefeat + msgbox RockTunnel_B1F_Text_DudleyPostBattle, MSGBOX_AUTOCLOSE + end RockTunnel_B1F_EventScript_Allen:: - trainerbattle_single TRAINER_HIKER_ALLEN, RockTunnel_B1F_Text_AllenIntro, RockTunnel_B1F_Text_AllenDefeat - msgbox RockTunnel_B1F_Text_AllenPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_HIKER_ALLEN, RockTunnel_B1F_Text_AllenIntro, RockTunnel_B1F_Text_AllenDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RockTunnel_B1F_EventScript_AllenRematch + msgbox RockTunnel_B1F_Text_AllenPostBattle, MSGBOX_AUTOCLOSE + end + +RockTunnel_B1F_EventScript_AllenRematch:: + trainerbattle_rematch TRAINER_HIKER_ALLEN, RockTunnel_B1F_Text_AllenIntro, RockTunnel_B1F_Text_AllenDefeat + msgbox RockTunnel_B1F_Text_AllenPostBattle, MSGBOX_AUTOCLOSE + end RockTunnel_B1F_EventScript_Eric:: - trainerbattle_single TRAINER_HIKER_ERIC, RockTunnel_B1F_Text_EricIntro, RockTunnel_B1F_Text_EricDefeat - msgbox RockTunnel_B1F_Text_EricPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_HIKER_ERIC, RockTunnel_B1F_Text_EricIntro, RockTunnel_B1F_Text_EricDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RockTunnel_B1F_EventScript_EricRematch + msgbox RockTunnel_B1F_Text_EricPostBattle, MSGBOX_AUTOCLOSE + end + +RockTunnel_B1F_EventScript_EricRematch:: + trainerbattle_rematch TRAINER_HIKER_ERIC, RockTunnel_B1F_Text_EricIntro, RockTunnel_B1F_Text_EricDefeat + msgbox RockTunnel_B1F_Text_EricPostBattle, MSGBOX_AUTOCLOSE + end RockTunnel_B1F_EventScript_Cooper:: - trainerbattle_single TRAINER_POKEMANIAC_COOPER, RockTunnel_B1F_Text_CooperIntro, RockTunnel_B1F_Text_CooperDefeat - msgbox RockTunnel_B1F_Text_CooperPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_POKEMANIAC_COOPER, RockTunnel_B1F_Text_CooperIntro, RockTunnel_B1F_Text_CooperDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RockTunnel_B1F_EventScript_CooperRematch + msgbox RockTunnel_B1F_Text_CooperPostBattle, MSGBOX_AUTOCLOSE + end + +RockTunnel_B1F_EventScript_CooperRematch:: + trainerbattle_rematch TRAINER_POKEMANIAC_COOPER, RockTunnel_B1F_Text_CooperIntro, RockTunnel_B1F_Text_CooperDefeat + msgbox RockTunnel_B1F_Text_CooperPostBattle, MSGBOX_AUTOCLOSE + end RockTunnel_B1F_EventScript_Steve:: - trainerbattle_single TRAINER_POKEMANIAC_STEVE, RockTunnel_B1F_Text_SteveIntro, RockTunnel_B1F_Text_SteveDefeat - msgbox RockTunnel_B1F_Text_StevePostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_POKEMANIAC_STEVE, RockTunnel_B1F_Text_SteveIntro, RockTunnel_B1F_Text_SteveDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RockTunnel_B1F_EventScript_SteveRematch + msgbox RockTunnel_B1F_Text_StevePostBattle, MSGBOX_AUTOCLOSE + end + +RockTunnel_B1F_EventScript_SteveRematch:: + trainerbattle_rematch TRAINER_POKEMANIAC_STEVE, RockTunnel_B1F_Text_SteveIntro, RockTunnel_B1F_Text_SteveDefeat + msgbox RockTunnel_B1F_Text_StevePostBattle, MSGBOX_AUTOCLOSE + end RockTunnel_B1F_EventScript_Winston:: - trainerbattle_single TRAINER_POKEMANIAC_WINSTON, RockTunnel_B1F_Text_WinstonIntro, RockTunnel_B1F_Text_WinstonDefeat - msgbox RockTunnel_B1F_Text_WinstonPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_POKEMANIAC_WINSTON, RockTunnel_B1F_Text_WinstonIntro, RockTunnel_B1F_Text_WinstonDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RockTunnel_B1F_EventScript_WinstonRematch + msgbox RockTunnel_B1F_Text_WinstonPostBattle, MSGBOX_AUTOCLOSE + end + +RockTunnel_B1F_EventScript_WinstonRematch:: + trainerbattle_rematch TRAINER_POKEMANIAC_WINSTON, RockTunnel_B1F_Text_WinstonIntro, RockTunnel_B1F_Text_WinstonDefeat + msgbox RockTunnel_B1F_Text_WinstonPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index 6d9a2df9d..5859423f5 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -12,24 +12,52 @@ RocketHideout_B1F_OnTransition:: end RocketHideout_B1F_EventScript_Grunt1:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, RocketHideout_B1F_Text_Grunt1Intro, RocketHideout_B1F_Text_Grunt1Defeat - msgbox RocketHideout_B1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, RocketHideout_B1F_Text_Grunt1Intro, RocketHideout_B1F_Text_Grunt1Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RocketHideout_B1F_EventScript_Grunt1Rematch + msgbox RocketHideout_B1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end + +RocketHideout_B1F_EventScript_Grunt1Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_8, RocketHideout_B1F_Text_Grunt1Intro, RocketHideout_B1F_Text_Grunt1Defeat + msgbox RocketHideout_B1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end RocketHideout_B1F_EventScript_Grunt2:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, RocketHideout_B1F_Text_Grunt2Intro, RocketHideout_B1F_Text_Grunt2Defeat - msgbox RocketHideout_B1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, RocketHideout_B1F_Text_Grunt2Intro, RocketHideout_B1F_Text_Grunt2Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RocketHideout_B1F_EventScript_Grunt2Rematch + msgbox RocketHideout_B1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end + +RocketHideout_B1F_EventScript_Grunt2Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_9, RocketHideout_B1F_Text_Grunt2Intro, RocketHideout_B1F_Text_Grunt2Defeat + msgbox RocketHideout_B1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end RocketHideout_B1F_EventScript_Grunt3:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, RocketHideout_B1F_Text_Grunt3Intro, RocketHideout_B1F_Text_Grunt3Defeat - msgbox RocketHideout_B1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, RocketHideout_B1F_Text_Grunt3Intro, RocketHideout_B1F_Text_Grunt3Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RocketHideout_B1F_EventScript_Grunt3Rematch + msgbox RocketHideout_B1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE + end + +RocketHideout_B1F_EventScript_Grunt3Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_10, RocketHideout_B1F_Text_Grunt3Intro, RocketHideout_B1F_Text_Grunt3Defeat + msgbox RocketHideout_B1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE + end RocketHideout_B1F_EventScript_Grunt4:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, RocketHideout_B1F_Text_Grunt4Intro, RocketHideout_B1F_Text_Grunt4Defeat - msgbox RocketHideout_B1F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, RocketHideout_B1F_Text_Grunt4Intro, RocketHideout_B1F_Text_Grunt4Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RocketHideout_B1F_EventScript_Grunt4Rematch + msgbox RocketHideout_B1F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE + end + +RocketHideout_B1F_EventScript_Grunt4Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_11, RocketHideout_B1F_Text_Grunt4Intro, RocketHideout_B1F_Text_Grunt4Defeat + msgbox RocketHideout_B1F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE + end RocketHideout_B1F_EventScript_Grunt5:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, RocketHideout_B1F_Text_Grunt5Intro, RocketHideout_B1F_Text_Grunt5Defeat, RocketHideout_B1F_EventScript_DefeatedGrunt5 @@ -61,3 +89,4 @@ RocketHideout_B1F_EventScript_RemoveBarrier:: setmetatile 20, 21, METATILE_SilphCo_HideoutFloor_ShadeFull, 0 setmetatile 21, 21, METATILE_SilphCo_HideoutFloor, 0 return + diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc index 0b12d3cbb..263fd212f 100644 --- a/data/maps/RocketHideout_B2F/scripts.inc +++ b/data/maps/RocketHideout_B2F/scripts.inc @@ -2,6 +2,14 @@ RocketHideout_B2F_MapScripts:: .byte 0 RocketHideout_B2F_EventScript_Grunt:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, RocketHideout_B2F_Text_GruntIntro, RocketHideout_B2F_Text_GruntDefeat - msgbox RocketHideout_B2F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, RocketHideout_B2F_Text_GruntIntro, RocketHideout_B2F_Text_GruntDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RocketHideout_B2F_EventScript_GruntRematch + msgbox RocketHideout_B2F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE + end + +RocketHideout_B2F_EventScript_GruntRematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_13, RocketHideout_B2F_Text_GruntIntro, RocketHideout_B2F_Text_GruntDefeat + msgbox RocketHideout_B2F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc index 8ca9a57d9..3e789bab8 100644 --- a/data/maps/RocketHideout_B3F/scripts.inc +++ b/data/maps/RocketHideout_B3F/scripts.inc @@ -2,11 +2,26 @@ RocketHideout_B3F_MapScripts:: .byte 0 RocketHideout_B3F_EventScript_Grunt1:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, RocketHideout_B3F_Text_Grunt1Intro, RocketHideout_B3F_Text_Grunt1Defeat - msgbox RocketHideout_B3F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, RocketHideout_B3F_Text_Grunt1Intro, RocketHideout_B3F_Text_Grunt1Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RocketHideout_B3F_EventScript_Grunt1Rematch + msgbox RocketHideout_B3F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end + +RocketHideout_B3F_EventScript_Grunt1Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_14, RocketHideout_B3F_Text_Grunt1Intro, RocketHideout_B3F_Text_Grunt1Defeat + msgbox RocketHideout_B3F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end RocketHideout_B3F_EventScript_Grunt2:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, RocketHideout_B3F_Text_Grunt2Intro, RocketHideout_B3F_Text_Grunt2Defeat - msgbox RocketHideout_B3F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, RocketHideout_B3F_Text_Grunt2Intro, RocketHideout_B3F_Text_Grunt2Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, RocketHideout_B3F_EventScript_Grunt2Rematch + msgbox RocketHideout_B3F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end + +RocketHideout_B3F_EventScript_Grunt2Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_15, RocketHideout_B3F_Text_Grunt2Intro, RocketHideout_B3F_Text_Grunt2Defeat + msgbox RocketHideout_B3F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SSAnne_1F_Room2/scripts.inc b/data/maps/SSAnne_1F_Room2/scripts.inc index ae1cc71e4..3178c0f15 100644 --- a/data/maps/SSAnne_1F_Room2/scripts.inc +++ b/data/maps/SSAnne_1F_Room2/scripts.inc @@ -6,11 +6,26 @@ SSAnne_1F_Room2_EventScript_Woman:: end SSAnne_1F_Room2_EventScript_Ann:: - trainerbattle_single TRAINER_LASS_ANN, SSAnne_1F_Room2_Text_AnnIntro, SSAnne_1F_Room2_Text_AnnDefeat - msgbox SSAnne_1F_Room2_Text_AnnPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_LASS_ANN, SSAnne_1F_Room2_Text_AnnIntro, SSAnne_1F_Room2_Text_AnnDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SSAnne_1F_Room2_EventScript_AnnRematch + msgbox SSAnne_1F_Room2_Text_AnnPostBattle, MSGBOX_AUTOCLOSE + end + +SSAnne_1F_Room2_EventScript_AnnRematch:: + trainerbattle_rematch TRAINER_LASS_ANN, SSAnne_1F_Room2_Text_AnnIntro, SSAnne_1F_Room2_Text_AnnDefeat + msgbox SSAnne_1F_Room2_Text_AnnPostBattle, MSGBOX_AUTOCLOSE + end SSAnne_1F_Room2_EventScript_Tyler:: - trainerbattle_single TRAINER_YOUNGSTER_TYLER, SSAnne_1F_Room2_Text_TylerIntro, SSAnne_1F_Room2_Text_TylerDefeat - msgbox SSAnne_1F_Room2_Text_TylerPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_YOUNGSTER_TYLER, SSAnne_1F_Room2_Text_TylerIntro, SSAnne_1F_Room2_Text_TylerDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SSAnne_1F_Room2_EventScript_TylerRematch + msgbox SSAnne_1F_Room2_Text_TylerPostBattle, MSGBOX_AUTOCLOSE + end + +SSAnne_1F_Room2_EventScript_TylerRematch:: + trainerbattle_rematch TRAINER_YOUNGSTER_TYLER, SSAnne_1F_Room2_Text_TylerIntro, SSAnne_1F_Room2_Text_TylerDefeat + msgbox SSAnne_1F_Room2_Text_TylerPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SSAnne_1F_Room5/scripts.inc b/data/maps/SSAnne_1F_Room5/scripts.inc index 1ce15d72c..07bf1f772 100644 --- a/data/maps/SSAnne_1F_Room5/scripts.inc +++ b/data/maps/SSAnne_1F_Room5/scripts.inc @@ -2,6 +2,14 @@ SSAnne_1F_Room5_MapScripts:: .byte 0 SSAnne_1F_Room5_EventScript_Arthur:: - trainerbattle_single TRAINER_GENTLEMAN_ARTHUR, SSAnne_1F_Room5_Text_ArthurIntro, SSAnne_1F_Room5_Text_ArthurDefeat - msgbox SSAnne_1F_Room5_Text_ArthurPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_GENTLEMAN_ARTHUR, SSAnne_1F_Room5_Text_ArthurIntro, SSAnne_1F_Room5_Text_ArthurDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SSAnne_1F_Room5_EventScript_ArthurRematch + msgbox SSAnne_1F_Room5_Text_ArthurPostBattle, MSGBOX_AUTOCLOSE + end + +SSAnne_1F_Room5_EventScript_ArthurRematch:: + trainerbattle_rematch TRAINER_GENTLEMAN_ARTHUR, SSAnne_1F_Room5_Text_ArthurIntro, SSAnne_1F_Room5_Text_ArthurDefeat + msgbox SSAnne_1F_Room5_Text_ArthurPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SSAnne_1F_Room7/scripts.inc b/data/maps/SSAnne_1F_Room7/scripts.inc index 480c81e35..ceb378ae5 100644 --- a/data/maps/SSAnne_1F_Room7/scripts.inc +++ b/data/maps/SSAnne_1F_Room7/scripts.inc @@ -2,6 +2,14 @@ SSAnne_1F_Room7_MapScripts:: .byte 0 SSAnne_1F_Room7_EventScript_Thomas:: - trainerbattle_single TRAINER_GENTLEMAN_THOMAS, SSAnne_1F_Room7_Text_ThomasIntro, SSAnne_1F_Room7_Text_ThomasDefeat - msgbox SSAnne_1F_Room7_Text_ThomasPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_GENTLEMAN_THOMAS, SSAnne_1F_Room7_Text_ThomasIntro, SSAnne_1F_Room7_Text_ThomasDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SSAnne_1F_Room7_EventScript_ThomasRematch + msgbox SSAnne_1F_Room7_Text_ThomasPostBattle, MSGBOX_AUTOCLOSE + end + +SSAnne_1F_Room7_EventScript_ThomasRematch:: + trainerbattle_rematch TRAINER_GENTLEMAN_THOMAS, SSAnne_1F_Room7_Text_ThomasIntro, SSAnne_1F_Room7_Text_ThomasDefeat + msgbox SSAnne_1F_Room7_Text_ThomasPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SSAnne_2F_Room2/scripts.inc b/data/maps/SSAnne_2F_Room2/scripts.inc index 76d31608c..237c317a0 100644 --- a/data/maps/SSAnne_2F_Room2/scripts.inc +++ b/data/maps/SSAnne_2F_Room2/scripts.inc @@ -2,11 +2,26 @@ SSAnne_2F_Room2_MapScripts:: .byte 0 SSAnne_2F_Room2_EventScript_Dale:: - trainerbattle_single TRAINER_FISHERMAN_DALE, SSAnne_2F_Room2_Text_DaleIntro, SSAnne_2F_Room2_Text_DaleDefeat - msgbox SSAnne_2F_Room2_Text_DalePostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_FISHERMAN_DALE, SSAnne_2F_Room2_Text_DaleIntro, SSAnne_2F_Room2_Text_DaleDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SSAnne_2F_Room2_EventScript_DaleRematch + msgbox SSAnne_2F_Room2_Text_DalePostBattle, MSGBOX_AUTOCLOSE + end + +SSAnne_2F_Room2_EventScript_DaleRematch:: + trainerbattle_rematch TRAINER_FISHERMAN_DALE, SSAnne_2F_Room2_Text_DaleIntro, SSAnne_2F_Room2_Text_DaleDefeat + msgbox SSAnne_2F_Room2_Text_DalePostBattle, MSGBOX_AUTOCLOSE + end SSAnne_2F_Room2_EventScript_Brooks:: - trainerbattle_single TRAINER_GENTLEMAN_BROOKS, SSAnne_2F_Room2_Text_BrooksIntro, SSAnne_2F_Room2_Text_BrooksDefeat - msgbox SSAnne_2F_Room2_Text_BrooksPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_GENTLEMAN_BROOKS, SSAnne_2F_Room2_Text_BrooksIntro, SSAnne_2F_Room2_Text_BrooksDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SSAnne_2F_Room2_EventScript_BrooksRematch + msgbox SSAnne_2F_Room2_Text_BrooksPostBattle, MSGBOX_AUTOCLOSE + end + +SSAnne_2F_Room2_EventScript_BrooksRematch:: + trainerbattle_rematch TRAINER_GENTLEMAN_BROOKS, SSAnne_2F_Room2_Text_BrooksIntro, SSAnne_2F_Room2_Text_BrooksDefeat + msgbox SSAnne_2F_Room2_Text_BrooksPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SSAnne_2F_Room4/scripts.inc b/data/maps/SSAnne_2F_Room4/scripts.inc index 30a5e5802..76275cfad 100644 --- a/data/maps/SSAnne_2F_Room4/scripts.inc +++ b/data/maps/SSAnne_2F_Room4/scripts.inc @@ -2,11 +2,26 @@ SSAnne_2F_Room4_MapScripts:: .byte 0 SSAnne_2F_Room4_EventScript_Lamar:: - trainerbattle_single TRAINER_GENTLEMAN_LAMAR, SSAnne_2F_Room4_Text_LamarIntro, SSAnne_2F_Room4_Text_LamarDefeat - msgbox SSAnne_2F_Room4_Text_LamarPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_GENTLEMAN_LAMAR, SSAnne_2F_Room4_Text_LamarIntro, SSAnne_2F_Room4_Text_LamarDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SSAnne_2F_Room4_EventScript_LamarRematch + msgbox SSAnne_2F_Room4_Text_LamarPostBattle, MSGBOX_AUTOCLOSE + end + +SSAnne_2F_Room4_EventScript_LamarRematch:: + trainerbattle_rematch TRAINER_GENTLEMAN_LAMAR, SSAnne_2F_Room4_Text_LamarIntro, SSAnne_2F_Room4_Text_LamarDefeat + msgbox SSAnne_2F_Room4_Text_LamarPostBattle, MSGBOX_AUTOCLOSE + end SSAnne_2F_Room4_EventScript_Dawn:: - trainerbattle_single TRAINER_LASS_DAWN, SSAnne_2F_Room4_Text_DawnIntro, SSAnne_2F_Room4_Text_DawnDefeat - msgbox SSAnne_2F_Room4_Text_DawnPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_LASS_DAWN, SSAnne_2F_Room4_Text_DawnIntro, SSAnne_2F_Room4_Text_DawnDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SSAnne_2F_Room4_EventScript_DawnRematch + msgbox SSAnne_2F_Room4_Text_DawnPostBattle, MSGBOX_AUTOCLOSE + end + +SSAnne_2F_Room4_EventScript_DawnRematch:: + trainerbattle_rematch TRAINER_LASS_DAWN, SSAnne_2F_Room4_Text_DawnIntro, SSAnne_2F_Room4_Text_DawnDefeat + msgbox SSAnne_2F_Room4_Text_DawnPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SSAnne_B1F_Room1/scripts.inc b/data/maps/SSAnne_B1F_Room1/scripts.inc index 482276ed3..f8404a30d 100644 --- a/data/maps/SSAnne_B1F_Room1/scripts.inc +++ b/data/maps/SSAnne_B1F_Room1/scripts.inc @@ -2,11 +2,26 @@ SSAnne_B1F_Room1_MapScripts:: .byte 0 SSAnne_B1F_Room1_EventScript_Barny:: - trainerbattle_single TRAINER_FISHERMAN_BARNY, SSAnne_B1F_Room1_Text_BarnyIntro, SSAnne_B1F_Room1_Text_BarnyDefeat - msgbox SSAnne_B1F_Room1_Text_BarnyPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_FISHERMAN_BARNY, SSAnne_B1F_Room1_Text_BarnyIntro, SSAnne_B1F_Room1_Text_BarnyDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SSAnne_B1F_Room1_EventScript_BarnyRematch + msgbox SSAnne_B1F_Room1_Text_BarnyPostBattle, MSGBOX_AUTOCLOSE + end + +SSAnne_B1F_Room1_EventScript_BarnyRematch:: + trainerbattle_rematch TRAINER_FISHERMAN_BARNY, SSAnne_B1F_Room1_Text_BarnyIntro, SSAnne_B1F_Room1_Text_BarnyDefeat + msgbox SSAnne_B1F_Room1_Text_BarnyPostBattle, MSGBOX_AUTOCLOSE + end SSAnne_B1F_Room1_EventScript_Phillip:: - trainerbattle_single TRAINER_SAILOR_PHILLIP, SSAnne_B1F_Room1_Text_PhillipIntro, SSAnne_B1F_Room1_Text_PhillipDefeat - msgbox SSAnne_B1F_Room1_Text_PhillipPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SAILOR_PHILLIP, SSAnne_B1F_Room1_Text_PhillipIntro, SSAnne_B1F_Room1_Text_PhillipDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SSAnne_B1F_Room1_EventScript_PhillipRematch + msgbox SSAnne_B1F_Room1_Text_PhillipPostBattle, MSGBOX_AUTOCLOSE + end + +SSAnne_B1F_Room1_EventScript_PhillipRematch:: + trainerbattle_rematch TRAINER_SAILOR_PHILLIP, SSAnne_B1F_Room1_Text_PhillipIntro, SSAnne_B1F_Room1_Text_PhillipDefeat + msgbox SSAnne_B1F_Room1_Text_PhillipPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SSAnne_B1F_Room2/scripts.inc b/data/maps/SSAnne_B1F_Room2/scripts.inc index 089214386..30a74e995 100644 --- a/data/maps/SSAnne_B1F_Room2/scripts.inc +++ b/data/maps/SSAnne_B1F_Room2/scripts.inc @@ -2,6 +2,14 @@ SSAnne_B1F_Room2_MapScripts:: .byte 0 SSAnne_B1F_Room2_EventScript_Huey:: - trainerbattle_single TRAINER_SAILOR_HUEY, SSAnne_B1F_Room2_Text_HueyIntro, SSAnne_B1F_Room2_Text_HueyDefeat - msgbox SSAnne_B1F_Room2_Text_HueyPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SAILOR_HUEY, SSAnne_B1F_Room2_Text_HueyIntro, SSAnne_B1F_Room2_Text_HueyDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SSAnne_B1F_Room2_EventScript_HueyRematch + msgbox SSAnne_B1F_Room2_Text_HueyPostBattle, MSGBOX_AUTOCLOSE + end + +SSAnne_B1F_Room2_EventScript_HueyRematch:: + trainerbattle_rematch TRAINER_SAILOR_HUEY, SSAnne_B1F_Room2_Text_HueyIntro, SSAnne_B1F_Room2_Text_HueyDefeat + msgbox SSAnne_B1F_Room2_Text_HueyPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SSAnne_B1F_Room3/scripts.inc b/data/maps/SSAnne_B1F_Room3/scripts.inc index f29f1a403..d09e910d1 100644 --- a/data/maps/SSAnne_B1F_Room3/scripts.inc +++ b/data/maps/SSAnne_B1F_Room3/scripts.inc @@ -2,6 +2,14 @@ SSAnne_B1F_Room3_MapScripts:: .byte 0 SSAnne_B1F_Room3_EventScript_Dylan:: - trainerbattle_single TRAINER_SAILOR_DYLAN, SSAnne_B1F_Room3_Text_DylanIntro, SSAnne_B1F_Room3_Text_DylanDefeat - msgbox SSAnne_B1F_Room3_Text_DylanPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SAILOR_DYLAN, SSAnne_B1F_Room3_Text_DylanIntro, SSAnne_B1F_Room3_Text_DylanDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SSAnne_B1F_Room3_EventScript_DylanRematch + msgbox SSAnne_B1F_Room3_Text_DylanPostBattle, MSGBOX_AUTOCLOSE + end + +SSAnne_B1F_Room3_EventScript_DylanRematch:: + trainerbattle_rematch TRAINER_SAILOR_DYLAN, SSAnne_B1F_Room3_Text_DylanIntro, SSAnne_B1F_Room3_Text_DylanDefeat + msgbox SSAnne_B1F_Room3_Text_DylanPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SSAnne_B1F_Room4/scripts.inc b/data/maps/SSAnne_B1F_Room4/scripts.inc index e1fde84a4..a306b9335 100644 --- a/data/maps/SSAnne_B1F_Room4/scripts.inc +++ b/data/maps/SSAnne_B1F_Room4/scripts.inc @@ -2,11 +2,26 @@ SSAnne_B1F_Room4_MapScripts:: .byte 0 SSAnne_B1F_Room4_EventScript_Leonard:: - trainerbattle_single TRAINER_SAILOR_LEONARD, SSAnne_B1F_Room4_Text_LeonardIntro, SSAnne_B1F_Room4_Text_LeonardDefeat - msgbox SSAnne_B1F_Room4_Text_LeonardPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SAILOR_LEONARD, SSAnne_B1F_Room4_Text_LeonardIntro, SSAnne_B1F_Room4_Text_LeonardDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SSAnne_B1F_Room4_EventScript_LeonardRematch + msgbox SSAnne_B1F_Room4_Text_LeonardPostBattle, MSGBOX_AUTOCLOSE + end + +SSAnne_B1F_Room4_EventScript_LeonardRematch:: + trainerbattle_rematch TRAINER_SAILOR_LEONARD, SSAnne_B1F_Room4_Text_LeonardIntro, SSAnne_B1F_Room4_Text_LeonardDefeat + msgbox SSAnne_B1F_Room4_Text_LeonardPostBattle, MSGBOX_AUTOCLOSE + end SSAnne_B1F_Room4_EventScript_Duncan:: - trainerbattle_single TRAINER_SAILOR_DUNCAN, SSAnne_B1F_Room4_Text_DuncanIntro, SSAnne_B1F_Room4_Text_DuncanDefeat - msgbox SSAnne_B1F_Room4_Text_DuncanPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SAILOR_DUNCAN, SSAnne_B1F_Room4_Text_DuncanIntro, SSAnne_B1F_Room4_Text_DuncanDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SSAnne_B1F_Room4_EventScript_DuncanRematch + msgbox SSAnne_B1F_Room4_Text_DuncanPostBattle, MSGBOX_AUTOCLOSE + end + +SSAnne_B1F_Room4_EventScript_DuncanRematch:: + trainerbattle_rematch TRAINER_SAILOR_DUNCAN, SSAnne_B1F_Room4_Text_DuncanIntro, SSAnne_B1F_Room4_Text_DuncanDefeat + msgbox SSAnne_B1F_Room4_Text_DuncanPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SSAnne_Deck/scripts.inc b/data/maps/SSAnne_Deck/scripts.inc index 10360fbbe..69ef28d1c 100644 --- a/data/maps/SSAnne_Deck/scripts.inc +++ b/data/maps/SSAnne_Deck/scripts.inc @@ -14,11 +14,26 @@ SSAnne_Deck_EventScript_Sailor:: end SSAnne_Deck_EventScript_Edmond:: - trainerbattle_single TRAINER_SAILOR_EDMOND, SSAnne_Deck_Text_EdmondIntro, SSAnne_Deck_Text_EdmondDefeat - msgbox SSAnne_Deck_Text_EdmondPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SAILOR_EDMOND, SSAnne_Deck_Text_EdmondIntro, SSAnne_Deck_Text_EdmondDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SSAnne_Deck_EventScript_EdmondRematch + msgbox SSAnne_Deck_Text_EdmondPostBattle, MSGBOX_AUTOCLOSE + end + +SSAnne_Deck_EventScript_EdmondRematch:: + trainerbattle_rematch TRAINER_SAILOR_EDMOND, SSAnne_Deck_Text_EdmondIntro, SSAnne_Deck_Text_EdmondDefeat + msgbox SSAnne_Deck_Text_EdmondPostBattle, MSGBOX_AUTOCLOSE + end SSAnne_Deck_EventScript_Trevor:: - trainerbattle_single TRAINER_SAILOR_TREVOR, SSAnne_Deck_Text_TrevorIntro, SSAnne_Deck_Text_TrevorDefeat - msgbox SSAnne_Deck_Text_TrevorPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SAILOR_TREVOR, SSAnne_Deck_Text_TrevorIntro, SSAnne_Deck_Text_TrevorDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SSAnne_Deck_EventScript_TrevorRematch + msgbox SSAnne_Deck_Text_TrevorPostBattle, MSGBOX_AUTOCLOSE + end + +SSAnne_Deck_EventScript_TrevorRematch:: + trainerbattle_rematch TRAINER_SAILOR_TREVOR, SSAnne_Deck_Text_TrevorIntro, SSAnne_Deck_Text_TrevorDefeat + msgbox SSAnne_Deck_Text_TrevorPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 852552208..2f4017c69 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -114,24 +114,52 @@ SaffronCity_Dojo_EventScript_RightScroll:: end SaffronCity_Dojo_EventScript_Hitoshi:: - trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, SaffronCity_Dojo_Text_HitoshiIntro, SaffronCity_Dojo_Text_HitoshiDefeat - msgbox SaffronCity_Dojo_Text_HitoshiPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, SaffronCity_Dojo_Text_HitoshiIntro, SaffronCity_Dojo_Text_HitoshiDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SaffronCity_Dojo_EventScript_HitoshiRematch + msgbox SaffronCity_Dojo_Text_HitoshiPostBattle, MSGBOX_AUTOCLOSE + end + +SaffronCity_Dojo_EventScript_HitoshiRematch:: + trainerbattle_rematch TRAINER_BLACK_BELT_HITOSHI, SaffronCity_Dojo_Text_HitoshiIntro, SaffronCity_Dojo_Text_HitoshiDefeat + msgbox SaffronCity_Dojo_Text_HitoshiPostBattle, MSGBOX_AUTOCLOSE + end SaffronCity_Dojo_EventScript_Hideki:: - trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, SaffronCity_Dojo_Text_HidekiIntro, SaffronCity_Dojo_Text_HidekiDefeat - msgbox SaffronCity_Dojo_Text_HidekiPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, SaffronCity_Dojo_Text_HidekiIntro, SaffronCity_Dojo_Text_HidekiDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SaffronCity_Dojo_EventScript_HidekiRematch + msgbox SaffronCity_Dojo_Text_HidekiPostBattle, MSGBOX_AUTOCLOSE + end + +SaffronCity_Dojo_EventScript_HidekiRematch:: + trainerbattle_rematch TRAINER_BLACK_BELT_HIDEKI, SaffronCity_Dojo_Text_HidekiIntro, SaffronCity_Dojo_Text_HidekiDefeat + msgbox SaffronCity_Dojo_Text_HidekiPostBattle, MSGBOX_AUTOCLOSE + end SaffronCity_Dojo_EventScript_Aaron:: - trainerbattle_single TRAINER_BLACK_BELT_AARON, SaffronCity_Dojo_Text_AaronIntro, SaffronCity_Dojo_Text_AaronDefeat - msgbox SaffronCity_Dojo_Text_AaronPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BLACK_BELT_AARON, SaffronCity_Dojo_Text_AaronIntro, SaffronCity_Dojo_Text_AaronDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SaffronCity_Dojo_EventScript_AaronRematch + msgbox SaffronCity_Dojo_Text_AaronPostBattle, MSGBOX_AUTOCLOSE + end + +SaffronCity_Dojo_EventScript_AaronRematch:: + trainerbattle_rematch TRAINER_BLACK_BELT_AARON, SaffronCity_Dojo_Text_AaronIntro, SaffronCity_Dojo_Text_AaronDefeat + msgbox SaffronCity_Dojo_Text_AaronPostBattle, MSGBOX_AUTOCLOSE + end SaffronCity_Dojo_EventScript_Mike:: - trainerbattle_single TRAINER_BLACK_BELT_MIKE, SaffronCity_Dojo_Text_MikeIntro, SaffronCity_Dojo_Text_MikeDefeat - msgbox SaffronCity_Dojo_Text_MikePostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BLACK_BELT_MIKE, SaffronCity_Dojo_Text_MikeIntro, SaffronCity_Dojo_Text_MikeDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SaffronCity_Dojo_EventScript_MikeRematch + msgbox SaffronCity_Dojo_Text_MikePostBattle, MSGBOX_AUTOCLOSE + end + +SaffronCity_Dojo_EventScript_MikeRematch:: + trainerbattle_rematch TRAINER_BLACK_BELT_MIKE, SaffronCity_Dojo_Text_MikeIntro, SaffronCity_Dojo_Text_MikeDefeat + msgbox SaffronCity_Dojo_Text_MikePostBattle, MSGBOX_AUTOCLOSE + end SaffronCity_Dojo_EventScript_MasterKoichi:: trainerbattle_single TRAINER_BLACK_BELT_KOICHI, SaffronCity_Dojo_Text_MasterKoichiIntro, SaffronCity_Dojo_Text_MasterKoichiDefeat, SaffronCity_Dojo_EventScript_DefeatedMasterKoichi @@ -148,3 +176,4 @@ SaffronCity_Dojo_EventScript_DefeatedMasterKoichi:: setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 release end + diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index c9b1873fb..773767dc2 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -35,9 +35,16 @@ SaffronCity_Gym_EventScript_NoRoomForTM04:: end SaffronCity_Gym_EventScript_Johan:: - trainerbattle_single TRAINER_PSYCHIC_JOHAN, SaffronCity_Gym_Text_JohanIntro, SaffronCity_Gym_Text_JohanDefeat - msgbox SaffronCity_Gym_Text_JohanPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_PSYCHIC_JOHAN, SaffronCity_Gym_Text_JohanIntro, SaffronCity_Gym_Text_JohanDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SaffronCity_Gym_EventScript_JohanRematch + msgbox SaffronCity_Gym_Text_JohanPostBattle, MSGBOX_AUTOCLOSE + end + +SaffronCity_Gym_EventScript_JohanRematch:: + trainerbattle_rematch TRAINER_PSYCHIC_JOHAN, SaffronCity_Gym_Text_JohanIntro, SaffronCity_Gym_Text_JohanDefeat + msgbox SaffronCity_Gym_Text_JohanPostBattle, MSGBOX_AUTOCLOSE + end SaffronCity_Gym_EventScript_Tyron:: trainerbattle_single TRAINER_PSYCHIC_TYRON, SaffronCity_Gym_Text_TyronIntro, SaffronCity_Gym_Text_TyronDefeat @@ -46,29 +53,64 @@ SaffronCity_Gym_EventScript_Tyron:: end SaffronCity_Gym_EventScript_Cameron:: - trainerbattle_single TRAINER_PSYCHIC_CAMERON, SaffronCity_Gym_Text_CameronIntro, SaffronCity_Gym_Text_CameronDefeat - msgbox SaffronCity_Gym_Text_CameronPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_PSYCHIC_CAMERON, SaffronCity_Gym_Text_CameronIntro, SaffronCity_Gym_Text_CameronDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SaffronCity_Gym_EventScript_CameronRematch + msgbox SaffronCity_Gym_Text_CameronPostBattle, MSGBOX_AUTOCLOSE + end + +SaffronCity_Gym_EventScript_CameronRematch:: + trainerbattle_rematch TRAINER_PSYCHIC_CAMERON, SaffronCity_Gym_Text_CameronIntro, SaffronCity_Gym_Text_CameronDefeat + msgbox SaffronCity_Gym_Text_CameronPostBattle, MSGBOX_AUTOCLOSE + end SaffronCity_Gym_EventScript_Preston:: - trainerbattle_single TRAINER_PSYCHIC_PRESTON, SaffronCity_Gym_Text_PrestonIntro, SaffronCity_Gym_Text_PrestonDefeat - msgbox SaffronCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_PSYCHIC_PRESTON, SaffronCity_Gym_Text_PrestonIntro, SaffronCity_Gym_Text_PrestonDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SaffronCity_Gym_EventScript_PrestonRematch + msgbox SaffronCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE + end + +SaffronCity_Gym_EventScript_PrestonRematch:: + trainerbattle_rematch TRAINER_PSYCHIC_PRESTON, SaffronCity_Gym_Text_PrestonIntro, SaffronCity_Gym_Text_PrestonDefeat + msgbox SaffronCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE + end SaffronCity_Gym_EventScript_Amanda:: - trainerbattle_single TRAINER_CHANNELER_AMANDA, SaffronCity_Gym_Text_AmandaIntro, SaffronCity_Gym_Text_AmandaDefeat - msgbox SaffronCity_Gym_Text_AmandaPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_CHANNELER_AMANDA, SaffronCity_Gym_Text_AmandaIntro, SaffronCity_Gym_Text_AmandaDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SaffronCity_Gym_EventScript_AmandaRematch + msgbox SaffronCity_Gym_Text_AmandaPostBattle, MSGBOX_AUTOCLOSE + end + +SaffronCity_Gym_EventScript_AmandaRematch:: + trainerbattle_rematch TRAINER_CHANNELER_AMANDA, SaffronCity_Gym_Text_AmandaIntro, SaffronCity_Gym_Text_AmandaDefeat + msgbox SaffronCity_Gym_Text_AmandaPostBattle, MSGBOX_AUTOCLOSE + end SaffronCity_Gym_EventScript_Stacy:: - trainerbattle_single TRAINER_CHANNELER_STACY, SaffronCity_Gym_Text_StacyIntro, SaffronCity_Gym_Text_StacyDefeat - msgbox SaffronCity_Gym_Text_StacyPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_CHANNELER_STACY, SaffronCity_Gym_Text_StacyIntro, SaffronCity_Gym_Text_StacyDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SaffronCity_Gym_EventScript_StacyRematch + msgbox SaffronCity_Gym_Text_StacyPostBattle, MSGBOX_AUTOCLOSE + end + +SaffronCity_Gym_EventScript_StacyRematch:: + trainerbattle_rematch TRAINER_CHANNELER_STACY, SaffronCity_Gym_Text_StacyIntro, SaffronCity_Gym_Text_StacyDefeat + msgbox SaffronCity_Gym_Text_StacyPostBattle, MSGBOX_AUTOCLOSE + end SaffronCity_Gym_EventScript_Tasha:: - trainerbattle_single TRAINER_CHANNELER_TASHA, SaffronCity_Gym_Text_TashaIntro, SaffronCity_Gym_Text_TashaDefeat - msgbox SaffronCity_Gym_Text_TashaPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_CHANNELER_TASHA, SaffronCity_Gym_Text_TashaIntro, SaffronCity_Gym_Text_TashaDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SaffronCity_Gym_EventScript_TashaRematch + msgbox SaffronCity_Gym_Text_TashaPostBattle, MSGBOX_AUTOCLOSE + end + +SaffronCity_Gym_EventScript_TashaRematch:: + trainerbattle_rematch TRAINER_CHANNELER_TASHA, SaffronCity_Gym_Text_TashaIntro, SaffronCity_Gym_Text_TashaDefeat + msgbox SaffronCity_Gym_Text_TashaPostBattle, MSGBOX_AUTOCLOSE + end SaffronCity_Gym_EventScript_GymGuy:: lock @@ -94,3 +136,4 @@ SaffronCity_Gym_EventScript_GymStatuePostVictory:: msgbox SaffronCity_Gym_Text_GymStatuePlayerWon releaseall end + diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index 789caf5b2..2bb3a5799 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -24,11 +24,26 @@ SilphCo_10F_EventScript_FloorSign:: end SilphCo_10F_EventScript_Travis:: - trainerbattle_single TRAINER_SCIENTIST_TRAVIS, SilphCo_10F_Text_TravisIntro, SilphCo_10F_Text_TravisDefeat - msgbox SilphCo_10F_Text_TravisPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SCIENTIST_TRAVIS, SilphCo_10F_Text_TravisIntro, SilphCo_10F_Text_TravisDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_10F_EventScript_TravisRematch + msgbox SilphCo_10F_Text_TravisPostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_10F_EventScript_TravisRematch:: + trainerbattle_rematch TRAINER_SCIENTIST_TRAVIS, SilphCo_10F_Text_TravisIntro, SilphCo_10F_Text_TravisDefeat + msgbox SilphCo_10F_Text_TravisPostBattle, MSGBOX_AUTOCLOSE + end SilphCo_10F_EventScript_Grunt:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, SilphCo_10F_Text_GruntIntro, SilphCo_10F_Text_GruntDefeat - msgbox SilphCo_10F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, SilphCo_10F_Text_GruntIntro, SilphCo_10F_Text_GruntDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_10F_EventScript_GruntRematch + msgbox SilphCo_10F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_10F_EventScript_GruntRematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_39, SilphCo_10F_Text_GruntIntro, SilphCo_10F_Text_GruntDefeat + msgbox SilphCo_10F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 94aebcc2b..ae4da3cb0 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -123,11 +123,26 @@ SilphCo_11F_EventScript_FloorSign:: end SilphCo_11F_EventScript_Grunt1:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_40, SilphCo_11F_Text_Grunt1Intro, SilphCo_11F_Text_Grunt1Defeat - msgbox SilphCo_11F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_40, SilphCo_11F_Text_Grunt1Intro, SilphCo_11F_Text_Grunt1Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_11F_EventScript_Grunt1Rematch + msgbox SilphCo_11F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_11F_EventScript_Grunt1Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_40, SilphCo_11F_Text_Grunt1Intro, SilphCo_11F_Text_Grunt1Defeat + msgbox SilphCo_11F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end SilphCo_11F_EventScript_Grunt2:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_41, SilphCo_11F_Text_Grunt2Intro, SilphCo_11F_Text_Grunt2Defeat - msgbox SilphCo_11F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_41, SilphCo_11F_Text_Grunt2Intro, SilphCo_11F_Text_Grunt2Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_11F_EventScript_Grunt2Rematch + msgbox SilphCo_11F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_11F_EventScript_Grunt2Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_41, SilphCo_11F_Text_Grunt2Intro, SilphCo_11F_Text_Grunt2Defeat + msgbox SilphCo_11F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index 9fb2624fd..615593a8b 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -16,21 +16,50 @@ SilphCo_2F_EventScript_FloorSign:: end SilphCo_2F_EventScript_Connor:: - trainerbattle_single TRAINER_SCIENTIST_CONNOR, SilphCo_2F_Text_ConnorIntro, SilphCo_2F_Text_ConnorDefeat - msgbox SilphCo_2F_Text_ConnorPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SCIENTIST_CONNOR, SilphCo_2F_Text_ConnorIntro, SilphCo_2F_Text_ConnorDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_2F_EventScript_ConnorRematch + msgbox SilphCo_2F_Text_ConnorPostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_2F_EventScript_ConnorRematch:: + trainerbattle_rematch TRAINER_SCIENTIST_CONNOR, SilphCo_2F_Text_ConnorIntro, SilphCo_2F_Text_ConnorDefeat + msgbox SilphCo_2F_Text_ConnorPostBattle, MSGBOX_AUTOCLOSE + end SilphCo_2F_EventScript_Jerry:: - trainerbattle_single TRAINER_SCIENTIST_JERRY, SilphCo_2F_Text_JerryIntro, SilphCo_2F_Text_JerryDefeat - msgbox SilphCo_2F_Text_JerryPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SCIENTIST_JERRY, SilphCo_2F_Text_JerryIntro, SilphCo_2F_Text_JerryDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_2F_EventScript_JerryRematch + msgbox SilphCo_2F_Text_JerryPostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_2F_EventScript_JerryRematch:: + trainerbattle_rematch TRAINER_SCIENTIST_JERRY, SilphCo_2F_Text_JerryIntro, SilphCo_2F_Text_JerryDefeat + msgbox SilphCo_2F_Text_JerryPostBattle, MSGBOX_AUTOCLOSE + end SilphCo_2F_EventScript_Grunt1:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_23, SilphCo_2F_Text_Grunt1Intro, SilphCo_2F_Text_Grunt1Defeat - msgbox SilphCo_2F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_23, SilphCo_2F_Text_Grunt1Intro, SilphCo_2F_Text_Grunt1Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_2F_EventScript_Grunt1Rematch + msgbox SilphCo_2F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_2F_EventScript_Grunt1Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_23, SilphCo_2F_Text_Grunt1Intro, SilphCo_2F_Text_Grunt1Defeat + msgbox SilphCo_2F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end SilphCo_2F_EventScript_Grunt2:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_24, SilphCo_2F_Text_Grunt2Intro, SilphCo_2F_Text_Grunt2Defeat - msgbox SilphCo_2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_24, SilphCo_2F_Text_Grunt2Intro, SilphCo_2F_Text_Grunt2Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_2F_EventScript_Grunt2Rematch + msgbox SilphCo_2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_2F_EventScript_Grunt2Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_24, SilphCo_2F_Text_Grunt2Intro, SilphCo_2F_Text_Grunt2Defeat + msgbox SilphCo_2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index 1b5510791..db6d7ff99 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -25,11 +25,26 @@ SilphCo_3F_EventScript_FloorSign:: end SilphCo_3F_EventScript_Jose:: - trainerbattle_single TRAINER_SCIENTIST_JOSE, SilphCo_3F_Text_JoseIntro, SilphCo_3F_Text_JoseDefeat - msgbox SilphCo_3F_Text_JosePostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SCIENTIST_JOSE, SilphCo_3F_Text_JoseIntro, SilphCo_3F_Text_JoseDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_3F_EventScript_JoseRematch + msgbox SilphCo_3F_Text_JosePostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_3F_EventScript_JoseRematch:: + trainerbattle_rematch TRAINER_SCIENTIST_JOSE, SilphCo_3F_Text_JoseIntro, SilphCo_3F_Text_JoseDefeat + msgbox SilphCo_3F_Text_JosePostBattle, MSGBOX_AUTOCLOSE + end SilphCo_3F_EventScript_Grunt:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, SilphCo_3F_Text_GruntIntro, SilphCo_3F_Text_GruntDefeat - msgbox SilphCo_3F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, SilphCo_3F_Text_GruntIntro, SilphCo_3F_Text_GruntDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_3F_EventScript_GruntRematch + msgbox SilphCo_3F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_3F_EventScript_GruntRematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_25, SilphCo_3F_Text_GruntIntro, SilphCo_3F_Text_GruntDefeat + msgbox SilphCo_3F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index 9b1b7615f..970129ba8 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -25,16 +25,38 @@ SilphCo_4F_EventScript_FloorSign:: end SilphCo_4F_EventScript_Rodney:: - trainerbattle_single TRAINER_SCIENTIST_RODNEY, SilphCo_4F_Text_RodneyIntro, SilphCo_4F_Text_RodneyDefeat - msgbox SilphCo_4F_Text_RodneyPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SCIENTIST_RODNEY, SilphCo_4F_Text_RodneyIntro, SilphCo_4F_Text_RodneyDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_4F_EventScript_RodneyRematch + msgbox SilphCo_4F_Text_RodneyPostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_4F_EventScript_RodneyRematch:: + trainerbattle_rematch TRAINER_SCIENTIST_RODNEY, SilphCo_4F_Text_RodneyIntro, SilphCo_4F_Text_RodneyDefeat + msgbox SilphCo_4F_Text_RodneyPostBattle, MSGBOX_AUTOCLOSE + end SilphCo_4F_EventScript_Grunt1:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_26, SilphCo_4F_Text_Grunt1Intro, SilphCo_4F_Text_Grunt1Defeat - msgbox SilphCo_4F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_26, SilphCo_4F_Text_Grunt1Intro, SilphCo_4F_Text_Grunt1Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_4F_EventScript_Grunt1Rematch + msgbox SilphCo_4F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_4F_EventScript_Grunt1Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_26, SilphCo_4F_Text_Grunt1Intro, SilphCo_4F_Text_Grunt1Defeat + msgbox SilphCo_4F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end SilphCo_4F_EventScript_Grunt2:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_27, SilphCo_4F_Text_Grunt2Intro, SilphCo_4F_Text_Grunt2Defeat - msgbox SilphCo_4F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_27, SilphCo_4F_Text_Grunt2Intro, SilphCo_4F_Text_Grunt2Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_4F_EventScript_Grunt2Rematch + msgbox SilphCo_4F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_4F_EventScript_Grunt2Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_27, SilphCo_4F_Text_Grunt2Intro, SilphCo_4F_Text_Grunt2Defeat + msgbox SilphCo_4F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index e8f921d9a..aa5deb348 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -38,21 +38,50 @@ SilphCo_5F_EventScript_FloorSign:: end SilphCo_5F_EventScript_Beau:: - trainerbattle_single TRAINER_SCIENTIST_BEAU, SilphCo_5F_Text_BeauIntro, SilphCo_5F_Text_BeauDefeat - msgbox SilphCo_5F_Text_BeauPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SCIENTIST_BEAU, SilphCo_5F_Text_BeauIntro, SilphCo_5F_Text_BeauDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_5F_EventScript_BeauRematch + msgbox SilphCo_5F_Text_BeauPostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_5F_EventScript_BeauRematch:: + trainerbattle_rematch TRAINER_SCIENTIST_BEAU, SilphCo_5F_Text_BeauIntro, SilphCo_5F_Text_BeauDefeat + msgbox SilphCo_5F_Text_BeauPostBattle, MSGBOX_AUTOCLOSE + end SilphCo_5F_EventScript_Grunt1:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_28, SilphCo_5F_Text_Grunt1Intro, SilphCo_5F_Text_Grunt1Defeat - msgbox SilphCo_5F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_28, SilphCo_5F_Text_Grunt1Intro, SilphCo_5F_Text_Grunt1Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_5F_EventScript_Grunt1Rematch + msgbox SilphCo_5F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_5F_EventScript_Grunt1Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_28, SilphCo_5F_Text_Grunt1Intro, SilphCo_5F_Text_Grunt1Defeat + msgbox SilphCo_5F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end SilphCo_5F_EventScript_Grunt2:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_29, SilphCo_5F_Text_Grunt2Intro, SilphCo_5F_Text_Grunt2Defeat - msgbox SilphCo_5F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_29, SilphCo_5F_Text_Grunt2Intro, SilphCo_5F_Text_Grunt2Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_5F_EventScript_Grunt2Rematch + msgbox SilphCo_5F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_5F_EventScript_Grunt2Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_29, SilphCo_5F_Text_Grunt2Intro, SilphCo_5F_Text_Grunt2Defeat + msgbox SilphCo_5F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end SilphCo_5F_EventScript_Dalton:: - trainerbattle_single TRAINER_JUGGLER_DALTON, SilphCo_5F_Text_DaltonIntro, SilphCo_5F_Text_DaltonDefeat - msgbox SilphCo_5F_Text_DaltonPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_JUGGLER_DALTON, SilphCo_5F_Text_DaltonIntro, SilphCo_5F_Text_DaltonDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_5F_EventScript_DaltonRematch + msgbox SilphCo_5F_Text_DaltonPostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_5F_EventScript_DaltonRematch:: + trainerbattle_rematch TRAINER_JUGGLER_DALTON, SilphCo_5F_Text_DaltonIntro, SilphCo_5F_Text_DaltonDefeat + msgbox SilphCo_5F_Text_DaltonPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index e19836d27..a46083f81 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -76,16 +76,38 @@ SilphCo_6F_EventScript_FloorSign:: end SilphCo_6F_EventScript_Taylor:: - trainerbattle_single TRAINER_SCIENTIST_TAYLOR, SilphCo_6F_Text_TaylorIntro, SilphCo_6F_Text_TaylorDefeat - msgbox SilphCo_6F_Text_TaylorPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SCIENTIST_TAYLOR, SilphCo_6F_Text_TaylorIntro, SilphCo_6F_Text_TaylorDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_6F_EventScript_TaylorRematch + msgbox SilphCo_6F_Text_TaylorPostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_6F_EventScript_TaylorRematch:: + trainerbattle_rematch TRAINER_SCIENTIST_TAYLOR, SilphCo_6F_Text_TaylorIntro, SilphCo_6F_Text_TaylorDefeat + msgbox SilphCo_6F_Text_TaylorPostBattle, MSGBOX_AUTOCLOSE + end SilphCo_6F_EventScript_Grunt1:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_30, SilphCo_6F_Text_Grunt1Intro, SilphCo_6F_Text_Grunt1Defeat - msgbox SilphCo_6F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_30, SilphCo_6F_Text_Grunt1Intro, SilphCo_6F_Text_Grunt1Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_6F_EventScript_Grunt1Rematch + msgbox SilphCo_6F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_6F_EventScript_Grunt1Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_30, SilphCo_6F_Text_Grunt1Intro, SilphCo_6F_Text_Grunt1Defeat + msgbox SilphCo_6F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end SilphCo_6F_EventScript_Grunt2:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_31, SilphCo_6F_Text_Grunt2Intro, SilphCo_6F_Text_Grunt2Defeat - msgbox SilphCo_6F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_31, SilphCo_6F_Text_Grunt2Intro, SilphCo_6F_Text_Grunt2Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_6F_EventScript_Grunt2Rematch + msgbox SilphCo_6F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_6F_EventScript_Grunt2Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_31, SilphCo_6F_Text_Grunt2Intro, SilphCo_6F_Text_Grunt2Defeat + msgbox SilphCo_6F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 7c6898d89..2e3ed629c 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -213,21 +213,50 @@ SilphCo_7F_EventScript_FloorSign:: end SilphCo_7F_EventScript_Joshua:: - trainerbattle_single TRAINER_SCIENTIST_JOSHUA, SilphCo_7F_Text_JoshuaIntro, SilphCo_7F_Text_JoshuaDefeat - msgbox SilphCo_7F_Text_JoshuaPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SCIENTIST_JOSHUA, SilphCo_7F_Text_JoshuaIntro, SilphCo_7F_Text_JoshuaDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_7F_EventScript_JoshuaRematch + msgbox SilphCo_7F_Text_JoshuaPostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_7F_EventScript_JoshuaRematch:: + trainerbattle_rematch TRAINER_SCIENTIST_JOSHUA, SilphCo_7F_Text_JoshuaIntro, SilphCo_7F_Text_JoshuaDefeat + msgbox SilphCo_7F_Text_JoshuaPostBattle, MSGBOX_AUTOCLOSE + end SilphCo_7F_EventScript_Grunt1:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_33, SilphCo_7F_Text_Grunt1Intro, SilphCo_7F_Text_Grunt1Defeat - msgbox SilphCo_7F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_33, SilphCo_7F_Text_Grunt1Intro, SilphCo_7F_Text_Grunt1Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_7F_EventScript_Grunt1Rematch + msgbox SilphCo_7F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_7F_EventScript_Grunt1Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_33, SilphCo_7F_Text_Grunt1Intro, SilphCo_7F_Text_Grunt1Defeat + msgbox SilphCo_7F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end SilphCo_7F_EventScript_Grunt2:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_34, SilphCo_7F_Text_Grunt2Intro, SilphCo_7F_Text_Grunt2Defeat - msgbox SilphCo_7F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_34, SilphCo_7F_Text_Grunt2Intro, SilphCo_7F_Text_Grunt2Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_7F_EventScript_Grunt2Rematch + msgbox SilphCo_7F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_7F_EventScript_Grunt2Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_34, SilphCo_7F_Text_Grunt2Intro, SilphCo_7F_Text_Grunt2Defeat + msgbox SilphCo_7F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end SilphCo_7F_EventScript_Grunt3:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_35, SilphCo_7F_Text_Grunt3Intro, SilphCo_7F_Text_Grunt3Defeat - msgbox SilphCo_7F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_35, SilphCo_7F_Text_Grunt3Intro, SilphCo_7F_Text_Grunt3Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_7F_EventScript_Grunt3Rematch + msgbox SilphCo_7F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_7F_EventScript_Grunt3Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_35, SilphCo_7F_Text_Grunt3Intro, SilphCo_7F_Text_Grunt3Defeat + msgbox SilphCo_7F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index e27d177e2..fa0f5e805 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -24,16 +24,38 @@ SilphCo_8F_EventScript_FloorSign:: end SilphCo_8F_EventScript_Parker:: - trainerbattle_single TRAINER_SCIENTIST_PARKER, SilphCo_8F_Text_ParkerIntro, SilphCo_8F_Text_ParkerDefeat - msgbox SilphCo_8F_Text_ParkerPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SCIENTIST_PARKER, SilphCo_8F_Text_ParkerIntro, SilphCo_8F_Text_ParkerDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_8F_EventScript_ParkerRematch + msgbox SilphCo_8F_Text_ParkerPostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_8F_EventScript_ParkerRematch:: + trainerbattle_rematch TRAINER_SCIENTIST_PARKER, SilphCo_8F_Text_ParkerIntro, SilphCo_8F_Text_ParkerDefeat + msgbox SilphCo_8F_Text_ParkerPostBattle, MSGBOX_AUTOCLOSE + end SilphCo_8F_EventScript_Grunt1:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, SilphCo_8F_Text_Grunt1Intro, SilphCo_8F_Text_Grunt1Defeat - msgbox SilphCo_8F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, SilphCo_8F_Text_Grunt1Intro, SilphCo_8F_Text_Grunt1Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_8F_EventScript_Grunt1Rematch + msgbox SilphCo_8F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_8F_EventScript_Grunt1Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_32, SilphCo_8F_Text_Grunt1Intro, SilphCo_8F_Text_Grunt1Defeat + msgbox SilphCo_8F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end SilphCo_8F_EventScript_Grunt2:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, SilphCo_8F_Text_Grunt2Intro, SilphCo_8F_Text_Grunt2Defeat - msgbox SilphCo_8F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, SilphCo_8F_Text_Grunt2Intro, SilphCo_8F_Text_Grunt2Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_8F_EventScript_Grunt2Rematch + msgbox SilphCo_8F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_8F_EventScript_Grunt2Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_36, SilphCo_8F_Text_Grunt2Intro, SilphCo_8F_Text_Grunt2Defeat + msgbox SilphCo_8F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index a62a85bae..9fdd0221d 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -30,16 +30,38 @@ SilphCo_9F_EventScript_FloorSign:: end SilphCo_9F_EventScript_Ed:: - trainerbattle_single TRAINER_SCIENTIST_ED, SilphCo_9F_Text_EdIntro, SilphCo_9F_Text_EdDefeat - msgbox SilphCo_9F_Text_EdPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_SCIENTIST_ED, SilphCo_9F_Text_EdIntro, SilphCo_9F_Text_EdDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_9F_EventScript_EdRematch + msgbox SilphCo_9F_Text_EdPostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_9F_EventScript_EdRematch:: + trainerbattle_rematch TRAINER_SCIENTIST_ED, SilphCo_9F_Text_EdIntro, SilphCo_9F_Text_EdDefeat + msgbox SilphCo_9F_Text_EdPostBattle, MSGBOX_AUTOCLOSE + end SilphCo_9F_EventScript_Grunt1:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, SilphCo_9F_Text_Grunt1Intro, SilphCo_9F_Text_Grunt1Defeat - msgbox SilphCo_9F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, SilphCo_9F_Text_Grunt1Intro, SilphCo_9F_Text_Grunt1Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_9F_EventScript_Grunt1Rematch + msgbox SilphCo_9F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_9F_EventScript_Grunt1Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_37, SilphCo_9F_Text_Grunt1Intro, SilphCo_9F_Text_Grunt1Defeat + msgbox SilphCo_9F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE + end SilphCo_9F_EventScript_Grunt2:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, SilphCo_9F_Text_Grunt2Intro, SilphCo_9F_Text_Grunt2Defeat - msgbox SilphCo_9F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, SilphCo_9F_Text_Grunt2Intro, SilphCo_9F_Text_Grunt2Defeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SilphCo_9F_EventScript_Grunt2Rematch + msgbox SilphCo_9F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end + +SilphCo_9F_EventScript_Grunt2Rematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_38, SilphCo_9F_Text_Grunt2Intro, SilphCo_9F_Text_Grunt2Defeat + msgbox SilphCo_9F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SixIsland_OutcastIsland/scripts.inc b/data/maps/SixIsland_OutcastIsland/scripts.inc index d920cd7c1..f6a901ac7 100644 --- a/data/maps/SixIsland_OutcastIsland/scripts.inc +++ b/data/maps/SixIsland_OutcastIsland/scripts.inc @@ -2,6 +2,14 @@ SixIsland_OutcastIsland_MapScripts:: .byte 0 SixIsland_OutcastIsland_EventScript_Rocket:: - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_46, SixIsland_OutcastIsland_Text_RocketIntro, SixIsland_OutcastIsland_Text_RocketDefeat - msgbox SixIsland_OutcastIsland_Text_RocketPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_46, SixIsland_OutcastIsland_Text_RocketIntro, SixIsland_OutcastIsland_Text_RocketDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SixIsland_OutcastIsland_EventScript_RocketRematch + msgbox SixIsland_OutcastIsland_Text_RocketPostBattle, MSGBOX_AUTOCLOSE + end + +SixIsland_OutcastIsland_EventScript_RocketRematch:: + trainerbattle_rematch TRAINER_TEAM_ROCKET_GRUNT_46, SixIsland_OutcastIsland_Text_RocketIntro, SixIsland_OutcastIsland_Text_RocketDefeat + msgbox SixIsland_OutcastIsland_Text_RocketPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index d5f06a183..3f92ae954 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -18,61 +18,146 @@ SixIsland_PatternBush_EventScript_SetEscapeLeftExit:: return SixIsland_PatternBush_EventScript_Bethany:: - trainerbattle_single TRAINER_PKMN_BREEDER_BETHANY, SixIsland_PatternBush_Text_BethanyIntro, SixIsland_PatternBush_Text_BethanyDefeat - msgbox SixIsland_PatternBush_Text_BethanyPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_PKMN_BREEDER_BETHANY, SixIsland_PatternBush_Text_BethanyIntro, SixIsland_PatternBush_Text_BethanyDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SixIsland_PatternBush_EventScript_BethanyRematch + msgbox SixIsland_PatternBush_Text_BethanyPostBattle, MSGBOX_AUTOCLOSE + end + +SixIsland_PatternBush_EventScript_BethanyRematch:: + trainerbattle_rematch TRAINER_PKMN_BREEDER_BETHANY, SixIsland_PatternBush_Text_BethanyIntro, SixIsland_PatternBush_Text_BethanyDefeat + msgbox SixIsland_PatternBush_Text_BethanyPostBattle, MSGBOX_AUTOCLOSE + end SixIsland_PatternBush_EventScript_Allison:: - trainerbattle_single TRAINER_PKMN_BREEDER_ALLISON, SixIsland_PatternBush_Text_AllisonIntro, SixIsland_PatternBush_Text_AllisonDefeat - msgbox SixIsland_PatternBush_Text_AllisonPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_PKMN_BREEDER_ALLISON, SixIsland_PatternBush_Text_AllisonIntro, SixIsland_PatternBush_Text_AllisonDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SixIsland_PatternBush_EventScript_AllisonRematch + msgbox SixIsland_PatternBush_Text_AllisonPostBattle, MSGBOX_AUTOCLOSE + end + +SixIsland_PatternBush_EventScript_AllisonRematch:: + trainerbattle_rematch TRAINER_PKMN_BREEDER_ALLISON, SixIsland_PatternBush_Text_AllisonIntro, SixIsland_PatternBush_Text_AllisonDefeat + msgbox SixIsland_PatternBush_Text_AllisonPostBattle, MSGBOX_AUTOCLOSE + end SixIsland_PatternBush_EventScript_Garret:: - trainerbattle_single TRAINER_BUG_CATCHER_GARRET, SixIsland_PatternBush_Text_GarretIntro, SixIsland_PatternBush_Text_GarretDefeat - msgbox SixIsland_PatternBush_Text_GarretPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BUG_CATCHER_GARRET, SixIsland_PatternBush_Text_GarretIntro, SixIsland_PatternBush_Text_GarretDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SixIsland_PatternBush_EventScript_GarretRematch + msgbox SixIsland_PatternBush_Text_GarretPostBattle, MSGBOX_AUTOCLOSE + end + +SixIsland_PatternBush_EventScript_GarretRematch:: + trainerbattle_rematch TRAINER_BUG_CATCHER_GARRET, SixIsland_PatternBush_Text_GarretIntro, SixIsland_PatternBush_Text_GarretDefeat + msgbox SixIsland_PatternBush_Text_GarretPostBattle, MSGBOX_AUTOCLOSE + end SixIsland_PatternBush_EventScript_Jonah:: - trainerbattle_single TRAINER_BUG_CATCHER_JONAH, SixIsland_PatternBush_Text_JonahIntro, SixIsland_PatternBush_Text_JonahDefeat - msgbox SixIsland_PatternBush_Text_JonahPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BUG_CATCHER_JONAH, SixIsland_PatternBush_Text_JonahIntro, SixIsland_PatternBush_Text_JonahDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SixIsland_PatternBush_EventScript_JonahRematch + msgbox SixIsland_PatternBush_Text_JonahPostBattle, MSGBOX_AUTOCLOSE + end + +SixIsland_PatternBush_EventScript_JonahRematch:: + trainerbattle_rematch TRAINER_BUG_CATCHER_JONAH, SixIsland_PatternBush_Text_JonahIntro, SixIsland_PatternBush_Text_JonahDefeat + msgbox SixIsland_PatternBush_Text_JonahPostBattle, MSGBOX_AUTOCLOSE + end SixIsland_PatternBush_EventScript_Vance:: - trainerbattle_single TRAINER_BUG_CATCHER_VANCE, SixIsland_PatternBush_Text_VanceIntro, SixIsland_PatternBush_Text_VanceDefeat - msgbox SixIsland_PatternBush_Text_VancePostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BUG_CATCHER_VANCE, SixIsland_PatternBush_Text_VanceIntro, SixIsland_PatternBush_Text_VanceDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SixIsland_PatternBush_EventScript_VanceRematch + msgbox SixIsland_PatternBush_Text_VancePostBattle, MSGBOX_AUTOCLOSE + end + +SixIsland_PatternBush_EventScript_VanceRematch:: + trainerbattle_rematch TRAINER_BUG_CATCHER_VANCE, SixIsland_PatternBush_Text_VanceIntro, SixIsland_PatternBush_Text_VanceDefeat + msgbox SixIsland_PatternBush_Text_VancePostBattle, MSGBOX_AUTOCLOSE + end SixIsland_PatternBush_EventScript_Nash:: - trainerbattle_single TRAINER_YOUNGSTER_NASH, SixIsland_PatternBush_Text_NashIntro, SixIsland_PatternBush_Text_NashDefeat - msgbox SixIsland_PatternBush_Text_NashPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_YOUNGSTER_NASH, SixIsland_PatternBush_Text_NashIntro, SixIsland_PatternBush_Text_NashDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SixIsland_PatternBush_EventScript_NashRematch + msgbox SixIsland_PatternBush_Text_NashPostBattle, MSGBOX_AUTOCLOSE + end + +SixIsland_PatternBush_EventScript_NashRematch:: + trainerbattle_rematch TRAINER_YOUNGSTER_NASH, SixIsland_PatternBush_Text_NashIntro, SixIsland_PatternBush_Text_NashDefeat + msgbox SixIsland_PatternBush_Text_NashPostBattle, MSGBOX_AUTOCLOSE + end SixIsland_PatternBush_EventScript_Cordell:: - trainerbattle_single TRAINER_YOUNGSTER_CORDELL, SixIsland_PatternBush_Text_CordellIntro, SixIsland_PatternBush_Text_CordellDefeat - msgbox SixIsland_PatternBush_Text_CordellPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_YOUNGSTER_CORDELL, SixIsland_PatternBush_Text_CordellIntro, SixIsland_PatternBush_Text_CordellDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SixIsland_PatternBush_EventScript_CordellRematch + msgbox SixIsland_PatternBush_Text_CordellPostBattle, MSGBOX_AUTOCLOSE + end + +SixIsland_PatternBush_EventScript_CordellRematch:: + trainerbattle_rematch TRAINER_YOUNGSTER_CORDELL, SixIsland_PatternBush_Text_CordellIntro, SixIsland_PatternBush_Text_CordellDefeat + msgbox SixIsland_PatternBush_Text_CordellPostBattle, MSGBOX_AUTOCLOSE + end SixIsland_PatternBush_EventScript_Dalia:: - trainerbattle_single TRAINER_LASS_DALIA, SixIsland_PatternBush_Text_DaliaIntro, SixIsland_PatternBush_Text_DaliaDefeat - msgbox SixIsland_PatternBush_Text_DaliaPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_LASS_DALIA, SixIsland_PatternBush_Text_DaliaIntro, SixIsland_PatternBush_Text_DaliaDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SixIsland_PatternBush_EventScript_DaliaRematch + msgbox SixIsland_PatternBush_Text_DaliaPostBattle, MSGBOX_AUTOCLOSE + end + +SixIsland_PatternBush_EventScript_DaliaRematch:: + trainerbattle_rematch TRAINER_LASS_DALIA, SixIsland_PatternBush_Text_DaliaIntro, SixIsland_PatternBush_Text_DaliaDefeat + msgbox SixIsland_PatternBush_Text_DaliaPostBattle, MSGBOX_AUTOCLOSE + end SixIsland_PatternBush_EventScript_Joana:: - trainerbattle_single TRAINER_LASS_JOANA, SixIsland_PatternBush_Text_JoanaIntro, SixIsland_PatternBush_Text_JoanaDefeat - msgbox SixIsland_PatternBush_Text_JoanaPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_LASS_JOANA, SixIsland_PatternBush_Text_JoanaIntro, SixIsland_PatternBush_Text_JoanaDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SixIsland_PatternBush_EventScript_JoanaRematch + msgbox SixIsland_PatternBush_Text_JoanaPostBattle, MSGBOX_AUTOCLOSE + end + +SixIsland_PatternBush_EventScript_JoanaRematch:: + trainerbattle_rematch TRAINER_LASS_JOANA, SixIsland_PatternBush_Text_JoanaIntro, SixIsland_PatternBush_Text_JoanaDefeat + msgbox SixIsland_PatternBush_Text_JoanaPostBattle, MSGBOX_AUTOCLOSE + end SixIsland_PatternBush_EventScript_Riley:: - trainerbattle_single TRAINER_CAMPER_RILEY, SixIsland_PatternBush_Text_RileyIntro, SixIsland_PatternBush_Text_RileyDefeat - msgbox SixIsland_PatternBush_Text_RileyPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_CAMPER_RILEY, SixIsland_PatternBush_Text_RileyIntro, SixIsland_PatternBush_Text_RileyDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SixIsland_PatternBush_EventScript_RileyRematch + msgbox SixIsland_PatternBush_Text_RileyPostBattle, MSGBOX_AUTOCLOSE + end + +SixIsland_PatternBush_EventScript_RileyRematch:: + trainerbattle_rematch TRAINER_CAMPER_RILEY, SixIsland_PatternBush_Text_RileyIntro, SixIsland_PatternBush_Text_RileyDefeat + msgbox SixIsland_PatternBush_Text_RileyPostBattle, MSGBOX_AUTOCLOSE + end SixIsland_PatternBush_EventScript_Marcy:: - trainerbattle_single TRAINER_PICNICKER_MARCY, SixIsland_PatternBush_Text_MarcyIntro, SixIsland_PatternBush_Text_MarcyDefeat - msgbox SixIsland_PatternBush_Text_MarcyPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_PICNICKER_MARCY, SixIsland_PatternBush_Text_MarcyIntro, SixIsland_PatternBush_Text_MarcyDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SixIsland_PatternBush_EventScript_MarcyRematch + msgbox SixIsland_PatternBush_Text_MarcyPostBattle, MSGBOX_AUTOCLOSE + end + +SixIsland_PatternBush_EventScript_MarcyRematch:: + trainerbattle_rematch TRAINER_PICNICKER_MARCY, SixIsland_PatternBush_Text_MarcyIntro, SixIsland_PatternBush_Text_MarcyDefeat + msgbox SixIsland_PatternBush_Text_MarcyPostBattle, MSGBOX_AUTOCLOSE + end SixIsland_PatternBush_EventScript_Layton:: - trainerbattle_single TRAINER_RUIN_MANIAC_LAYTON, SixIsland_PatternBush_Text_LaytonIntro, SixIsland_PatternBush_Text_LaytonDefeat - msgbox SixIsland_PatternBush_Text_LaytonPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_RUIN_MANIAC_LAYTON, SixIsland_PatternBush_Text_LaytonIntro, SixIsland_PatternBush_Text_LaytonDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, SixIsland_PatternBush_EventScript_LaytonRematch + msgbox SixIsland_PatternBush_Text_LaytonPostBattle, MSGBOX_AUTOCLOSE + end + +SixIsland_PatternBush_EventScript_LaytonRematch:: + trainerbattle_rematch TRAINER_RUIN_MANIAC_LAYTON, SixIsland_PatternBush_Text_LaytonIntro, SixIsland_PatternBush_Text_LaytonDefeat + msgbox SixIsland_PatternBush_Text_LaytonPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 844201b07..34002869a 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -247,9 +247,16 @@ VermilionCity_Gym_EventScript_Dwayne:: end VermilionCity_Gym_EventScript_Baily:: - trainerbattle_single TRAINER_ENGINEER_BAILY, VermilionCity_Gym_Text_BailyIntro, VermilionCity_Gym_Text_BailyDefeat - msgbox VermilionCity_Gym_Text_BailyPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_ENGINEER_BAILY, VermilionCity_Gym_Text_BailyIntro, VermilionCity_Gym_Text_BailyDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, VermilionCity_Gym_EventScript_BailyRematch + msgbox VermilionCity_Gym_Text_BailyPostBattle, MSGBOX_AUTOCLOSE + end + +VermilionCity_Gym_EventScript_BailyRematch:: + trainerbattle_rematch TRAINER_ENGINEER_BAILY, VermilionCity_Gym_Text_BailyIntro, VermilionCity_Gym_Text_BailyDefeat + msgbox VermilionCity_Gym_Text_BailyPostBattle, MSGBOX_AUTOCLOSE + end VermilionCity_Gym_EventScript_Tucker:: trainerbattle_single TRAINER_GENTLEMAN_TUCKER, VermilionCity_Gym_Text_TuckerIntro, VermilionCity_Gym_Text_TuckerDefeat, VermilionCity_Gym_EventScript_DefeatedTucker @@ -286,3 +293,4 @@ VermilionCity_Gym_EventScript_GymStatuePostVictory:: msgbox VermilionCity_Gym_Text_GymStatuePlayerWon releaseall end + diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index e459d4298..a5f7605f2 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -34,11 +34,26 @@ VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed:: end VictoryRoad_1F_EventScript_Naomi:: - trainerbattle_single TRAINER_COOLTRAINER_NAOMI, VictoryRoad_1F_Text_NaomiIntro, VictoryRoad_1F_Text_NaomiDefeat - msgbox VictoryRoad_1F_Text_NaomiPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_COOLTRAINER_NAOMI, VictoryRoad_1F_Text_NaomiIntro, VictoryRoad_1F_Text_NaomiDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, VictoryRoad_1F_EventScript_NaomiRematch + msgbox VictoryRoad_1F_Text_NaomiPostBattle, MSGBOX_AUTOCLOSE + end + +VictoryRoad_1F_EventScript_NaomiRematch:: + trainerbattle_rematch TRAINER_COOLTRAINER_NAOMI, VictoryRoad_1F_Text_NaomiIntro, VictoryRoad_1F_Text_NaomiDefeat + msgbox VictoryRoad_1F_Text_NaomiPostBattle, MSGBOX_AUTOCLOSE + end VictoryRoad_1F_EventScript_Rolando:: - trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, VictoryRoad_1F_Text_RolandoIntro, VictoryRoad_1F_Text_RolandoDefeat - msgbox VictoryRoad_1F_Text_RolandoPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, VictoryRoad_1F_Text_RolandoIntro, VictoryRoad_1F_Text_RolandoDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, VictoryRoad_1F_EventScript_RolandoRematch + msgbox VictoryRoad_1F_Text_RolandoPostBattle, MSGBOX_AUTOCLOSE + end + +VictoryRoad_1F_EventScript_RolandoRematch:: + trainerbattle_rematch TRAINER_COOLTRAINER_ROLANDO, VictoryRoad_1F_Text_RolandoIntro, VictoryRoad_1F_Text_RolandoDefeat + msgbox VictoryRoad_1F_Text_RolandoPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index eb9af7d67..3bbad8098 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -52,26 +52,62 @@ VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed:: end VictoryRoad_2F_EventScript_Dawson:: - trainerbattle_single TRAINER_POKEMANIAC_DAWSON, VictoryRoad_2F_Text_DawsonIntro, VictoryRoad_2F_Text_DawsonDefeat - msgbox VictoryRoad_2F_Text_DawsonPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_POKEMANIAC_DAWSON, VictoryRoad_2F_Text_DawsonIntro, VictoryRoad_2F_Text_DawsonDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, VictoryRoad_2F_EventScript_DawsonRematch + msgbox VictoryRoad_2F_Text_DawsonPostBattle, MSGBOX_AUTOCLOSE + end + +VictoryRoad_2F_EventScript_DawsonRematch:: + trainerbattle_rematch TRAINER_POKEMANIAC_DAWSON, VictoryRoad_2F_Text_DawsonIntro, VictoryRoad_2F_Text_DawsonDefeat + msgbox VictoryRoad_2F_Text_DawsonPostBattle, MSGBOX_AUTOCLOSE + end VictoryRoad_2F_EventScript_Daisuke:: - trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, VictoryRoad_2F_Text_DaisukeIntro, VictoryRoad_2F_Text_DaisukeDefeat - msgbox VictoryRoad_2F_Text_DaisukePostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, VictoryRoad_2F_Text_DaisukeIntro, VictoryRoad_2F_Text_DaisukeDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, VictoryRoad_2F_EventScript_DaisukeRematch + msgbox VictoryRoad_2F_Text_DaisukePostBattle, MSGBOX_AUTOCLOSE + end + +VictoryRoad_2F_EventScript_DaisukeRematch:: + trainerbattle_rematch TRAINER_BLACK_BELT_DAISUKE, VictoryRoad_2F_Text_DaisukeIntro, VictoryRoad_2F_Text_DaisukeDefeat + msgbox VictoryRoad_2F_Text_DaisukePostBattle, MSGBOX_AUTOCLOSE + end VictoryRoad_2F_EventScript_Nelson:: - trainerbattle_single TRAINER_JUGGLER_NELSON, VictoryRoad_2F_Text_NelsonIntro, VictoryRoad_2F_Text_NelsonDefeat - msgbox VictoryRoad_2F_Text_NelsonPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_JUGGLER_NELSON, VictoryRoad_2F_Text_NelsonIntro, VictoryRoad_2F_Text_NelsonDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, VictoryRoad_2F_EventScript_NelsonRematch + msgbox VictoryRoad_2F_Text_NelsonPostBattle, MSGBOX_AUTOCLOSE + end + +VictoryRoad_2F_EventScript_NelsonRematch:: + trainerbattle_rematch TRAINER_JUGGLER_NELSON, VictoryRoad_2F_Text_NelsonIntro, VictoryRoad_2F_Text_NelsonDefeat + msgbox VictoryRoad_2F_Text_NelsonPostBattle, MSGBOX_AUTOCLOSE + end VictoryRoad_2F_EventScript_Gregory:: - trainerbattle_single TRAINER_JUGGLER_GREGORY, VictoryRoad_2F_Text_GregoryIntro, VictoryRoad_2F_Text_GregoryDefeat - msgbox VictoryRoad_2F_Text_GregoryPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_JUGGLER_GREGORY, VictoryRoad_2F_Text_GregoryIntro, VictoryRoad_2F_Text_GregoryDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, VictoryRoad_2F_EventScript_GregoryRematch + msgbox VictoryRoad_2F_Text_GregoryPostBattle, MSGBOX_AUTOCLOSE + end + +VictoryRoad_2F_EventScript_GregoryRematch:: + trainerbattle_rematch TRAINER_JUGGLER_GREGORY, VictoryRoad_2F_Text_GregoryIntro, VictoryRoad_2F_Text_GregoryDefeat + msgbox VictoryRoad_2F_Text_GregoryPostBattle, MSGBOX_AUTOCLOSE + end VictoryRoad_2F_EventScript_Vincent:: - trainerbattle_single TRAINER_TAMER_VINCENT, VictoryRoad_2F_Text_VincentIntro, VictoryRoad_2F_Text_VincentDefeat - msgbox VictoryRoad_2F_Text_VincentPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TAMER_VINCENT, VictoryRoad_2F_Text_VincentIntro, VictoryRoad_2F_Text_VincentDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, VictoryRoad_2F_EventScript_VincentRematch + msgbox VictoryRoad_2F_Text_VincentPostBattle, MSGBOX_AUTOCLOSE + end + +VictoryRoad_2F_EventScript_VincentRematch:: + trainerbattle_rematch TRAINER_TAMER_VINCENT, VictoryRoad_2F_Text_VincentIntro, VictoryRoad_2F_Text_VincentDefeat + msgbox VictoryRoad_2F_Text_VincentPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index 8621b4045..48333c8fb 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -30,31 +30,74 @@ VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed:: end VictoryRoad_3F_EventScript_George:: - trainerbattle_single TRAINER_COOLTRAINER_GEORGE, VictoryRoad_3F_Text_GeorgeIntro, VictoryRoad_3F_Text_GeorgeDefeat - msgbox VictoryRoad_3F_Text_GeorgePostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_COOLTRAINER_GEORGE, VictoryRoad_3F_Text_GeorgeIntro, VictoryRoad_3F_Text_GeorgeDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, VictoryRoad_3F_EventScript_GeorgeRematch + msgbox VictoryRoad_3F_Text_GeorgePostBattle, MSGBOX_AUTOCLOSE + end + +VictoryRoad_3F_EventScript_GeorgeRematch:: + trainerbattle_rematch TRAINER_COOLTRAINER_GEORGE, VictoryRoad_3F_Text_GeorgeIntro, VictoryRoad_3F_Text_GeorgeDefeat + msgbox VictoryRoad_3F_Text_GeorgePostBattle, MSGBOX_AUTOCLOSE + end VictoryRoad_3F_EventScript_Colby:: - trainerbattle_single TRAINER_COOLTRAINER_COLBY, VictoryRoad_3F_Text_ColbyIntro, VictoryRoad_3F_Text_ColbyDefeat - msgbox VictoryRoad_3F_Text_ColbyPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_COOLTRAINER_COLBY, VictoryRoad_3F_Text_ColbyIntro, VictoryRoad_3F_Text_ColbyDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, VictoryRoad_3F_EventScript_ColbyRematch + msgbox VictoryRoad_3F_Text_ColbyPostBattle, MSGBOX_AUTOCLOSE + end + +VictoryRoad_3F_EventScript_ColbyRematch:: + trainerbattle_rematch TRAINER_COOLTRAINER_COLBY, VictoryRoad_3F_Text_ColbyIntro, VictoryRoad_3F_Text_ColbyDefeat + msgbox VictoryRoad_3F_Text_ColbyPostBattle, MSGBOX_AUTOCLOSE + end VictoryRoad_3F_EventScript_Caroline:: - trainerbattle_single TRAINER_COOLTRAINER_CAROLINE, VictoryRoad_3F_Text_CarolineIntro, VictoryRoad_3F_Text_CarolineDefeat - msgbox VictoryRoad_3F_Text_CarolinePostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_COOLTRAINER_CAROLINE, VictoryRoad_3F_Text_CarolineIntro, VictoryRoad_3F_Text_CarolineDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, VictoryRoad_3F_EventScript_CarolineRematch + msgbox VictoryRoad_3F_Text_CarolinePostBattle, MSGBOX_AUTOCLOSE + end + +VictoryRoad_3F_EventScript_CarolineRematch:: + trainerbattle_rematch TRAINER_COOLTRAINER_CAROLINE, VictoryRoad_3F_Text_CarolineIntro, VictoryRoad_3F_Text_CarolineDefeat + msgbox VictoryRoad_3F_Text_CarolinePostBattle, MSGBOX_AUTOCLOSE + end VictoryRoad_3F_EventScript_Alexa:: - trainerbattle_single TRAINER_COOLTRAINER_ALEXA, VictoryRoad_3F_Text_AlexaIntro, VictoryRoad_3F_Text_AlexaDefeat - msgbox VictoryRoad_3F_Text_AlexaPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_COOLTRAINER_ALEXA, VictoryRoad_3F_Text_AlexaIntro, VictoryRoad_3F_Text_AlexaDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, VictoryRoad_3F_EventScript_AlexaRematch + msgbox VictoryRoad_3F_Text_AlexaPostBattle, MSGBOX_AUTOCLOSE + end + +VictoryRoad_3F_EventScript_AlexaRematch:: + trainerbattle_rematch TRAINER_COOLTRAINER_ALEXA, VictoryRoad_3F_Text_AlexaIntro, VictoryRoad_3F_Text_AlexaDefeat + msgbox VictoryRoad_3F_Text_AlexaPostBattle, MSGBOX_AUTOCLOSE + end VictoryRoad_3F_EventScript_Ray:: - trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, VictoryRoad_3F_Text_RayIntro, VictoryRoad_3F_Text_RayDefeat, VictoryRoad_3F_Text_RayNotEnoughMons - msgbox VictoryRoad_3F_Text_RayPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, VictoryRoad_3F_Text_RayIntro, VictoryRoad_3F_Text_RayDefeat, VictoryRoad_3F_Text_RayNotEnoughMons + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, VictoryRoad_3F_EventScript_RayRematch + msgbox VictoryRoad_3F_Text_RayPostBattle, MSGBOX_AUTOCLOSE + end + +VictoryRoad_3F_EventScript_RayRematch:: + trainerbattle_rematch_double TRAINER_COOL_COUPLE_RAY_TYRA, VictoryRoad_3F_Text_RayIntro, VictoryRoad_3F_Text_RayDefeat, VictoryRoad_3F_Text_RayNotEnoughMons + msgbox VictoryRoad_3F_Text_RayPostBattle, MSGBOX_AUTOCLOSE + end VictoryRoad_3F_EventScript_Tyra:: - trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, VictoryRoad_3F_Text_TyraIntro, VictoryRoad_3F_Text_TyraDefeat, VictoryRoad_3F_Text_TyraNotEnoughMons - msgbox VictoryRoad_3F_Text_TyraPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, VictoryRoad_3F_Text_TyraIntro, VictoryRoad_3F_Text_TyraDefeat, VictoryRoad_3F_Text_TyraNotEnoughMons + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, VictoryRoad_3F_EventScript_TyraRematch + msgbox VictoryRoad_3F_Text_TyraPostBattle, MSGBOX_AUTOCLOSE + end + +VictoryRoad_3F_EventScript_TyraRematch:: + trainerbattle_rematch_double TRAINER_COOL_COUPLE_RAY_TYRA, VictoryRoad_3F_Text_TyraIntro, VictoryRoad_3F_Text_TyraDefeat, VictoryRoad_3F_Text_TyraNotEnoughMons + msgbox VictoryRoad_3F_Text_TyraPostBattle, MSGBOX_AUTOCLOSE + end + diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index 3e07a41b7..1077a5107 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -39,44 +39,100 @@ ViridianCity_Gym_EventScript_NoRoomForTM26:: end ViridianCity_Gym_EventScript_Jason:: - trainerbattle_single TRAINER_TAMER_JASON, ViridianCity_Gym_Text_JasonIntro, ViridianCity_Gym_Text_JasonDefeat - msgbox ViridianCity_Gym_Text_JasonPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TAMER_JASON, ViridianCity_Gym_Text_JasonIntro, ViridianCity_Gym_Text_JasonDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, ViridianCity_Gym_EventScript_JasonRematch + msgbox ViridianCity_Gym_Text_JasonPostBattle, MSGBOX_AUTOCLOSE + end + +ViridianCity_Gym_EventScript_JasonRematch:: + trainerbattle_rematch TRAINER_TAMER_JASON, ViridianCity_Gym_Text_JasonIntro, ViridianCity_Gym_Text_JasonDefeat + msgbox ViridianCity_Gym_Text_JasonPostBattle, MSGBOX_AUTOCLOSE + end ViridianCity_Gym_EventScript_Cole:: - trainerbattle_single TRAINER_TAMER_COLE, ViridianCity_Gym_Text_ColeIntro, ViridianCity_Gym_Text_ColeDefeat - msgbox ViridianCity_Gym_Text_ColePostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_TAMER_COLE, ViridianCity_Gym_Text_ColeIntro, ViridianCity_Gym_Text_ColeDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, ViridianCity_Gym_EventScript_ColeRematch + msgbox ViridianCity_Gym_Text_ColePostBattle, MSGBOX_AUTOCLOSE + end + +ViridianCity_Gym_EventScript_ColeRematch:: + trainerbattle_rematch TRAINER_TAMER_COLE, ViridianCity_Gym_Text_ColeIntro, ViridianCity_Gym_Text_ColeDefeat + msgbox ViridianCity_Gym_Text_ColePostBattle, MSGBOX_AUTOCLOSE + end ViridianCity_Gym_EventScript_Atsushi:: - trainerbattle_single TRAINER_BLACK_BELT_ATSUSHI, ViridianCity_Gym_Text_AtsushiIntro, ViridianCity_Gym_Text_AtsushiDefeat - msgbox ViridianCity_Gym_Text_AtsushiPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BLACK_BELT_ATSUSHI, ViridianCity_Gym_Text_AtsushiIntro, ViridianCity_Gym_Text_AtsushiDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, ViridianCity_Gym_EventScript_AtsushiRematch + msgbox ViridianCity_Gym_Text_AtsushiPostBattle, MSGBOX_AUTOCLOSE + end + +ViridianCity_Gym_EventScript_AtsushiRematch:: + trainerbattle_rematch TRAINER_BLACK_BELT_ATSUSHI, ViridianCity_Gym_Text_AtsushiIntro, ViridianCity_Gym_Text_AtsushiDefeat + msgbox ViridianCity_Gym_Text_AtsushiPostBattle, MSGBOX_AUTOCLOSE + end ViridianCity_Gym_EventScript_Kiyo:: - trainerbattle_single TRAINER_BLACK_BELT_KIYO, ViridianCity_Gym_Text_KiyoIntro, ViridianCity_Gym_Text_KiyoDefeat - msgbox ViridianCity_Gym_Text_KiyoPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BLACK_BELT_KIYO, ViridianCity_Gym_Text_KiyoIntro, ViridianCity_Gym_Text_KiyoDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, ViridianCity_Gym_EventScript_KiyoRematch + msgbox ViridianCity_Gym_Text_KiyoPostBattle, MSGBOX_AUTOCLOSE + end + +ViridianCity_Gym_EventScript_KiyoRematch:: + trainerbattle_rematch TRAINER_BLACK_BELT_KIYO, ViridianCity_Gym_Text_KiyoIntro, ViridianCity_Gym_Text_KiyoDefeat + msgbox ViridianCity_Gym_Text_KiyoPostBattle, MSGBOX_AUTOCLOSE + end ViridianCity_Gym_EventScript_Takashi:: - trainerbattle_single TRAINER_BLACK_BELT_TAKASHI, ViridianCity_Gym_Text_TakashiIntro, ViridianCity_Gym_Text_TakashiDefeat - msgbox ViridianCity_Gym_Text_TakashiPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BLACK_BELT_TAKASHI, ViridianCity_Gym_Text_TakashiIntro, ViridianCity_Gym_Text_TakashiDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, ViridianCity_Gym_EventScript_TakashiRematch + msgbox ViridianCity_Gym_Text_TakashiPostBattle, MSGBOX_AUTOCLOSE + end + +ViridianCity_Gym_EventScript_TakashiRematch:: + trainerbattle_rematch TRAINER_BLACK_BELT_TAKASHI, ViridianCity_Gym_Text_TakashiIntro, ViridianCity_Gym_Text_TakashiDefeat + msgbox ViridianCity_Gym_Text_TakashiPostBattle, MSGBOX_AUTOCLOSE + end ViridianCity_Gym_EventScript_Samuel:: - trainerbattle_single TRAINER_COOLTRAINER_SAMUEL, ViridianCity_Gym_Text_SamuelIntro, ViridianCity_Gym_Text_SamuelDefeat - msgbox ViridianCity_Gym_Text_SamuelPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_COOLTRAINER_SAMUEL, ViridianCity_Gym_Text_SamuelIntro, ViridianCity_Gym_Text_SamuelDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, ViridianCity_Gym_EventScript_SamuelRematch + msgbox ViridianCity_Gym_Text_SamuelPostBattle, MSGBOX_AUTOCLOSE + end + +ViridianCity_Gym_EventScript_SamuelRematch:: + trainerbattle_rematch TRAINER_COOLTRAINER_SAMUEL, ViridianCity_Gym_Text_SamuelIntro, ViridianCity_Gym_Text_SamuelDefeat + msgbox ViridianCity_Gym_Text_SamuelPostBattle, MSGBOX_AUTOCLOSE + end ViridianCity_Gym_EventScript_Yuji:: - trainerbattle_single TRAINER_COOLTRAINER_YUJI, ViridianCity_Gym_Text_YujiIntro, ViridianCity_Gym_Text_YujiDefeat - msgbox ViridianCity_Gym_Text_YujiPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_COOLTRAINER_YUJI, ViridianCity_Gym_Text_YujiIntro, ViridianCity_Gym_Text_YujiDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, ViridianCity_Gym_EventScript_YujiRematch + msgbox ViridianCity_Gym_Text_YujiPostBattle, MSGBOX_AUTOCLOSE + end + +ViridianCity_Gym_EventScript_YujiRematch:: + trainerbattle_rematch TRAINER_COOLTRAINER_YUJI, ViridianCity_Gym_Text_YujiIntro, ViridianCity_Gym_Text_YujiDefeat + msgbox ViridianCity_Gym_Text_YujiPostBattle, MSGBOX_AUTOCLOSE + end ViridianCity_Gym_EventScript_Warren:: - trainerbattle_single TRAINER_COOLTRAINER_WARREN, ViridianCity_Gym_Text_WarrenIntro, ViridianCity_Gym_Text_WarrenDefeat - msgbox ViridianCity_Gym_Text_WarrenPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_COOLTRAINER_WARREN, ViridianCity_Gym_Text_WarrenIntro, ViridianCity_Gym_Text_WarrenDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, ViridianCity_Gym_EventScript_WarrenRematch + msgbox ViridianCity_Gym_Text_WarrenPostBattle, MSGBOX_AUTOCLOSE + end + +ViridianCity_Gym_EventScript_WarrenRematch:: + trainerbattle_rematch TRAINER_COOLTRAINER_WARREN, ViridianCity_Gym_Text_WarrenIntro, ViridianCity_Gym_Text_WarrenDefeat + msgbox ViridianCity_Gym_Text_WarrenPostBattle, MSGBOX_AUTOCLOSE + end ViridianCity_Gym_EventScript_GymGuy:: lock @@ -103,3 +159,4 @@ ViridianCity_Gym_EventScript_GymStatuePostVictory:: msgbox ViridianCity_Gym_Text_GymStatuePlayerWon releaseall end + diff --git a/data/maps/ViridianForest/scripts.inc b/data/maps/ViridianForest/scripts.inc index 5bee9e264..07600ed71 100644 --- a/data/maps/ViridianForest/scripts.inc +++ b/data/maps/ViridianForest/scripts.inc @@ -39,26 +39,62 @@ ViridianForest_EventScript_ExitSign:: end ViridianForest_EventScript_Rick:: - trainerbattle_single TRAINER_BUG_CATCHER_RICK, ViridianForest_Text_RickIntro, ViridianForest_Text_RickDefeat - msgbox ViridianForest_Text_RickPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BUG_CATCHER_RICK, ViridianForest_Text_RickIntro, ViridianForest_Text_RickDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, ViridianForest_EventScript_RickRematch + msgbox ViridianForest_Text_RickPostBattle, MSGBOX_AUTOCLOSE + end + +ViridianForest_EventScript_RickRematch:: + trainerbattle_rematch TRAINER_BUG_CATCHER_RICK, ViridianForest_Text_RickIntro, ViridianForest_Text_RickDefeat + msgbox ViridianForest_Text_RickPostBattle, MSGBOX_AUTOCLOSE + end ViridianForest_EventScript_Doug:: - trainerbattle_single TRAINER_BUG_CATCHER_DOUG, ViridianForest_Text_DougIntro, ViridianForest_Text_DougDefeat - msgbox ViridianForest_Text_DougPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BUG_CATCHER_DOUG, ViridianForest_Text_DougIntro, ViridianForest_Text_DougDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, ViridianForest_EventScript_DougRematch + msgbox ViridianForest_Text_DougPostBattle, MSGBOX_AUTOCLOSE + end + +ViridianForest_EventScript_DougRematch:: + trainerbattle_rematch TRAINER_BUG_CATCHER_DOUG, ViridianForest_Text_DougIntro, ViridianForest_Text_DougDefeat + msgbox ViridianForest_Text_DougPostBattle, MSGBOX_AUTOCLOSE + end ViridianForest_EventScript_Sammy:: - trainerbattle_single TRAINER_BUG_CATCHER_SAMMY, ViridianForest_Text_SammyIntro, ViridianForest_Text_SammyDefeat - msgbox ViridianForest_Text_SammyPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BUG_CATCHER_SAMMY, ViridianForest_Text_SammyIntro, ViridianForest_Text_SammyDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, ViridianForest_EventScript_SammyRematch + msgbox ViridianForest_Text_SammyPostBattle, MSGBOX_AUTOCLOSE + end + +ViridianForest_EventScript_SammyRematch:: + trainerbattle_rematch TRAINER_BUG_CATCHER_SAMMY, ViridianForest_Text_SammyIntro, ViridianForest_Text_SammyDefeat + msgbox ViridianForest_Text_SammyPostBattle, MSGBOX_AUTOCLOSE + end ViridianForest_EventScript_Anthony:: - trainerbattle_single TRAINER_BUG_CATCHER_ANTHONY, ViridianForest_Text_AnthonyIntro, ViridianForest_Text_AnthonyDefeat - msgbox ViridianForest_Text_AnthonyPostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BUG_CATCHER_ANTHONY, ViridianForest_Text_AnthonyIntro, ViridianForest_Text_AnthonyDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, ViridianForest_EventScript_AnthonyRematch + msgbox ViridianForest_Text_AnthonyPostBattle, MSGBOX_AUTOCLOSE + end + +ViridianForest_EventScript_AnthonyRematch:: + trainerbattle_rematch TRAINER_BUG_CATCHER_ANTHONY, ViridianForest_Text_AnthonyIntro, ViridianForest_Text_AnthonyDefeat + msgbox ViridianForest_Text_AnthonyPostBattle, MSGBOX_AUTOCLOSE + end ViridianForest_EventScript_Charlie:: - trainerbattle_single TRAINER_BUG_CATCHER_CHARLIE, ViridianForest_Text_CharlieIntro, ViridianForest_Text_CharlieDefeat - msgbox ViridianForest_Text_CharliePostBattle, MSGBOX_AUTOCLOSE - end + trainerbattle_single TRAINER_BUG_CATCHER_CHARLIE, ViridianForest_Text_CharlieIntro, ViridianForest_Text_CharlieDefeat + specialvar VAR_RESULT, ShouldTryRematchBattle + goto_if_eq VAR_RESULT, TRUE, ViridianForest_EventScript_CharlieRematch + msgbox ViridianForest_Text_CharliePostBattle, MSGBOX_AUTOCLOSE + end + +ViridianForest_EventScript_CharlieRematch:: + trainerbattle_rematch TRAINER_BUG_CATCHER_CHARLIE, ViridianForest_Text_CharlieIntro, ViridianForest_Text_CharlieDefeat + msgbox ViridianForest_Text_CharliePostBattle, MSGBOX_AUTOCLOSE + end +