diff options
Diffstat (limited to 'data/scripts')
62 files changed, 135 insertions, 135 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 362a78e65..c1e1e540d 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -409,7 +409,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F23:: @ 8276F23 end OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E - special sub_80F92F8 + special HasEnoughMonsForDoubleBattle compare_var_to_value VAR_RESULT, 0 goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_276F47 setvar VAR_0x8004, 2 @@ -1194,7 +1194,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E end OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899 - special sub_80F92F8 + special HasEnoughMonsForDoubleBattle compare_var_to_value VAR_RESULT, 0 goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_2778B2 setvar VAR_0x8004, 1 diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc index 7d86c6f3f..0b687aaeb 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 82380A6 AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7 trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq AbandonedShip_Rooms2_1F_EventScript_2380F0 msgbox AbandonedShip_Rooms2_1F_Text_23820F, 4 @@ -26,7 +26,7 @@ AbandonedShip_Rooms2_1F_EventScript_2380F0:: @ 82380F0 AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq AbandonedShip_Rooms2_1F_EventScript_238154 msgbox AbandonedShip_Rooms2_1F_Text_23830A, 4 diff --git a/data/scripts/maps/AbandonedShip_Rooms_1F.inc b/data/scripts/maps/AbandonedShip_Rooms_1F.inc index 025b497dd..beaea9b34 100644 --- a/data/scripts/maps/AbandonedShip_Rooms_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms_1F.inc @@ -12,7 +12,7 @@ AbandonedShip_Rooms_1F_EventScript_237A9C:: @ 8237A9C AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3 trainerbattle 2, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq AbandonedShip_Rooms_1F_EventScript_237AFE msgbox AbandonedShip_Rooms_1F_Text_237BDB, 4 diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 85a1d708d..240a40fd8 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -72,7 +72,7 @@ AncientTomb_EventScript_23905A:: @ 823905A waitmoncry setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0A74 + special StartRegiBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 diff --git a/data/scripts/maps/BattleFrontier_Lounge2.inc b/data/scripts/maps/BattleFrontier_Lounge2.inc index 6b43747cc..bd20f13ac 100644 --- a/data/scripts/maps/BattleFrontier_Lounge2.inc +++ b/data/scripts/maps/BattleFrontier_Lounge2.inc @@ -17,29 +17,29 @@ BattleFrontier_Lounge2_EventScript_26065F:: @ 826065F end BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D - compare_var_to_value VAR_0x402F, 0 + compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 0 call_if 1, BattleFrontier_Lounge2_EventScript_26070A - compare_var_to_value VAR_0x402F, 1 + compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 1 call_if 1, BattleFrontier_Lounge2_EventScript_26070F - compare_var_to_value VAR_0x402F, 2 + compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 2 call_if 1, BattleFrontier_Lounge2_EventScript_260714 - compare_var_to_value VAR_0x402F, 3 + compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 3 call_if 1, BattleFrontier_Lounge2_EventScript_260719 - compare_var_to_value VAR_0x402F, 4 + compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 4 call_if 1, BattleFrontier_Lounge2_EventScript_26071E - compare_var_to_value VAR_0x402F, 5 + compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 5 call_if 1, BattleFrontier_Lounge2_EventScript_260723 - compare_var_to_value VAR_0x402F, 6 + compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 6 call_if 1, BattleFrontier_Lounge2_EventScript_260728 - compare_var_to_value VAR_0x402F, 7 + compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 7 call_if 1, BattleFrontier_Lounge2_EventScript_26072D - compare_var_to_value VAR_0x402F, 8 + compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 8 call_if 1, BattleFrontier_Lounge2_EventScript_260732 - compare_var_to_value VAR_0x402F, 9 + compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 9 call_if 1, BattleFrontier_Lounge2_EventScript_260737 - compare_var_to_value VAR_0x402F, 3 + compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 3 call_if 3, BattleFrontier_Lounge2_EventScript_2606F8 - compare_var_to_value VAR_0x402F, 4 + compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 4 call_if 4, BattleFrontier_Lounge2_EventScript_260701 special sub_8139F20 waitmessage diff --git a/data/scripts/maps/BattleFrontier_Lounge3.inc b/data/scripts/maps/BattleFrontier_Lounge3.inc index 0612ccb8e..5fb7a8367 100644 --- a/data/scripts/maps/BattleFrontier_Lounge3.inc +++ b/data/scripts/maps/BattleFrontier_Lounge3.inc @@ -32,7 +32,7 @@ BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF BattleFrontier_Lounge3_EventScript_261DE9:: @ 8261DE9 multichoice 20, 4, 87, 0 - copyvar VAR_0x4032, VAR_RESULT + copyvar VAR_FRONTIER_GAMBLER_AMOUNT_BET, VAR_RESULT switch VAR_RESULT case 0, BattleFrontier_Lounge3_EventScript_261E30 case 1, BattleFrontier_Lounge3_EventScript_261E3B @@ -69,7 +69,7 @@ BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51 BattleFrontier_Lounge3_EventScript_261E75:: @ 8261E75 copyvar VAR_0x8004, VAR_0x8008 special sub_813A9A4 - setvar VAR_0x4033, 1 + setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 special sub_813A8FC playse SE_REGI msgbox BattleFrontier_Lounge3_Text_262BE0, 4 @@ -113,37 +113,37 @@ BattleFrontier_Lounge3_EventScript_261EEB:: @ 8261EEB BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9 msgbox BattleFrontier_Lounge3_Text_26346B, 4 - compare_var_to_value VAR_0x4033, 1 + compare_var_to_value VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 goto_if 4, BattleFrontier_Lounge3_EventScript_261F12 goto BattleFrontier_Lounge3_EventScript_261DAF end BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12 - compare_var_to_value VAR_0x4033, 1 + compare_var_to_value VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 goto_eq BattleFrontier_Lounge3_EventScript_261F9E - compare_var_to_value VAR_0x4033, 2 + compare_var_to_value VAR_FRONTIER_GAMBLER_PLACED_BET_F, 2 goto_eq BattleFrontier_Lounge3_EventScript_261F2E goto BattleFrontier_Lounge3_EventScript_261F71 end BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E msgbox BattleFrontier_Lounge3_Text_263334, 4 - compare_var_to_value VAR_0x4032, 0 + compare_var_to_value VAR_FRONTIER_GAMBLER_AMOUNT_BET, 0 call_if 1, BattleFrontier_Lounge3_EventScript_261F80 - compare_var_to_value VAR_0x4032, 1 + compare_var_to_value VAR_FRONTIER_GAMBLER_AMOUNT_BET, 1 call_if 1, BattleFrontier_Lounge3_EventScript_261F8A - compare_var_to_value VAR_0x4032, 2 + compare_var_to_value VAR_FRONTIER_GAMBLER_AMOUNT_BET, 2 call_if 1, BattleFrontier_Lounge3_EventScript_261F94 msgbox BattleFrontier_Lounge3_Text_2633D4, 9 special sub_813A9D0 msgbox BattleFrontier_Lounge3_Text_2633F2, 4 - setvar VAR_0x4033, 0 + setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0 release end BattleFrontier_Lounge3_EventScript_261F71:: @ 8261F71 msgbox BattleFrontier_Lounge3_Text_263298, 4 - setvar VAR_0x4033, 0 + setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0 release end diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/scripts/maps/BirthIsland_Exterior.inc index 8ea18a673..8c298c85a 100644 --- a/data/scripts/maps/BirthIsland_Exterior.inc +++ b/data/scripts/maps/BirthIsland_Exterior.inc @@ -88,7 +88,7 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 setvar VAR_0x8006, 0 special DoScriptedWildBattle setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index bb2f6d23d..afbd24903 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -72,7 +72,7 @@ DesertRuins_EventScript_22DA02:: @ 822DA02 waitmoncry setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0A74 + special StartRegiBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index a3f996f25..5e9b5fa7d 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -157,7 +157,7 @@ DewfordTown_Gym_EventScript_1FC7C1:: @ 81FC7C1 DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2 trainerbattle 1, TRAINER_BRAWLY_1, 0, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq DewfordTown_Gym_EventScript_1FC89C checkflag FLAG_0x0A6 diff --git a/data/scripts/maps/FarawayIsland_Interior.inc b/data/scripts/maps/FarawayIsland_Interior.inc index f49d938a7..e86a2da52 100644 --- a/data/scripts/maps/FarawayIsland_Interior.inc +++ b/data/scripts/maps/FarawayIsland_Interior.inc @@ -145,7 +145,7 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 setvar VAR_0x8006, 0 special DoScriptedWildBattle setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index e3990cd23..67d5a21eb 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -17,7 +17,7 @@ FortreeCity_Gym_EventScript_2165C4:: @ 82165C4 FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 trainerbattle 1, TRAINER_WINONA_1, 0, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq FortreeCity_Gym_EventScript_21668D checkflag FLAG_0x0AA diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 69a3ef76a..4d6a4fda9 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -104,7 +104,7 @@ IslandCave_EventScript_238F58:: @ 8238F58 waitmoncry setwildbattle SPECIES_REGICE, 40, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0A74 + special StartRegiBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 1fb3b316e..4cc415b30 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -104,7 +104,7 @@ JaggedPass_EventScript_230785:: @ 8230785 JaggedPass_EventScript_23079C:: @ 823079C trainerbattle 2, TRAINER_DIANA_1, 0, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq JaggedPass_EventScript_2307E4 msgbox JaggedPass_Text_2309D8, 4 @@ -128,7 +128,7 @@ JaggedPass_EventScript_2307E4:: @ 82307E4 JaggedPass_EventScript_2307FB:: @ 82307FB trainerbattle 2, TRAINER_ETHAN_1, 0, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq JaggedPass_EventScript_230843 msgbox JaggedPass_Text_230B93, 4 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 55ae851e0..581f4ca1d 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -60,7 +60,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C trainerbattle 1, TRAINER_FLANNERY_1, 0, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq LavaridgeTown_Gym_1F_EventScript_1FE864 checkflag FLAG_0x0A8 @@ -127,9 +127,9 @@ LavaridgeTown_Gym_1F_EventScript_1FE89A:: @ 81FE89A LavaridgeTown_Gym_B1F_EventScript_1FE89A:: @ 81FE89A call LavaridgeTown_Gym_1F_EventScript_1FE705 release - special CheckIfMultipleTrainersWantBattle + special ShouldTryGetTrainerScript compare_var_to_value VAR_RESULT, 1 - goto_eq LavaridgeTown_Gym_1F_EventScript_2742F6 + goto_eq EventScript_GotoTrainerScript end LavaridgeTown_Gym_1F_EventScript_1FE8AF:: @ 81FE8AF diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index cef69c7b2..1dd35ab18 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -482,7 +482,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A compare_var_to_value VAR_0x40D3, 2 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E checkflag FLAG_0x119 goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2 diff --git a/data/scripts/maps/MarineCave_End.inc b/data/scripts/maps/MarineCave_End.inc index dc2e2b3a0..fafc10b63 100644 --- a/data/scripts/maps/MarineCave_End.inc +++ b/data/scripts/maps/MarineCave_End.inc @@ -38,7 +38,7 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B setvar VAR_LAST_TALKED, 1 setwildbattle SPECIES_KYOGRE, 70, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE setvar VAR_0x4001, 0 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 899550337..dd2d502db 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -77,7 +77,7 @@ MauvilleCity_Gym_EventScript_20DEE7:: @ 820DEE7 MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB trainerbattle 1, TRAINER_WATTSON_1, 0, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq MauvilleCity_Gym_EventScript_20DFDE checkflag FLAG_0x0A7 diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc index 8cf171209..12e84c761 100644 --- a/data/scripts/maps/MeteorFalls_1F_2R.inc +++ b/data/scripts/maps/MeteorFalls_1F_2R.inc @@ -3,7 +3,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 822C4DD MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE trainerbattle 2, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C529 msgbox MeteorFalls_1F_2R_Text_22C6A3, 4 @@ -28,7 +28,7 @@ MeteorFalls_1F_2R_EventScript_22C529:: @ 822C529 MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C589 msgbox MeteorFalls_1F_2R_Text_22C8C1, 4 @@ -51,7 +51,7 @@ MeteorFalls_1F_2R_EventScript_22C589:: @ 822C589 MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C5ED msgbox MeteorFalls_1F_2R_Text_22CA70, 4 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 89c243767..dfcb14721 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -50,7 +50,7 @@ MossdeepCity_Gym_EventScript_220885:: @ 8220885 MossdeepCity_Gym_EventScript_220898:: @ 8220898 trainerbattle 8, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq MossdeepCity_Gym_EventScript_22097E checkflag FLAG_0x0AB diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index d7a2ed83a..b93fbd3ec 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -488,7 +488,7 @@ MtChimney_EventScript_22F141:: @ 822F141 MtChimney_EventScript_22F14A:: @ 822F14A trainerbattle 2, TRAINER_SHELBY_1, 0, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq MtChimney_EventScript_22F195 msgbox MtChimney_Text_2300A2, 4 @@ -533,7 +533,7 @@ MtChimney_EventScript_22F1F1:: @ 822F1F1 MtChimney_EventScript_22F208:: @ 822F208 trainerbattle 2, TRAINER_SAWYER_1, 0, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq MtChimney_EventScript_22F253 msgbox MtChimney_Text_230519, 4 diff --git a/data/scripts/maps/MtPyre_3F.inc b/data/scripts/maps/MtPyre_3F.inc index ad99e6c9a..7c95a8d84 100644 --- a/data/scripts/maps/MtPyre_3F.inc +++ b/data/scripts/maps/MtPyre_3F.inc @@ -13,7 +13,7 @@ MtPyre_3F_EventScript_23176A:: @ 823176A MtPyre_3F_EventScript_231781:: @ 8231781 trainerbattle 2, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq MtPyre_3F_EventScript_2317CC msgbox MtPyre_3F_Text_23199B, 4 diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc index 36a727daa..6c61221d5 100644 --- a/data/scripts/maps/MtPyre_6F.inc +++ b/data/scripts/maps/MtPyre_6F.inc @@ -3,7 +3,7 @@ MtPyre_6F_MapScripts:: @ 8231D3A MtPyre_6F_EventScript_231D3B:: @ 8231D3B trainerbattle 2, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq MtPyre_6F_EventScript_231D86 msgbox MtPyre_6F_Text_231DFC, 4 diff --git a/data/scripts/maps/NavelRock_Bottom.inc b/data/scripts/maps/NavelRock_Bottom.inc index 055697d23..5167af41a 100644 --- a/data/scripts/maps/NavelRock_Bottom.inc +++ b/data/scripts/maps/NavelRock_Bottom.inc @@ -61,7 +61,7 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2 setvar VAR_0x8006, 0 special DoScriptedWildBattle setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/scripts/maps/NavelRock_Top.inc index 01c9a1523..edebb3976 100644 --- a/data/scripts/maps/NavelRock_Top.inc +++ b/data/scripts/maps/NavelRock_Top.inc @@ -65,7 +65,7 @@ NavelRock_Top_EventScript_26916F:: @ 826916F setvar VAR_0x8006, 0 special DoScriptedWildBattle setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE setvar VAR_LAST_TALKED, 1 diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index e223bf414..ad7e2f1cb 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -36,7 +36,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E applymovement 255, PetalburgCity_Movement_1DC430 waitmovement 0 msgbox PetalburgCity_Text_1EC1F8, 4 - special sub_80B086C + special StartWallyTutorialBattle waitstate msgbox PetalburgCity_Text_1EC271, 4 applymovementat 2, PetalburgCity_Movement_2725A4, PETALBURG_CITY diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index e6cdd1334..3c119a227 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -62,7 +62,7 @@ PetalburgCity_Gym_EventScript_204955:: @ 8204955 PetalburgCity_Gym_EventScript_20495D:: @ 820495D setorcopyvar 0x8015, 269 - specialvar VAR_RESULT, sub_80B22A0 + specialvar VAR_RESULT, IsTrainerReadyForRematch compare_var_to_value VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_204985 compare_var_to_value VAR_0x4085, 8 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index a6b018134..64cf94754 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -279,7 +279,7 @@ PetalburgWoods_EventScript_22E26D:: @ 822E26D PetalburgWoods_EventScript_22E284:: @ 822E284 trainerbattle 2, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq PetalburgWoods_EventScript_22E31B setvar VAR_0x8004, 621 @@ -293,7 +293,7 @@ PetalburgWoods_EventScript_22E284:: @ 822E284 PetalburgWoods_EventScript_22E2C5:: @ 822E2C5 special sub_80B4808 waitmovement 0 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq PetalburgWoods_EventScript_22E2D6 release end @@ -308,7 +308,7 @@ PetalburgWoods_EventScript_22E2D6:: @ 822E2D6 end PetalburgWoods_EventScript_22E2EF:: @ 822E2EF - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq PetalburgWoods_EventScript_22E302 msgbox PetalburgWoods_Text_22E889, 4 release diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index a50fec657..eb178a850 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -225,7 +225,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16 setobjectxy 255, 6, 13 applymovement 255, Route101_Movement_2725A4 waitmovement 0 - special sub_80B1138 + special ChooseStarter waitstate applymovement 2, Route101_Movement_1EBE8D waitmovement 0 diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index 00c8c309f..99e9f610c 100644 --- a/data/scripts/maps/Route102.inc +++ b/data/scripts/maps/Route102.inc @@ -19,7 +19,7 @@ Route102_EventScript_1EC0FC:: @ 81EC0FC Route102_EventScript_1EC105:: @ 81EC105 trainerbattle 2, TRAINER_CALVIN_1, 0, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route102_EventScript_1EC19C setvar VAR_0x8004, 318 @@ -33,7 +33,7 @@ Route102_EventScript_1EC105:: @ 81EC105 Route102_EventScript_1EC146:: @ 81EC146 special sub_80B4808 waitmovement 0 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route102_EventScript_1EC157 release end @@ -48,7 +48,7 @@ Route102_EventScript_1EC157:: @ 81EC157 end Route102_EventScript_1EC170:: @ 81EC170 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route102_EventScript_1EC183 msgbox Route102_Text_2945AC, 4 release diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 4dd68204a..dcfa8cde3 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -209,7 +209,7 @@ Route103_EventScript_1EC5F4:: @ 81EC5F4 Route103_EventScript_1EC60B:: @ 81EC60B trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route103_EventScript_1EC653 msgbox Route103_Text_294A52, 6 @@ -231,7 +231,7 @@ Route103_EventScript_1EC653:: @ 81EC653 Route103_EventScript_1EC66E:: @ 81EC66E trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route103_EventScript_1EC6B6 msgbox Route103_Text_294B40, 6 @@ -258,7 +258,7 @@ Route103_EventScript_1EC6D1:: @ 81EC6D1 Route103_EventScript_1EC6E8:: @ 81EC6E8 trainerbattle 2, TRAINER_MIGUEL_1, 0, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route103_EventScript_1EC733 msgbox Route103_Text_294F42, 4 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 8c4138f11..df209ced9 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -882,7 +882,7 @@ Route104_EventScript_1ED376:: @ 81ED376 Route104_EventScript_1ED38D:: @ 81ED38D trainerbattle 2, TRAINER_HALEY_1, 0, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route104_EventScript_1ED424 setvar VAR_0x8004, 604 @@ -896,7 +896,7 @@ Route104_EventScript_1ED38D:: @ 81ED38D Route104_EventScript_1ED3CE:: @ 81ED3CE special sub_80B4808 waitmovement 0 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED3DF release end @@ -911,7 +911,7 @@ Route104_EventScript_1ED3DF:: @ 81ED3DF end Route104_EventScript_1ED3F8:: @ 81ED3F8 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED40B msgbox Route104_Text_295689, 4 release @@ -933,7 +933,7 @@ Route104_EventScript_1ED424:: @ 81ED424 Route104_EventScript_1ED43B:: @ 81ED43B trainerbattle 2, TRAINER_WINSTON_1, 0, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route104_EventScript_1ED4D2 setvar VAR_0x8004, 136 @@ -947,7 +947,7 @@ Route104_EventScript_1ED43B:: @ 81ED43B Route104_EventScript_1ED47C:: @ 81ED47C special sub_80B4808 waitmovement 0 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED48D release end @@ -962,7 +962,7 @@ Route104_EventScript_1ED48D:: @ 81ED48D end Route104_EventScript_1ED4A6:: @ 81ED4A6 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED4B9 msgbox Route104_Text_2958C1, 4 release @@ -984,7 +984,7 @@ Route104_EventScript_1ED4D2:: @ 81ED4D2 Route104_EventScript_1ED4E9:: @ 81ED4E9 trainerbattle 2, TRAINER_CINDY_1, 0, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route104_EventScript_1ED580 setvar VAR_0x8004, 114 @@ -998,7 +998,7 @@ Route104_EventScript_1ED4E9:: @ 81ED4E9 Route104_EventScript_1ED52A:: @ 81ED52A special sub_80B4808 waitmovement 0 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED53B release end @@ -1013,7 +1013,7 @@ Route104_EventScript_1ED53B:: @ 81ED53B end Route104_EventScript_1ED554:: @ 81ED554 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED567 msgbox Route104_Text_295AC3, 4 release diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc index 72b35e7b0..b527fc7a8 100644 --- a/data/scripts/maps/Route105.inc +++ b/data/scripts/maps/Route105.inc @@ -63,7 +63,7 @@ Route105_EventScript_1EE2BD:: @ 81EE2BD Route105_EventScript_1EE2D4:: @ 81EE2D4 trainerbattle 2, TRAINER_ANDRES_1, 0, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route105_EventScript_1EE31F msgbox Route105_Text_2960FA, 4 diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc index 3bb5e27e7..8b0df4336 100644 --- a/data/scripts/maps/Route106.inc +++ b/data/scripts/maps/Route106.inc @@ -17,7 +17,7 @@ Route106_EventScript_1EE4AA:: @ 81EE4AA Route106_EventScript_1EE4C1:: @ 81EE4C1 trainerbattle 2, TRAINER_ELLIOT_1, 0, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route106_EventScript_1EE50C msgbox Route106_Text_29638C, 4 diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc index 736eaa8ee..0f144a6bb 100644 --- a/data/scripts/maps/Route107.inc +++ b/data/scripts/maps/Route107.inc @@ -8,7 +8,7 @@ Route107_EventScript_1EE595:: @ 81EE595 Route107_EventScript_1EE5AC:: @ 81EE5AC trainerbattle 2, TRAINER_TONY_1, 0, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route107_EventScript_1EE5F7 msgbox Route107_Text_2967FF, 4 diff --git a/data/scripts/maps/Route108.inc b/data/scripts/maps/Route108.inc index d88f63ca1..5c416d7dd 100644 --- a/data/scripts/maps/Route108.inc +++ b/data/scripts/maps/Route108.inc @@ -28,7 +28,7 @@ Route108_EventScript_1EE6E6:: @ 81EE6E6 Route108_EventScript_1EE6FD:: @ 81EE6FD trainerbattle 2, TRAINER_CORY_1, 0, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route108_EventScript_1EE748 msgbox Route108_Text_296FB0, 4 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 4cdd835ff..da36de73c 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -397,7 +397,7 @@ Route109_EventScript_1EEA82:: @ 81EEA82 Route109_EventScript_1EEA99:: @ 81EEA99 trainerbattle 2, TRAINER_RICKY_1, 0, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route109_EventScript_1EEAE4 msgbox Route109_Text_297380, 4 @@ -422,7 +422,7 @@ Route109_EventScript_1EEAE4:: @ 81EEAE4 Route109_EventScript_1EEAFB:: @ 81EEAFB trainerbattle 2, TRAINER_LOLA_1, 0, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route109_EventScript_1EEB46 msgbox Route109_Text_2974D6, 4 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 0fa78b385..f07ca623e 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -176,7 +176,7 @@ Route110_EventScript_1EF409:: @ 81EF409 Route110_EventScript_1EF420:: @ 81EF420 trainerbattle 2, TRAINER_EDWIN_1, 0, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route110_EventScript_1EF46B msgbox Route110_Text_2981B3, 4 @@ -216,7 +216,7 @@ Route110_EventScript_1EF4B0:: @ 81EF4B0 Route110_EventScript_1EF4C7:: @ 81EF4C7 trainerbattle 2, TRAINER_BENJAMIN_1, 0, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route110_EventScript_1EF512 msgbox Route110_Text_297CB4, 4 @@ -246,7 +246,7 @@ Route110_EventScript_1EF529:: @ 81EF529 Route110_EventScript_1EF540:: @ 81EF540 trainerbattle 2, TRAINER_ABIGAIL_1, 0, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route110_EventScript_1EF58B msgbox Route110_Text_297E88, 4 @@ -271,7 +271,7 @@ Route110_EventScript_1EF58B:: @ 81EF58B Route110_EventScript_1EF5A2:: @ 81EF5A2 trainerbattle 2, TRAINER_ISABEL_1, 0, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route110_EventScript_1EF5ED msgbox Route110_Text_2983A2, 4 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index c51b07b6c..18dc4c389 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -473,7 +473,7 @@ Route111_EventScript_1F1249:: @ 81F1249 Route111_EventScript_1F1260:: @ 81F1260 trainerbattle 2, TRAINER_DUSTY_1, 0, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route111_EventScript_1F12AB msgbox Route111_Text_298B9A, 4 @@ -513,7 +513,7 @@ Route111_EventScript_1F12F0:: @ 81F12F0 Route111_EventScript_1F1307:: @ 81F1307 trainerbattle 2, TRAINER_WILTON_1, 0, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route111_EventScript_1F1352 msgbox Route111_Text_298FD4, 4 @@ -538,7 +538,7 @@ Route111_EventScript_1F1352:: @ 81F1352 Route111_EventScript_1F1369:: @ 81F1369 trainerbattle 2, TRAINER_BROOKE_1, 0, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route111_EventScript_1F13B4 msgbox Route111_Text_2991C2, 4 diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index 066a7a347..6a9f506f6 100644 --- a/data/scripts/maps/Route112.inc +++ b/data/scripts/maps/Route112.inc @@ -67,7 +67,7 @@ Route112_EventScript_1F1E6A:: @ 81F1E6A Route112_EventScript_1F1E81:: @ 81F1E81 trainerbattle 2, TRAINER_TRENT_1, 0, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route112_EventScript_1F1ECC msgbox Route112_Text_299896, 4 diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 7ee63e492..30bf10068 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -60,7 +60,7 @@ Route113_EventScript_1F21D7:: @ 81F21D7 Route113_EventScript_1F21EE:: @ 81F21EE trainerbattle 2, TRAINER_MADELINE_1, 0, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route113_EventScript_1F2239 msgbox Route113_Text_299F15, 4 @@ -85,7 +85,7 @@ Route113_EventScript_1F2239:: @ 81F2239 Route113_EventScript_1F2250:: @ 81F2250 trainerbattle 2, TRAINER_LAO_1, 0, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route113_EventScript_1F229B msgbox Route113_Text_29A067, 4 diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index cca7be5af..f1aaf24d2 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -110,7 +110,7 @@ Route114_EventScript_1F2685:: @ 81F2685 Route114_EventScript_1F269C:: @ 81F269C trainerbattle 2, TRAINER_STEVE_1, 0, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route114_EventScript_1F26E7 msgbox Route114_Text_29A981, 4 @@ -135,7 +135,7 @@ Route114_EventScript_1F26E7:: @ 81F26E7 Route114_EventScript_1F26FE:: @ 81F26FE trainerbattle 2, TRAINER_BERNIE_1, 0, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route114_EventScript_1F2749 msgbox Route114_Text_29AB36, 4 diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc index 8ea531f9d..8adf2fa04 100644 --- a/data/scripts/maps/Route115.inc +++ b/data/scripts/maps/Route115.inc @@ -38,7 +38,7 @@ Route115_EventScript_1F2985:: @ 81F2985 Route115_EventScript_1F298E:: @ 81F298E trainerbattle 2, TRAINER_TIMOTHY_1, 0, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route115_EventScript_1F29D9 msgbox Route115_Text_29B258, 4 @@ -68,7 +68,7 @@ Route115_EventScript_1F29F0:: @ 81F29F0 Route115_EventScript_1F2A07:: @ 81F2A07 trainerbattle 2, TRAINER_NOB_1, 0, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route115_EventScript_1F2A52 msgbox Route115_Text_29B49D, 4 @@ -93,7 +93,7 @@ Route115_EventScript_1F2A52:: @ 81F2A52 Route115_EventScript_1F2A69:: @ 81F2A69 trainerbattle 2, TRAINER_CYNDY_1, 0, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route115_EventScript_1F2AB4 msgbox Route115_Text_29B647, 4 diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 359f21375..4e6a6be80 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -259,7 +259,7 @@ Route116_EventScript_1F2EA0:: @ 81F2EA0 Route116_EventScript_1F2EB7:: @ 81F2EB7 trainerbattle 2, TRAINER_JERRY_1, 0, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route116_EventScript_1F2F4E setvar VAR_0x8004, 273 @@ -271,7 +271,7 @@ Route116_EventScript_1F2EB7:: @ 81F2EB7 end Route116_EventScript_1F2EF8:: @ 81F2EF8 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route116_EventScript_1F2F03 release end @@ -288,7 +288,7 @@ Route116_EventScript_1F2F03:: @ 81F2F03 end Route116_EventScript_1F2F22:: @ 81F2F22 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route116_EventScript_1F2F35 msgbox Route116_Text_29BD92, 4 release @@ -320,7 +320,7 @@ Route116_EventScript_1F2F7C:: @ 81F2F7C Route116_EventScript_1F2F93:: @ 81F2F93 trainerbattle 2, TRAINER_KAREN_1, 0, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route116_EventScript_1F302A setvar VAR_0x8004, 280 @@ -332,7 +332,7 @@ Route116_EventScript_1F2F93:: @ 81F2F93 end Route116_EventScript_1F2FD4:: @ 81F2FD4 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route116_EventScript_1F2FDF release end @@ -349,7 +349,7 @@ Route116_EventScript_1F2FDF:: @ 81F2FDF end Route116_EventScript_1F2FFE:: @ 81F2FFE - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route116_EventScript_1F3011 msgbox Route116_Text_29C010, 4 release diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 01463516b..5140596d8 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -40,7 +40,7 @@ Route117_EventScript_1F39C7:: @ 81F39C7 Route117_EventScript_1F39D0:: @ 81F39D0 trainerbattle 2, TRAINER_ISAAC_1, 0, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route117_EventScript_1F3A1B msgbox Route117_Text_29C498, 4 @@ -65,7 +65,7 @@ Route117_EventScript_1F3A1B:: @ 81F3A1B Route117_EventScript_1F3A32:: @ 81F3A32 trainerbattle 2, TRAINER_LYDIA_1, 0, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route117_EventScript_1F3A7D msgbox Route117_Text_29C679, 4 @@ -90,7 +90,7 @@ Route117_EventScript_1F3A7D:: @ 81F3A7D Route117_EventScript_1F3A94:: @ 81F3A94 trainerbattle 2, TRAINER_DYLAN_1, 0, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route117_EventScript_1F3ADF msgbox Route117_Text_29C800, 4 @@ -115,7 +115,7 @@ Route117_EventScript_1F3ADF:: @ 81F3ADF Route117_EventScript_1F3AF6:: @ 81F3AF6 trainerbattle 2, TRAINER_MARIA_1, 0, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route117_EventScript_1F3B41 msgbox Route117_Text_29C9D0, 4 @@ -145,7 +145,7 @@ Route117_EventScript_1F3B58:: @ 81F3B58 Route117_EventScript_1F3B6F:: @ 81F3B6F trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route117_EventScript_1F3BB8 msgbox Route117_Text_29CCCB, 4 @@ -168,7 +168,7 @@ Route117_EventScript_1F3BB8:: @ 81F3BB8 Route117_EventScript_1F3BD3:: @ 81F3BD3 trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route117_EventScript_1F3C1C msgbox Route117_Text_29CE17, 4 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 42c3d6d57..5d46224a9 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -188,7 +188,7 @@ Route118_Movement_1F3F7E: @ 81F3F7E Route118_EventScript_1F3F87:: @ 81F3F87 trainerbattle 2, TRAINER_ROSE_1, 0, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route118_EventScript_1F3FD2 msgbox Route118_Text_29D2FA, 4 @@ -223,7 +223,7 @@ Route118_EventScript_1F4000:: @ 81F4000 Route118_EventScript_1F4017:: @ 81F4017 trainerbattle 2, TRAINER_DALTON_1, 0, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route118_EventScript_1F4062 msgbox Route118_Text_29D6D8, 4 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 4436005ba..f9bbadb85 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -368,7 +368,7 @@ Route119_EventScript_1F47F9:: @ 81F47F9 Route119_EventScript_1F4810:: @ 81F4810 trainerbattle 2, TRAINER_JACKSON_1, 0, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route119_EventScript_1F485B msgbox Route119_Text_29DCC6, 4 @@ -393,7 +393,7 @@ Route119_EventScript_1F485B:: @ 81F485B Route119_EventScript_1F4872:: @ 81F4872 trainerbattle 2, TRAINER_CATHERINE_1, 0, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route119_EventScript_1F48BD msgbox Route119_Text_29DE88, 4 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index aaffe0f12..9651ab8ab 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -297,7 +297,7 @@ Route120_EventScript_1F57D7:: @ 81F57D7 Route120_EventScript_1F57EE:: @ 81F57EE trainerbattle 2, TRAINER_ROBERT_1, 0, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route120_EventScript_1F5839 msgbox Route120_Text_29E726, 4 @@ -332,7 +332,7 @@ Route120_EventScript_1F5867:: @ 81F5867 Route120_EventScript_1F587E:: @ 81F587E trainerbattle 2, TRAINER_JEFFREY_1, 0, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route120_EventScript_1F58C9 msgbox Route120_Text_29EA08, 4 diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 0d1f8863e..59623b4e6 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -72,7 +72,7 @@ Route121_EventScript_1F5E74:: @ 81F5E74 Route121_EventScript_1F5E8B:: @ 81F5E8B trainerbattle 2, TRAINER_WALTER_1, 0, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route121_EventScript_1F5ED6 msgbox Route121_Text_29F21E, 4 @@ -112,7 +112,7 @@ Route121_EventScript_1F5F1F:: @ 81F5F1F Route121_EventScript_1F5F3A:: @ 81F5F3A trainerbattle 2, TRAINER_JESSICA_1, 0, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route121_EventScript_1F5F85 msgbox Route121_Text_29F66F, 4 @@ -157,7 +157,7 @@ Route121_EventScript_1F5FE1:: @ 81F5FE1 Route121_EventScript_1F5FF8:: @ 81F5FF8 trainerbattle 2, TRAINER_CRISTIN_1, 0, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route121_EventScript_1F6043 msgbox Route121_Text_29F7D4, 4 diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 8eb397fd4..ee659a496 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -62,7 +62,7 @@ Route123_EventScript_1F61F3:: @ 81F61F3 Route123_EventScript_1F620A:: @ 81F620A trainerbattle 2, TRAINER_CAMERON_1, 0, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route123_EventScript_1F6255 msgbox Route123_Text_29FE2A, 4 @@ -87,7 +87,7 @@ Route123_EventScript_1F6255:: @ 81F6255 Route123_EventScript_1F626C:: @ 81F626C trainerbattle 2, TRAINER_JACKI_1, 0, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route123_EventScript_1F62B7 msgbox Route123_Text_29FFE5, 4 @@ -162,7 +162,7 @@ Route123_EventScript_1F63A5:: @ 81F63A5 Route123_EventScript_1F63BC:: @ 81F63BC trainerbattle 2, TRAINER_FERNANDO_1, 0, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route123_EventScript_1F6407 msgbox Route123_Text_2A0389, 4 diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 2a0298650..01687eba8 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -23,7 +23,7 @@ Route124_EventScript_1F659C:: @ 81F659C Route124_EventScript_1F65B3:: @ 81F65B3 trainerbattle 2, TRAINER_JENNY_1, 0, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route124_EventScript_1F65FE msgbox Route124_Text_2A0B9A, 4 @@ -58,7 +58,7 @@ Route124_EventScript_1F662C:: @ 81F662C Route124_EventScript_1F6643:: @ 81F6643 trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route124_EventScript_1F668C msgbox Route124_Text_2A0F3A, 4 @@ -81,7 +81,7 @@ Route124_EventScript_1F668C:: @ 81F668C Route124_EventScript_1F66A7:: @ 81F66A7 trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route124_EventScript_1F66F0 msgbox Route124_Text_2A103E, 4 diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 953bf52b2..b93e7f016 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -48,7 +48,7 @@ Route125_EventScript_1F67E9:: @ 81F67E9 Route125_EventScript_1F6800:: @ 81F6800 trainerbattle 2, TRAINER_ERNEST_1, 0, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route125_EventScript_1F684B msgbox Route125_Text_2A1755, 4 diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc index 4678fe39d..e6f8848b7 100644 --- a/data/scripts/maps/Route126.inc +++ b/data/scripts/maps/Route126.inc @@ -44,7 +44,7 @@ Route126_EventScript_1F6960:: @ 81F6960 Route126_EventScript_1F6977:: @ 81F6977 trainerbattle 2, TRAINER_PABLO_1, 0, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route126_EventScript_1F69C2 msgbox Route126_Text_2A1F10, 4 diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc index 9851df043..68992425e 100644 --- a/data/scripts/maps/Route127.inc +++ b/data/scripts/maps/Route127.inc @@ -63,7 +63,7 @@ Route127_EventScript_1F6ABF:: @ 81F6ABF Route127_EventScript_1F6AD6:: @ 81F6AD6 trainerbattle 2, TRAINER_KOJI_1, 0, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route127_EventScript_1F6B21 msgbox Route127_Text_2A26AC, 4 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 1ba1b3448..21824eb41 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -177,7 +177,7 @@ Route128_Movement_1F6CBB: @ 81F6CBB Route128_EventScript_1F6CBE:: @ 81F6CBE trainerbattle 2, TRAINER_ISAIAH_1, 0, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D09 msgbox Route128_Text_2A28D7, 4 @@ -202,7 +202,7 @@ Route128_EventScript_1F6D09:: @ 81F6D09 Route128_EventScript_1F6D20:: @ 81F6D20 trainerbattle 2, TRAINER_KATELYN_1, 0, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D6B msgbox Route128_Text_2A2AB7, 4 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 31182439b..14f155cee 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -52,7 +52,7 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 waitmovement 0 msgbox RustboroCity_Text_1E22A5, 4 closemessage - setflag FLAG_0x12F + setflag FLAG_HAS_MATCH_CALL applymovement 15, RustboroCity_Movement_2725A4 waitmovement 0 playse SE_TK_KASYA diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index dec6a8e73..dde0cc6a6 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -3,7 +3,7 @@ RustboroCity_Gym_MapScripts:: @ 8212F30 RustboroCity_Gym_EventScript_212F31:: @ 8212F31 trainerbattle 1, TRAINER_ROXANNE_1, 0, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq RustboroCity_Gym_EventScript_212FC8 checkflag FLAG_0x0A5 diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index d5a4e477c..7d7e575fc 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -53,7 +53,7 @@ SkyPillar_Top_EventScript_239722:: @ 8239722 waitmoncry setwildbattle SPECIES_RAYQUAZA, 70, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index e28d8d13f..8b6a5754e 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -87,7 +87,7 @@ SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42 SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 trainerbattle 1, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82 - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq SootopolisCity_Gym_1F_EventScript_225025 checkflag FLAG_0x0AC diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 1853c08b8..aa19dc5fb 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -87,7 +87,7 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 compare_var_to_value VAR_0x40D5, 0 call_if 5, SouthernIsland_Interior_EventScript_242BB7 setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B08EC + special BattleSetup_StartLatiBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 diff --git a/data/scripts/maps/TerraCave_End.inc b/data/scripts/maps/TerraCave_End.inc index a39856dda..f3168036f 100644 --- a/data/scripts/maps/TerraCave_End.inc +++ b/data/scripts/maps/TerraCave_End.inc @@ -38,7 +38,7 @@ TerraCave_End_EventScript_23B0EC:: @ 823B0EC setvar VAR_LAST_TALKED, 1 setwildbattle SPECIES_GROUDON, 70, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE setvar VAR_0x4001, 0 diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 8bc22aa3d..94ecc0946 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -83,7 +83,7 @@ VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C VictoryRoad_1F_EventScript_235E35:: @ 8235E35 trainerbattle 0, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA - specialvar VAR_RESULT, sub_80B226C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_eq VictoryRoad_1F_EventScript_235E5C msgbox VictoryRoad_1F_Text_2360FE, 6 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 85952d9f0..184a00a0d 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -114,7 +114,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29283F:: @ 829283F LittlerootTown_BrendansHouse_2F_EventScript_292849:: @ 8292849 fadescreen 1 - special Special_StartWallClock + special StartWallClock waitstate return @@ -318,7 +318,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F compare_var_to_value VAR_0x408C, 4 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A19 checkflag FLAG_0x052 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A86 |