diff options
Diffstat (limited to 'data')
20 files changed, 135 insertions, 135 deletions
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index a376bfe22..9ef9a2812 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -133,7 +133,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255DF4:: @ 8255DF4 lock faceplayer setvar VAR_FRONTIER_FACILITY, 3 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 special SavePlayerParty msgbox BattleFrontier_BattleArenaLobby_Text_256166, 4 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index e853afda0..3d5704dba 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 setvar VAR_0x8004, 10 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 @@ -72,7 +72,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61 BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 setvar VAR_0x8004, 4 - special sub_818E9AC + special CallBattleDomeFunction msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C990, 4 closemessage applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77B @@ -84,7 +84,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 msgbox 0x2021fc4, 4 closemessage setvar VAR_0x8004, 5 - special sub_818E9AC + special CallBattleDomeFunction call BattleFrontier_BattleDomeBattleRoom_EventScript_24C440 setvar VAR_TEMP_2, 0 switch VAR_RESULT @@ -109,7 +109,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7 compare VAR_TEMP_2, 2 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F setvar VAR_0x8004, 19 - special sub_818E9AC + special CallBattleDomeFunction switch VAR_RESULT case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0 @@ -117,7 +117,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 waitmovement 0 setvar VAR_0x8004, 4 - special sub_818E9AC + special CallBattleDomeFunction compare VAR_TEMP_2, 0 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1 compare VAR_TEMP_2, 1 @@ -131,7 +131,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D:: @ 824BE8D setvar VAR_0x8004, 12 setvar VAR_0x8005, 2 - special sub_818E9AC + special CallBattleDomeFunction BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A:: @ 824BE9A setvar VAR_0x8004, 2 @@ -173,10 +173,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E delay 60 setvar VAR_0x8004, 3 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 12 setvar VAR_0x8005, 1 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 @@ -227,17 +227,17 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC:: @ 824BFCC BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5 setvar VAR_0x8004, 1 setvar VAR_0x8005, 6 - special sub_818E9AC + special CallBattleDomeFunction compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 - special sub_818E9AC + special CallBattleDomeFunction compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - special sub_818E9AC + special CallBattleDomeFunction compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9 @@ -446,7 +446,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4 setvar VAR_0x8004, 12 setvar VAR_0x8005, 1 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 12 special sub_81A1780 compare VAR_RESULT, 0 @@ -485,7 +485,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4 setvar VAR_0x8004, 12 setvar VAR_0x8005, 1 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 12 special sub_81A1780 compare VAR_RESULT, 2 @@ -536,10 +536,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440 waitstate setvar VAR_TEMP_9, 0 setvar VAR_0x8004, 17 - special sub_818E9AC + special CallBattleDomeFunction special HealPlayerParty setvar VAR_0x8004, 16 - special sub_818E9AC + special CallBattleDomeFunction return BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481: @ 824C481 @@ -950,7 +950,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E:: @ 824C82E BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5:: @ 824C8F5 BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5:: @ 824C8F5 - copyvar VAR_RESULT, VAR_0x40CE + copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 1e50357bc..6a879df16 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -6,7 +6,7 @@ BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2 BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2 setvar VAR_0x8004, 21 - special sub_818E9AC + special CallBattleDomeFunction end BattleFrontier_BattleDomeLobby_MapScript2_2497FB: @ 82497FB @@ -39,15 +39,15 @@ BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 @@ -85,15 +85,15 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9 setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 setvar VAR_0x8006, 1 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 1 - special sub_818E9AC + special CallBattleDomeFunction special LoadPlayerParty special HealPlayerParty goto BattleFrontier_BattleDomeLobby_EventScript_249991 @@ -112,18 +112,18 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 - special sub_818E9AC + special CallBattleDomeFunction special LoadPlayerParty special HealPlayerParty BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991 setvar VAR_0x8004, 13 setvar VAR_0x8005, 0 - special sub_818E9AC + special CallBattleDomeFunction playse SE_SAVE waitse call BattleFrontier_BattleDomeLobby_EventScript_23E8E0 @@ -154,7 +154,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9 waitmessage setvar VAR_0x8004, 13 setvar VAR_0x8005, 1 - special sub_818E9AC + special CallBattleDomeFunction playse SE_SAVE waitse setvar VAR_0x8004, 2 @@ -168,7 +168,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249A35:: @ 8249A35 lock faceplayer setvar VAR_FRONTIER_FACILITY, 1 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 goto BattleFrontier_BattleDomeLobby_EventScript_249A59 end @@ -176,21 +176,21 @@ BattleFrontier_BattleDomeLobby_EventScript_249A47:: @ 8249A47 lock faceplayer setvar VAR_FRONTIER_FACILITY, 1 - setvar VAR_0x40CE, 1 + setvar VAR_FRONTIER_BATTLE_MODE, 1 goto BattleFrontier_BattleDomeLobby_EventScript_249A59 end BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59 special SavePlayerParty - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CFD - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D06 BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D0F - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D15 waitmessage multichoice 17, 6, 23, 0 @@ -236,7 +236,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 setvar VAR_0x8005, 4 special sub_81A1780 setvar VAR_0x8004, 0 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 @@ -253,7 +253,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A setvar VAR_0x8004, 22 - special sub_818E9AC + special CallBattleDomeFunction BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 special SavePlayerParty @@ -261,7 +261,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 setvar VAR_0x8005, 3 special sub_81A1780 setvar VAR_0x8004, 15 - special sub_818E9AC + special CallBattleDomeFunction msgbox BattleFrontier_BattleDomeLobby_Text_24A437, 4 closemessage call BattleFrontier_BattleDomeLobby_EventScript_249C6E @@ -272,9 +272,9 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 end BattleFrontier_BattleDomeLobby_EventScript_249BFA:: @ 8249BFA - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D1B - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D24 goto BattleFrontier_BattleDomeLobby_EventScript_249A72 @@ -309,26 +309,26 @@ BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C end BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CDD - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CE5 applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D45 waitmovement 0 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D2D - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D33 waitdooranim - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CED - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CF5 applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D4E waitmovement 0 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D39 - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D3F waitdooranim return @@ -433,7 +433,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84 setvar VAR_0x8004, 1 setvar VAR_0x8005, 9 - special sub_818E9AC + special CallBattleDomeFunction compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DC9 compare VAR_RESULT, 1 @@ -444,7 +444,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DE4 fadescreen 1 setvar VAR_0x8004, 8 - special sub_818E9AC + special CallBattleDomeFunction waitstate end @@ -466,7 +466,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249DE4:: @ 8249DE4 BattleFrontier_BattleDomeLobby_EventScript_249DED:: @ 8249DED setvar VAR_0x8004, 20 - special sub_818E9AC + special CallBattleDomeFunction msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, 2 end diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 024162cee..e004eafac 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -87,7 +87,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377:: @ 824B377 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9:: @ 824B3A9 setvar VAR_0x8004, 12 setvar VAR_0x8005, 9 - special sub_818E9AC + special CallBattleDomeFunction goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB @@ -95,7 +95,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB waitmessage setvar VAR_0x8004, 13 setvar VAR_0x8005, 2 - special sub_818E9AC + special CallBattleDomeFunction playse SE_SAVE waitse fadescreen 1 @@ -107,7 +107,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, 4 fadescreen 1 setvar VAR_0x8004, 6 - special sub_818E9AC + special CallBattleDomeFunction waitstate goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F @@ -115,7 +115,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5 call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A fadescreen 1 setvar VAR_0x8004, 7 - special sub_818E9AC + special CallBattleDomeFunction waitstate goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F @@ -162,11 +162,11 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F setvar VAR_0x8004, 2 setvar VAR_0x8005, 8 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 18 - special sub_818E9AC + special CallBattleDomeFunction setvar VAR_0x8004, 9 - special sub_818E9AC + special CallBattleDomeFunction msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, 4 closemessage applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F @@ -253,7 +253,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600 fadescreen 1 setvar VAR_0x8004, 11 - special sub_818E9AC + special CallBattleDomeFunction waitstate goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 5b6a674fb..2968e2c0f 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -291,7 +291,7 @@ BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B: @ 825B18B BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190:: @ 825B190 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190:: @ 825B190 - copyvar VAR_RESULT, VAR_0x40CE + copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index ec2483390..7846da874 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -143,27 +143,27 @@ BattleFrontier_BattleFactoryLobby_EventScript_2585CB:: @ 82585CB lock faceplayer setvar VAR_FRONTIER_FACILITY, 4 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 goto BattleFrontier_BattleFactoryLobby_EventScript_2585ED end BattleFrontier_BattleFactoryLobby_EventScript_2585DD:: @ 82585DD setvar VAR_FRONTIER_FACILITY, 4 - setvar VAR_0x40CE, 1 + setvar VAR_FRONTIER_BATTLE_MODE, 1 goto BattleFrontier_BattleFactoryLobby_EventScript_2585ED end BattleFrontier_BattleFactoryLobby_EventScript_2585ED:: @ 82585ED special SavePlayerParty - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587B1 - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587BA BattleFrontier_BattleFactoryLobby_EventScript_258606:: @ 8258606 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C3 - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C9 waitmessage multichoice 17, 6, 23, 0 @@ -218,9 +218,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A special SavePlayerParty msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, 4 closemessage - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_25875C - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_258762 applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7 applymovement 255, BattleFrontier_BattleFactoryLobby_Movement_2587AC @@ -239,9 +239,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_258762:: @ 8258762 return BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587CF - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587D8 goto BattleFrontier_BattleFactoryLobby_EventScript_258606 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 2ae154927..372b5da76 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -459,7 +459,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB6: @ 824FEB6 step_end BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB - copyvar VAR_RESULT, VAR_0x40CE + copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5 warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 91c1abd0f..b86ffa2fb 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -134,7 +134,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D944:: @ 824D944 lock faceplayer setvar VAR_FRONTIER_FACILITY, 2 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 goto BattleFrontier_BattlePalaceLobby_EventScript_24D968 end @@ -142,7 +142,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D956:: @ 824D956 lock faceplayer setvar VAR_FRONTIER_FACILITY, 2 - setvar VAR_0x40CE, 1 + setvar VAR_FRONTIER_BATTLE_MODE, 1 goto BattleFrontier_BattlePalaceLobby_EventScript_24D968 end @@ -153,15 +153,15 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968 compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceLobby_EventScript_24D817 special SavePlayerParty - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB9E - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBA7 BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB0 - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB6 waitmessage multichoice 17, 6, 23, 0 @@ -242,7 +242,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 end BattleFrontier_BattlePalaceLobby_EventScript_24DB20:: @ 824DB20 - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38 msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, 4 goto BattleFrontier_BattlePalaceLobby_EventScript_24D999 @@ -298,24 +298,24 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DBB6:: @ 824DBB6 return BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC23 - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC29 applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC47 applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC47 waitmovement 0 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC2F - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC35 waitdooranim applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC49 applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC4C waitmovement 0 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC3B - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC41 waitdooranim return diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index 5323c4a6b..0b356792f 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -126,7 +126,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B868:: @ 825B868 lock faceplayer setvar VAR_FRONTIER_FACILITY, 5 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 special SavePlayerParty msgbox BattleFrontier_BattlePikeLobby_Text_25BB52, 4 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 07b9fee47..ccc7b1032 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -130,7 +130,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2508B1:: @ 82508B1 lock faceplayer setvar VAR_FRONTIER_FACILITY, 6 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 special SavePlayerParty msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, 4 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index f684e215d..d687f83dd 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -366,7 +366,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E setvar VAR_0x8005, 0 special sub_8163AC4 waitstate - copyvar VAR_0x8004, VAR_0x40CE + copyvar VAR_0x8004, VAR_FRONTIER_BATTLE_MODE compare VAR_0x8004, 3 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A setvar VAR_0x8004, 18 @@ -484,7 +484,7 @@ BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2 BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8 BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8:: @ 82421B8 - copyvar VAR_RESULT, VAR_0x40CE + copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8 compare VAR_RESULT, 2 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index d1b07451c..556d4499a 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -5,9 +5,9 @@ BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8 .byte 0 BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8 - compare VAR_0x40CE, 2 + compare VAR_FRONTIER_BATTLE_MODE, 2 call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F end @@ -70,7 +70,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4 applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528 applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E waitmovement 0 - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 @@ -142,7 +142,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 waitmovement 0 - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118 msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, 4 goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121 @@ -157,7 +157,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121 setvar VAR_0x8004, 3 setvar VAR_0x8005, 2 special sub_81A1780 - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514 playfanfare MUS_ME_ASA waitfanfare @@ -168,7 +168,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143 setvar VAR_0x8005, 2 special sub_81A1780 call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0 compare VAR_RESULT, 1 @@ -256,7 +256,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB end BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E copyvar VAR_TEMP_F, VAR_RESULT switch VAR_TEMP_F diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc index 36cf93ada..d28fa105d 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -5,9 +5,9 @@ BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A .byte 0 BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A - compare VAR_0x40CE, 2 + compare VAR_FRONTIER_BATTLE_MODE, 2 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D71 - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D91 end @@ -87,13 +87,13 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC end BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E - compare VAR_0x40CE, 2 + compare VAR_FRONTIER_BATTLE_MODE, 2 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EA8 - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EB2 return diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc index 072d27137..968d45772 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc @@ -24,13 +24,13 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0 end BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55 - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55 - compare VAR_0x40CE, 2 + compare VAR_FRONTIER_BATTLE_MODE, 2 call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A5F - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A72 return diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 1cd2ff74a..2b07b7ea4 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -119,7 +119,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2 end BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2 - compare VAR_0x40CE, 2 + compare VAR_FRONTIER_BATTLE_MODE, 2 goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E81E checkflag FLAG_0x152 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E81E @@ -214,7 +214,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8E0:: @ 823E8E0 BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE lock faceplayer - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23E930 message BattleFrontier_BattleTowerLobby_Text_23F737 waitmessage @@ -254,7 +254,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E948:: @ 823E948 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 message BattleFrontier_BattleTowerLobby_Text_23FD3B waitmessage multichoice 17, 6, 24, 0 @@ -334,7 +334,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAB1:: @ 823EAB1 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED - setvar VAR_0x40CE, 1 + setvar VAR_FRONTIER_BATTLE_MODE, 1 message BattleFrontier_BattleTowerLobby_Text_23FD3B waitmessage multichoice 17, 6, 24, 0 @@ -415,7 +415,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC1D:: @ 823EC1D case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 - setvar VAR_0x40CE, 2 + setvar VAR_FRONTIER_BATTLE_MODE, 2 message BattleFrontier_BattleTowerLobby_Text_23FD3B waitmessage multichoice 17, 6, 24, 0 @@ -495,7 +495,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ED86:: @ 823ED86 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 - setvar VAR_0x40CE, 3 + setvar VAR_FRONTIER_BATTLE_MODE, 3 message BattleFrontier_BattleTowerLobby_Text_23FD3B waitmessage multichoice 17, 6, 24, 0 @@ -679,7 +679,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F02B:: @ 823F02B case 1, BattleFrontier_BattleTowerLobby_EventScript_23F08B BattleFrontier_BattleTowerLobby_EventScript_23F046:: @ 823F046 - switch VAR_0x40CE + switch VAR_FRONTIER_BATTLE_MODE case 0, BattleFrontier_BattleTowerLobby_EventScript_23F06F case 1, BattleFrontier_BattleTowerLobby_EventScript_23F07D msgbox BattleFrontier_BattleTowerLobby_Text_24038B, 4 @@ -697,7 +697,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F07D:: @ 823F07D end BattleFrontier_BattleTowerLobby_EventScript_23F08B:: @ 823F08B - switch VAR_0x40CE + switch VAR_FRONTIER_BATTLE_MODE case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0B4 case 1, BattleFrontier_BattleTowerLobby_EventScript_23F0C2 msgbox BattleFrontier_BattleTowerLobby_Text_24046B, 4 @@ -754,7 +754,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 BattleFrontier_BattleTowerLobby_EventScript_23F135:: @ 823F135 call BattleFrontier_BattleTowerLobby_EventScript_23F1A7 - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F152 msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, 4 goto BattleFrontier_BattleTowerLobby_EventScript_23F15B @@ -807,13 +807,13 @@ BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0 step_end BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D4 - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D9 - compare VAR_0x40CE, 2 + compare VAR_FRONTIER_BATTLE_MODE, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1DE - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1E3 return @@ -834,13 +834,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F1E3:: @ 823F1E3 return BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F215 - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F21B - compare VAR_0x40CE, 2 + compare VAR_FRONTIER_BATTLE_MODE, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F221 - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F227 return @@ -861,13 +861,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F227:: @ 823F227 return BattleFrontier_BattleTowerLobby_EventScript_23F22D:: @ 823F22D - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F25A - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F260 - compare VAR_0x40CE, 2 + compare VAR_FRONTIER_BATTLE_MODE, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F266 - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F26C return @@ -888,13 +888,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F26C:: @ 823F26C return BattleFrontier_BattleTowerLobby_EventScript_23F272:: @ 823F272 - compare VAR_0x40CE, 0 + compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F29F - compare VAR_0x40CE, 1 + compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2A5 - compare VAR_0x40CE, 2 + compare VAR_FRONTIER_BATTLE_MODE, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2AB - compare VAR_0x40CE, 3 + compare VAR_FRONTIER_BATTLE_MODE, 3 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2B1 return diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index 5be72b9b5..da73da354 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -110,7 +110,7 @@ BattleFrontier_ScottsHouse_EventScript_263811:: @ 8263811 end BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 @@ -153,7 +153,7 @@ BattleFrontier_ScottsHouse_EventScript_2638AA:: @ 82638AA end BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 00efa5394..daf76cba2 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -149,7 +149,7 @@ FallarborTown_BattleTentLobby_EventScript_200021:: @ 8200021 FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D setvar VAR_FRONTIER_FACILITY, 3 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 setvar VAR_RESULT, 2 setvar VAR_0x8004, 15 special sub_81A1780 diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index fc66d7387..76b12e31e 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -137,7 +137,7 @@ SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906 setvar VAR_FRONTIER_FACILITY, 4 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index 26f0680a0..a4cfc20c2 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -150,7 +150,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201893:: @ 8201893 VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF setvar VAR_FRONTIER_FACILITY, 2 - setvar VAR_0x40CE, 0 + setvar VAR_FRONTIER_BATTLE_MODE, 0 setvar VAR_RESULT, 2 setvar VAR_0x8004, 15 special sub_81A1780 diff --git a/data/specials.inc b/data/specials.inc index 9cc3d41ea..5d31c425f 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -244,7 +244,7 @@ gSpecials:: @ 81DBA64 def_special GetLeadMonFriendshipScore def_special sub_81A1780 def_special sub_8161F74 - def_special sub_818E9AC + def_special CallBattleDomeFunction def_special sub_8195960 def_special sub_8165360 def_special sub_8163AC4 |