diff options
43 files changed, 480 insertions, 445 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index f895783d6..9dfc8c891 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -18,6 +18,7 @@ #include "constants/field_specials.h" #include "constants/field_tasks.h" #include "constants/flags.h" +#include "constants/frontier_util.h" #include "constants/game_stat.h" #include "constants/item.h" #include "constants/items.h" diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 5f6e78a35..f3f156a39 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -10,7 +10,7 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C end BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0 - setvar VAR_0x8004, 5 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS special CallFrontierUtilFunc call BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE end @@ -40,7 +40,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC showobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE2 waitmovement 0 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 @@ -48,7 +48,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08 applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB setvar VAR_TEMP_2, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special CallFrontierUtilFunc @@ -109,7 +109,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB:: @ 82575DB msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CCE, MSGBOX_DEFAULT BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special CallFrontierUtilFunc @@ -118,11 +118,11 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615 BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -138,20 +138,20 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CE9, MSGBOX_DEFAULT special LoadPlayerParty special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY + setvar VAR_0x8005, FRONTIER_PARTY_SIZE special CallFrontierUtilFunc playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0 - setvar VAR_0x8004, 9 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 @@ -224,7 +224,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25783A:: @ 825783A BattleFrontier_BattleArenaBattleRoom_EventScript_257852:: @ 8257852 delay 60 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special CallFrontierUtilFunc @@ -270,7 +270,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A playse SE_SAVE waitse fadescreen 1 - setvar VAR_0x8004, 4 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET special CallFrontierUtilFunc end @@ -330,14 +330,14 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5 case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F case 4, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30 @@ -357,7 +357,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 - setvar VAR_0x8004, 12 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257852 @@ -368,20 +368,20 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C message BattleFrontier_BattleArenaBattleRoom_Text_25819C waitmessage waitfanfare - setvar VAR_0x8004, 13 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL special CallFrontierUtilFunc msgbox BattleFrontier_BattleArenaBattleRoom_Text_2581CF, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852 BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30 @@ -401,7 +401,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8 BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15 call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 - setvar VAR_0x8004, 12 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852 @@ -412,7 +412,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15 message BattleFrontier_BattleArenaBattleRoom_Text_25835B waitmessage waitfanfare - setvar VAR_0x8004, 13 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL special CallFrontierUtilFunc msgbox BattleFrontier_BattleArenaBattleRoom_Text_258383, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852 @@ -426,7 +426,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C:: @ 8257B6C FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C closemessage setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -435,10 +435,10 @@ FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C setvar VAR_0x8005, 0 special DoSpecialTrainerBattle waitstate - setvar VAR_0x8004, 18 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_18 special CallFrontierUtilFunc special HealPlayerParty - setvar VAR_0x8004, 21 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21 special CallFrontierUtilFunc return diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 00feed9c9..d5b79b684 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -21,7 +21,7 @@ BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55 .2byte 0 BattleFrontier_BattleArenaLobby_EventScript_255C7F:: @ 8255C7F - setvar VAR_0x8004, 0 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 special CallFrontierUtilFunc end @@ -37,7 +37,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 special CallBattleArenaFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -47,9 +47,9 @@ BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88 BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF lockall - setvar VAR_0x8004, 10 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN special CallFrontierUtilFunc - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0 msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_255CF8 @@ -59,7 +59,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255CF0:: @ 8255CF0 BattleFrontier_BattleArenaLobby_EventScript_255CF8:: @ 8255CF8 msgbox BattleFrontier_BattleArenaLobby_Text_257353, MSGBOX_DEFAULT - setvar VAR_0x8004, 11 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11 special CallFrontierUtilFunc msgbox BattleFrontier_BattleArenaLobby_Text_241520, 9 message BattleFrontier_BattleArenaLobby_Text_256931 @@ -87,7 +87,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255D2B:: @ 8255D2B end BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59 - setvar VAR_0x8004, 8 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8 special CallFrontierUtilFunc special LoadPlayerParty special HealPlayerParty @@ -122,7 +122,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255DC0:: @ 8255DC0 special CallBattleArenaFunction playse SE_SAVE waitse - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -154,11 +154,11 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 switch VAR_RESULT case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_255FFB - setvar VAR_0x8004, 15 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15 special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -179,7 +179,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, 0 @@ -188,11 +188,11 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special CallBattleArenaFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -206,12 +206,12 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY + setvar VAR_0x8005, FRONTIER_PARTY_SIZE special CallFrontierUtilFunc msgbox BattleFrontier_BattleArenaLobby_Text_2567E6, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 1 special CallFrontierUtilFunc compare VAR_RESULT, 0 @@ -241,7 +241,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255FD4:: @ 8255FD4 goto BattleFrontier_BattleArenaLobby_EventScript_256003 BattleFrontier_BattleArenaLobby_EventScript_255FE1:: @ 8255FE1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -344,7 +344,7 @@ BattleFrontier_BattleArenaLobby_Movement_256088: @ 8256088 BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092 lockall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW setvar VAR_0x8005, 3 special CallFrontierUtilFunc waitbuttonpress diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 5ef17d381..60bca60cd 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 setvar VAR_0x8004, 10 special CallBattleDomeFunction - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT @@ -134,7 +134,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D:: @ 824BE8D special CallBattleDomeFunction BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A:: @ 824BE9A - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special CallFrontierUtilFunc @@ -142,7 +142,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A:: @ 824BE9A @ goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5 BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1:: @ 824BEB1 - setvar VAR_0x8004, 20 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME setvar VAR_0x8005, 1 special CallFrontierUtilFunc message BattleFrontier_BattleDomeBattleRoom_Text_24C9E1 @@ -150,7 +150,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1:: @ 824BEB1 return BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5:: @ 824BEC5 - setvar VAR_0x8004, 20 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME setvar VAR_0x8005, 0 special CallFrontierUtilFunc message BattleFrontier_BattleDomeBattleRoom_Text_24CB34 @@ -177,11 +177,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 setvar VAR_0x8004, 12 setvar VAR_0x8005, 1 special CallBattleDomeFunction - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -194,7 +194,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62:: @ 824BF62 applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77D waitmovement 0 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 1 special CallFrontierUtilFunc switch VAR_RESULT @@ -210,7 +210,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E:: @ 824BF9E playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E delay 60 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special CallFrontierUtilFunc @@ -377,7 +377,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C1B6:: @ 824C1B6 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD:: @ 824C1BD - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc return @@ -426,13 +426,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211 case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C346 case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, MSGBOX_DEFAULT - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc @@ -444,10 +444,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT - setvar VAR_0x8004, 12 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS setvar VAR_0x8005, 1 special CallBattleDomeFunction - setvar VAR_0x8004, 12 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 @@ -459,19 +459,19 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 message BattleFrontier_BattleDomeBattleRoom_Text_24D1AA waitmessage waitfanfare - setvar VAR_0x8004, 13 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL special CallFrontierUtilFunc msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D1E0, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, MSGBOX_DEFAULT - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc @@ -486,7 +486,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 setvar VAR_0x8004, 12 setvar VAR_0x8005, 1 special CallBattleDomeFunction - setvar VAR_0x8004, 12 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 @@ -498,7 +498,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 message BattleFrontier_BattleDomeBattleRoom_Text_24D522 waitmessage waitfanfare - setvar VAR_0x8004, 13 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL special CallFrontierUtilFunc msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D54D, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 @@ -524,7 +524,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C436:: @ 824C436 goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7 BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -552,12 +552,12 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC setvar VAR_TEMP_1, 1 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_24C773 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 3 goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF - setvar VAR_0x8004, 9 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 special CallFrontierUtilFunc copyvar VAR_TEMP_E, VAR_RESULT compare VAR_RESULT, 0 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc index c777f7a7a..deea13c83 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104 BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E delay 16 setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 1 special CallFrontierUtilFunc compare VAR_RESULT, 1 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index ea62948c6..5699d268c 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -28,7 +28,7 @@ BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F .2byte 0 BattleFrontier_BattleDomeLobby_EventScript_249839:: @ 8249839 - setvar VAR_0x8004, 0 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 special CallFrontierUtilFunc end @@ -48,7 +48,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special CallBattleDomeFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -59,9 +59,9 @@ BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842 BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B call BattleFrontier_BattleDomeLobby_EventScript_241EBA lockall - setvar VAR_0x8004, 10 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN special CallFrontierUtilFunc - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1 msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_2498C9 @@ -71,16 +71,16 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C1:: @ 82498C1 BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9 msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, MSGBOX_DEFAULT - setvar VAR_0x8004, 11 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11 special CallFrontierUtilFunc msgbox BattleFrontier_BattleDomeLobby_Text_241520, 9 message BattleFrontier_BattleDomeLobby_Text_24A5D6 waitmessage special LoadPlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY + setvar VAR_0x8005, FRONTIER_PARTY_SIZE special CallFrontierUtilFunc - setvar VAR_0x8004, 8 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8 special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 @@ -104,10 +104,10 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940 message BattleFrontier_BattleDomeLobby_Text_24A5D6 waitmessage special LoadPlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY + setvar VAR_0x8005, FRONTIER_PARTY_SIZE special CallFrontierUtilFunc - setvar VAR_0x8004, 8 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8 special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -157,7 +157,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9 special CallBattleDomeFunction playse SE_SAVE waitse - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -207,11 +207,11 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF switch VAR_RESULT case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64 case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_249C64 - setvar VAR_0x8004, 15 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15 special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C15 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -232,16 +232,16 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, 0 special CallBattleDomeFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -257,8 +257,8 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY + setvar VAR_0x8005, FRONTIER_PARTY_SIZE special CallFrontierUtilFunc setvar VAR_0x8004, 15 special CallBattleDomeFunction @@ -292,7 +292,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249C3D:: @ 8249C3D goto BattleFrontier_BattleDomeLobby_EventScript_249C6C BattleFrontier_BattleDomeLobby_EventScript_249C4A:: @ 8249C4A - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -410,7 +410,7 @@ BattleFrontier_BattleDomeLobby_Movement_249D4E: @ 8249D4E BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52 lockall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -421,7 +421,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52 BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B lockall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW setvar VAR_0x8005, 1 setvar VAR_0x8006, 1 special CallFrontierUtilFunc diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index bd3add50c..8987f3e07 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -19,7 +19,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222 compare VAR_0x8006, 1 goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special CallFrontierUtilFunc @@ -99,7 +99,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB playse SE_SAVE waitse fadescreen 1 - setvar VAR_0x8004, 4 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET special CallFrontierUtilFunc end @@ -120,7 +120,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5 goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A:: @ 824B40A - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc switch VAR_RESULT @@ -156,7 +156,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D setvar VAR_0x8005, 2 special sub_80F9490 waitstate - setvar VAR_0x8004, 21 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F @@ -185,7 +185,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D end BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB:: @ 824B4FB - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc switch VAR_RESULT @@ -208,7 +208,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B546:: @ 824B546 return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C - setvar VAR_0x8004, 9 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 special CallFrontierUtilFunc switch VAR_RESULT case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B @@ -242,8 +242,8 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 setvar VAR_TEMP_0, 1 msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B760, MSGBOX_DEFAULT special LoadPlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY + setvar VAR_0x8005, FRONTIER_PARTY_SIZE special CallFrontierUtilFunc playfanfare MUS_ME_ASA waitfanfare @@ -256,7 +256,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600:: @ 824B600 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc switch VAR_RESULT diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 68e6194cf..a6e02f443 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -5,14 +5,14 @@ BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB .byte 0 BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB - setvar VAR_0x8004, 5 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS special CallFrontierUtilFunc checkplayergender compare VAR_RESULT, MALE call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25 compare VAR_RESULT, FEMALE call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B - setvar VAR_0x8004, 9 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 @@ -85,7 +85,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 msgbox gStringVar4, MSGBOX_DEFAULT waitmessage closemessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -99,7 +99,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8:: @ 825AEF8 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8:: @ 825AEF8 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special CallFrontierUtilFunc @@ -122,11 +122,11 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E:: @ 825AF3E call BattleFrontier_BattleFactoryBattleRoom_EventScript_241EBA BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -137,7 +137,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43 waitstate BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85:: @ 825AF85 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special CallFrontierUtilFunc @@ -148,13 +148,13 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C case 2, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051 case 3, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF case 4, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, MSGBOX_DEFAULT - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc @@ -166,7 +166,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C - setvar VAR_0x8004, 12 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 @@ -178,19 +178,19 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C message BattleFrontier_BattleFactoryBattleRoom_Text_25B460 waitmessage waitfanfare - setvar VAR_0x8004, 13 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL special CallFrontierUtilFunc msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, MSGBOX_DEFAULT - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc @@ -202,7 +202,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B - setvar VAR_0x8004, 12 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 @@ -214,14 +214,14 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B message BattleFrontier_BattleFactoryBattleRoom_Text_25B640 waitmessage waitfanfare - setvar VAR_0x8004, 13 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL special CallFrontierUtilFunc msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0 closemessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -253,7 +253,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallBattleFactoryFunction - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc addvar VAR_RESULT, 1 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index 54ecb435c..7894dc558 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -21,7 +21,7 @@ BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407 .2byte 0 BattleFrontier_BattleFactoryLobby_EventScript_258431:: @ 8258431 - setvar VAR_0x8004, 0 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 special CallFrontierUtilFunc end @@ -43,7 +43,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 special CallBattleFactoryFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -53,9 +53,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A BattleFrontier_BattleFactoryLobby_EventScript_25849B:: @ 825849B lockall - setvar VAR_0x8004, 10 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN special CallFrontierUtilFunc - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, MSGBOX_DEFAULT waitmessage @@ -67,12 +67,12 @@ BattleFrontier_BattleFactoryLobby_EventScript_2584BD:: @ 82584BD BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6 msgbox BattleFrontier_BattleFactoryLobby_Text_2592BD, MSGBOX_DEFAULT - setvar VAR_0x8004, 11 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11 special CallFrontierUtilFunc msgbox BattleFrontier_BattleFactoryLobby_Text_241520, 9 message BattleFrontier_BattleFactoryLobby_Text_259323 waitmessage - setvar VAR_0x8004, 8 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8 special CallFrontierUtilFunc special LoadPlayerParty setvar VAR_0x8004, 3 @@ -87,7 +87,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506 lockall message BattleFrontier_BattleFactoryLobby_Text_258CC7 waitmessage - setvar VAR_0x8004, 8 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8 special CallFrontierUtilFunc special LoadPlayerParty setvar VAR_0x8004, 2 @@ -131,7 +131,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258592:: @ 8258592 special CallBattleFactoryFunction playse SE_SAVE waitse - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -180,7 +180,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653 switch VAR_RESULT case 2, BattleFrontier_BattleFactoryLobby_EventScript_25879D case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_25879D - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -194,7 +194,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 0 special CallBattleFactoryFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc @@ -202,7 +202,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special CallBattleFactoryFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -246,7 +246,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768 goto BattleFrontier_BattleFactoryLobby_EventScript_258606 BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -300,7 +300,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587D8:: @ 82587D8 BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1 lockall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW setvar VAR_0x8005, 4 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -311,7 +311,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1 BattleFrontier_BattleFactoryLobby_EventScript_2587FA:: @ 82587FA lockall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW setvar VAR_0x8005, 4 setvar VAR_0x8006, 1 special CallFrontierUtilFunc diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index ced2a5f13..97365a46e 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -73,7 +73,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty - setvar VAR_0x8004, 9 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26 @@ -94,13 +94,13 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 end BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13:: @ 8259C13 - setvar VAR_0x8004, 9 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 @@ -231,7 +231,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47 playse SE_SAVE waitse fadescreen 1 - setvar VAR_0x8004, 4 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET special CallFrontierUtilFunc end @@ -240,7 +240,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69 setvar VAR_0x8004, 10 setvar VAR_0x8005, 0 special CallBattleFactoryFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special CallFrontierUtilFunc diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 766ab149a..a85cac041 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815 .byte 0 BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825 - setvar VAR_0x8004, 5 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS special CallFrontierUtilFunc call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833 end @@ -34,7 +34,7 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 @@ -43,7 +43,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B waitmovement 0 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC setvar VAR_TEMP_2, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special CallFrontierUtilFunc @@ -68,7 +68,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA:: @ 824F8FA - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special CallFrontierUtilFunc @@ -76,11 +76,11 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA:: @ 824F8FA BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911 call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -95,20 +95,20 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_24FF00, MSGBOX_DEFAULT special LoadPlayerParty special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY + setvar VAR_0x8005, FRONTIER_PARTY_SIZE special CallFrontierUtilFunc playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A - setvar VAR_0x8004, 9 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 @@ -178,7 +178,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14:: @ 824FB14 goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28:: @ 824FB28 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special CallFrontierUtilFunc @@ -193,7 +193,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F playse SE_SAVE waitse fadescreen 1 - setvar VAR_0x8004, 4 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET special CallFrontierUtilFunc end @@ -244,13 +244,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA case 4, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, MSGBOX_DEFAULT - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc @@ -264,7 +264,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 setvar VAR_0x8004, 6 special CallBattlePalaceFunction - setvar VAR_0x8004, 12 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 @@ -276,7 +276,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 message BattleFrontier_BattlePalaceBattleRoom_Text_2503DC waitmessage waitfanfare - setvar VAR_0x8004, 13 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL special CallFrontierUtilFunc applymovement 2, Common_Movement_WalkInPlaceLeft waitmovement 0 @@ -287,13 +287,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, MSGBOX_DEFAULT - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc @@ -307,7 +307,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 setvar VAR_0x8004, 6 special CallBattlePalaceFunction - setvar VAR_0x8004, 12 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 @@ -319,7 +319,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 message BattleFrontier_BattlePalaceBattleRoom_Text_250699 waitmessage waitfanfare - setvar VAR_0x8004, 13 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL special CallFrontierUtilFunc applymovement 2, Common_Movement_WalkInPlaceLeft waitmovement 0 @@ -333,7 +333,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7:: @ 824FDF7 VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7 closemessage setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -342,10 +342,10 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7 setvar VAR_0x8005, 0 special DoSpecialTrainerBattle waitstate - setvar VAR_0x8004, 18 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_18 special CallFrontierUtilFunc special HealPlayerParty - setvar VAR_0x8004, 21 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21 special CallFrontierUtilFunc return diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc index d5219636c..5df680aa8 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc @@ -25,7 +25,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 compare VAR_RESULT, 4 call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF closemessage - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 1 special CallFrontierUtilFunc compare VAR_RESULT, 1 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index fd887e1d9..10a6761cb 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -21,7 +21,7 @@ BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D .2byte 0 BattleFrontier_BattlePalaceLobby_EventScript_24D7C7:: @ 824D7C7 - setvar VAR_0x8004, 0 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 special CallFrontierUtilFunc end @@ -37,7 +37,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 special CallBattlePalaceFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -47,9 +47,9 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0 BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817 lockall - setvar VAR_0x8004, 10 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN special CallFrontierUtilFunc - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838 msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24D840 @@ -59,7 +59,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D838:: @ 824D838 BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840 msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, MSGBOX_DEFAULT - setvar VAR_0x8004, 11 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11 special CallFrontierUtilFunc msgbox BattleFrontier_BattlePalaceLobby_Text_241520, 9 message BattleFrontier_BattlePalaceLobby_Text_24E4F7 @@ -87,7 +87,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873 end BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1 - setvar VAR_0x8004, 8 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8 special CallFrontierUtilFunc special LoadPlayerParty special HealPlayerParty @@ -123,7 +123,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908 special CallBattlePalaceFunction playse SE_SAVE waitse - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -178,11 +178,11 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 switch VAR_RESULT case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 - setvar VAR_0x8004, 15 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15 special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -203,7 +203,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, 0 @@ -212,11 +212,11 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special CallBattlePalaceFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -230,8 +230,8 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY + setvar VAR_0x8005, FRONTIER_PARTY_SIZE special CallFrontierUtilFunc msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, MSGBOX_DEFAULT closemessage @@ -265,7 +265,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DB6D:: @ 824DB6D goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C BattleFrontier_BattlePalaceLobby_EventScript_24DB7A:: @ 824DB7A - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -361,7 +361,7 @@ BattleFrontier_BattlePalaceLobby_Movement_24DC4C: @ 824DC4C BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50 lockall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -372,7 +372,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50 BattleFrontier_BattlePalaceLobby_EventScript_24DC69:: @ 824DC69 lockall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special CallFrontierUtilFunc diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index 44027d7ce..6bfd5b045 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 delay 16 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special CallFrontierUtilFunc @@ -27,7 +27,7 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 releaseall applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80E waitmovement 0 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 99 special CallFrontierUtilFunc diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index 1a87dec82..23df44956 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -20,7 +20,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD end BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707 - setvar VAR_0x8004, 0 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 special CallFrontierUtilFunc end @@ -39,7 +39,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 setvar VAR_0x8005, 4 setvar VAR_0x8006, 0 special CallBattlePikeFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -49,9 +49,9 @@ BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762 lockall - setvar VAR_0x8004, 10 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN special CallFrontierUtilFunc - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25B784 msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, MSGBOX_DEFAULT waitmessage @@ -63,10 +63,10 @@ BattleFrontier_BattlePikeLobby_EventScript_25B784:: @ 825B784 BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, MSGBOX_DEFAULT - setvar VAR_0x8004, 11 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11 special CallFrontierUtilFunc msgbox BattleFrontier_BattlePikeLobby_Text_241520, 9 - setvar VAR_0x8004, 8 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8 special CallFrontierUtilFunc setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA setvar VAR_0x8005, 3 @@ -97,9 +97,9 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806 lockall message BattleFrontier_BattlePikeLobby_Text_25C146 waitmessage - setvar VAR_0x8004, 8 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8 special CallFrontierUtilFunc - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -147,11 +147,11 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB switch VAR_RESULT case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76 case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_25BA76 - setvar VAR_0x8004, 15 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15 special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -173,12 +173,12 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C setvar VAR_TEMP_0, 0 setvar VAR_TEMP_1, 0 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, BATTLE_PIKE_FUNC_INIT_CHALLENGE special CallBattlePikeFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc @@ -188,7 +188,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C special CallBattlePikeFunction setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS special CallBattlePikeFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -202,12 +202,12 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY + setvar VAR_0x8005, FRONTIER_PARTY_SIZE special CallFrontierUtilFunc msgbox BattleFrontier_BattlePikeLobby_Text_25C130, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, 5 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS special CallFrontierUtilFunc call BattleFrontier_BattlePikeLobby_EventScript_25BA94 special HealPlayerParty @@ -235,7 +235,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA4F:: @ 825BA4F goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E BattleFrontier_BattlePikeLobby_EventScript_25BA5C:: @ 825BA5C - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -253,7 +253,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA7E:: @ 825BA7E BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80 lockall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW setvar VAR_0x8005, 5 special CallFrontierUtilFunc waitbuttonpress diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index 565e28d47..deb0a7974 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -42,7 +42,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6 case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A:: @ 825D20A - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special CallFrontierUtilFunc @@ -142,13 +142,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416 case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, MSGBOX_DEFAULT - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc @@ -160,7 +160,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA - setvar VAR_0x8004, 12 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D @@ -170,20 +170,20 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA message BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0 waitmessage waitfanfare - setvar VAR_0x8004, 13 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL special CallFrontierUtilFunc msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, MSGBOX_DEFAULT closemessage goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, MSGBOX_DEFAULT - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc @@ -195,7 +195,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443 goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 - setvar VAR_0x8004, 12 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D @@ -205,7 +205,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 message BattleFrontier_BattlePikeRandomRoom1_Text_25E118 waitmessage waitfanfare - setvar VAR_0x8004, 13 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL special CallFrontierUtilFunc msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, MSGBOX_DEFAULT closemessage diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc index b12ff0d6e..b1a55c33f 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc @@ -11,7 +11,7 @@ BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7 delay 16 applymovement 1, BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB waitmovement 0 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special CallFrontierUtilFunc diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc index a18ccda4c..ff5e3e1db 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc @@ -16,7 +16,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C:: @ 825E43C end BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A:: @ 825E44A - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special CallFrontierUtilFunc @@ -35,7 +35,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470:: @ 825E470 BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A call BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 5 special CallFrontierUtilFunc compare VAR_RESULT, 2 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index cd72a27d1..53a796011 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -22,7 +22,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891 - setvar VAR_0x8004, 0 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 special CallFrontierUtilFunc end @@ -40,28 +40,28 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4 special CallBattlePikeFunction playse SE_SAVE waitse - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY + setvar VAR_0x8005, FRONTIER_PARTY_SIZE special CallFrontierUtilFunc msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA, MSGBOX_DEFAULT closemessage releaseall - setvar VAR_0x8004, 5 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS special CallFrontierUtilFunc - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 99 special CallFrontierUtilFunc end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908:: @ 825C908 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc switch VAR_RESULT @@ -132,7 +132,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8:: @ 825C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD - setvar VAR_0x8004, 6 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_6 special CallFrontierUtilFunc message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08 waitmessage @@ -143,7 +143,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD playse SE_SAVE waitse fadescreen 1 - setvar VAR_0x8004, 4 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET special CallFrontierUtilFunc end diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index ba862ebdf..98d7a22b0 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -40,13 +40,13 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98 BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE special CallBattlePyramidFunction - setvar VAR_0x8004, 0 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 special CallFrontierUtilFunc switch VAR_TEMP_0 case 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D case 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66 case 2, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 5 special CallFrontierUtilFunc compare VAR_RESULT, 4 @@ -61,8 +61,8 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 compare VAR_RESULT, 9 goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 - setvar VAR_0x8004, 14 - setvar VAR_0x8005, 8 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_CHECK_BATTLE_TYPE + setvar VAR_0x8005, BATTLE_TYPE_TRAINER special CallFrontierUtilFunc setvar VAR_TEMP_D, 1 @@ -73,7 +73,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42:: @ 8252B42 BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special CallFrontierUtilFunc @@ -100,14 +100,14 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D setvar VAR_0x8005, 1 special CallBattlePyramidFunction special SavePlayerParty - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS special CallBattlePyramidFunction - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY + setvar VAR_0x8005, FRONTIER_PARTY_SIZE special CallFrontierUtilFunc setvar VAR_TEMP_F, 1 end @@ -126,11 +126,11 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -138,7 +138,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR special CallBattlePyramidFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 4982c152c..4ec807768 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -21,7 +21,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735 .2byte 0 BattleFrontier_BattlePyramidLobby_EventScript_25075F:: @ 825075F - setvar VAR_0x8004, 0 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 special CallFrontierUtilFunc end @@ -40,7 +40,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 special CallBattlePyramidFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -50,9 +50,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768 BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1 lockall - setvar VAR_0x8004, 10 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN special CallFrontierUtilFunc - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2 msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_2507DA @@ -65,7 +65,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA compare VAR_RESULT, TRUE call_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250DDB clearflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG - setvar VAR_0x8004, 8 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8 special CallFrontierUtilFunc special LoadPlayerParty setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS @@ -76,7 +76,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA playse SE_EXPMAX waitse msgbox BattleFrontier_BattlePyramidLobby_Text_252662, MSGBOX_DEFAULT - setvar VAR_0x8004, 11 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11 special CallFrontierUtilFunc msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9 message BattleFrontier_BattlePyramidLobby_Text_251A77 @@ -95,7 +95,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA end BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852 - setvar VAR_0x8004, 8 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8 special CallFrontierUtilFunc special LoadPlayerParty setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS @@ -151,11 +151,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 switch VAR_RESULT case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 - setvar VAR_0x8004, 15 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15 special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -176,7 +176,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_CHALLENGE @@ -185,11 +185,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special CallBattlePyramidFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -207,13 +207,13 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY + setvar VAR_0x8005, FRONTIER_PARTY_SIZE special CallFrontierUtilFunc msgbox BattleFrontier_BattlePyramidLobby_Text_251531, MSGBOX_DEFAULT closemessage call BattleFrontier_BattlePyramidLobby_EventScript_250D56 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -242,7 +242,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A9D:: @ 8250A9D goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC BattleFrontier_BattlePyramidLobby_EventScript_250AAA:: @ 8250AAA - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -424,7 +424,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D39:: @ 8250D39 BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42 lockall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW setvar VAR_0x8005, 6 special CallFrontierUtilFunc waitbuttonpress diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index 8906d4c42..7b777b165 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -28,7 +28,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3 end BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4 - setvar VAR_0x8004, 9 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25510C @@ -36,13 +36,13 @@ BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4 BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C copyvar VAR_TEMP_C, VAR_RESULT - setvar VAR_0x8004, 0 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 special CallFrontierUtilFunc switch VAR_TEMP_0 case 0, BattleFrontier_BattlePyramidTop_EventScript_255193 case 1, BattleFrontier_BattlePyramidTop_EventScript_252B66 case 2, BattleFrontier_BattlePyramidTop_EventScript_255193 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 5 special CallFrontierUtilFunc compare VAR_RESULT, 2 @@ -73,14 +73,14 @@ BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193 setvar VAR_0x8005, 1 special CallBattlePyramidFunction special SavePlayerParty - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS special CallBattlePyramidFunction - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY + setvar VAR_0x8005, FRONTIER_PARTY_SIZE special CallFrontierUtilFunc setvar VAR_TEMP_F, 1 end @@ -107,7 +107,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 closemessage BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special CallFrontierUtilFunc @@ -133,7 +133,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 case 2, BattleFrontier_BattlePyramidTop_EventScript_255335 case 3, BattleFrontier_BattlePyramidTop_EventScript_2552D0 case 4, BattleFrontier_BattlePyramidTop_EventScript_255388 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 @@ -143,7 +143,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 waitmovement 0 msgbox BattleFrontier_BattlePyramidTop_Text_255669, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A @@ -165,7 +165,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA goto BattleFrontier_BattlePyramidTop_EventScript_252B42 BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB - setvar VAR_0x8004, 12 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_25521A @@ -174,13 +174,13 @@ BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB message BattleFrontier_BattlePyramidTop_Text_2558E9 waitmessage waitfanfare - setvar VAR_0x8004, 13 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL special CallFrontierUtilFunc msgbox BattleFrontier_BattlePyramidTop_Text_25591D, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidTop_EventScript_25521A BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 @@ -190,7 +190,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 waitmovement 0 msgbox BattleFrontier_BattlePyramidTop_Text_255951, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A @@ -212,7 +212,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392 goto BattleFrontier_BattlePyramidTop_EventScript_252B42 BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3 - setvar VAR_0x8004, 12 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25521A @@ -221,7 +221,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3 message BattleFrontier_BattlePyramidTop_Text_255B59 waitmessage waitfanfare - setvar VAR_0x8004, 13 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL special CallFrontierUtilFunc msgbox BattleFrontier_BattlePyramidTop_Text_255B82, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidTop_EventScript_25521A diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index 7661b9089..958c92c09 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -20,7 +20,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C setvar VAR_TEMP_0, 1 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242179 waitmovement 0 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 @@ -30,7 +30,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E waitmovement 0 setvar VAR_TEMP_2, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special CallFrontierUtilFunc @@ -53,7 +53,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3 BattleFrontier_BattleTowerBattleRoom_EventScript_241C03:: @ 8241C03 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special CallFrontierUtilFunc @@ -73,7 +73,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242188 waitmovement 0 removeobject 1 - setvar VAR_0x8004, 9 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 special CallFrontierUtilFunc compare VAR_RESULT, 0 call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3 @@ -87,12 +87,12 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F special HealPlayerParty BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F - setvar VAR_0x8004, 9 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44 @@ -153,7 +153,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC goto BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special CallFrontierUtilFunc @@ -173,7 +173,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22 playse SE_SAVE waitse fadescreen 1 - setvar VAR_0x8004, 4 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET special CallFrontierUtilFunc end @@ -223,7 +223,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_241EBA:: @ 8241EBA BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA:: @ 8241EBA BattleFrontier_BattleTowerBattleRoom2_EventScript_241EBA:: @ 8241EBA BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA:: @ 8241EBA - setvar VAR_0x8004, 17 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_17 special CallFrontierUtilFunc return @@ -286,13 +286,13 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_242085 case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_242029 case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_242029 msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, MSGBOX_DEFAULT - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc @@ -305,7 +305,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029 BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA - setvar VAR_0x8004, 12 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 @@ -314,19 +314,19 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 message BattleFrontier_BattleTowerBattleRoom_Text_24270E waitmessage waitfanfare - setvar VAR_0x8004, 13 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL special CallFrontierUtilFunc msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, MSGBOX_DEFAULT - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc @@ -339,7 +339,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2 BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA - setvar VAR_0x8004, 12 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 @@ -348,7 +348,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF message BattleFrontier_BattleTowerBattleRoom_Text_242932 waitmessage waitfanfare - setvar VAR_0x8004, 13 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL special CallFrontierUtilFunc msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 @@ -357,7 +357,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E:: @ 824210E BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E closemessage setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -369,16 +369,16 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E copyvar VAR_0x8004, VAR_FRONTIER_BATTLE_MODE compare VAR_0x8004, 3 goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A - setvar VAR_0x8004, 18 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_18 special CallFrontierUtilFunc special HealPlayerParty - setvar VAR_0x8004, 21 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21 special CallFrontierUtilFunc BattleFrontier_BattleTowerBattleRoom_EventScript_24215A:: @ 824215A setvar VAR_0x8004, 15 special sub_8161F74 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 5 special CallFrontierUtilFunc return @@ -389,7 +389,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_242170:: @ 8242170 BattleFrontier_BattlePalaceBattleRoom_EventScript_242170:: @ 8242170 BattleFrontier_BattlePyramidTop_EventScript_242170:: @ 8242170 BattleFrontier_BattleTowerBattleRoom_EventScript_242170:: @ 8242170 - setvar VAR_0x8004, 22 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_BRAIN_OBJECT special CallFrontierUtilFunc return diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index 476caa21d..d5c990623 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -45,7 +45,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249518 applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_24951E waitmovement 0 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 @@ -56,7 +56,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 waitmovement 0 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special CallFrontierUtilFunc @@ -114,7 +114,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249069:: @ 8249069 case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special CallFrontierUtilFunc @@ -154,7 +154,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249118:: @ 8249118 BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121 special LoadPlayerParty - setvar VAR_0x8004, 3 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_FRONTIER_BATTLE_MODE, 3 @@ -164,7 +164,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121 special HealPlayerParty BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD @@ -231,7 +231,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283 end BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special CallFrontierUtilFunc @@ -251,7 +251,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB playse SE_SAVE waitse fadescreen 1 - setvar VAR_0x8004, 4 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET special CallFrontierUtilFunc end diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 353af931a..9ab463d7c 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -47,7 +47,7 @@ BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD .2byte 0 BattleFrontier_BattleTowerLobby_EventScript_23E707:: @ 823E707 - setvar VAR_0x8004, 0 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 special CallFrontierUtilFunc end @@ -64,7 +64,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 special sub_8161F74 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -75,9 +75,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710 BattleFrontier_BattleTowerLobby_EventScript_23E758:: @ 823E758 lock faceplayer - setvar VAR_0x8004, 10 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN special CallFrontierUtilFunc - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E778 message BattleFrontier_BattleTowerLobby_Text_23F60D waitmessage @@ -99,7 +99,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780 BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5 msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, MSGBOX_DEFAULT - setvar VAR_0x8004, 11 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11 special CallFrontierUtilFunc msgbox BattleFrontier_BattleTowerLobby_Text_241520, 9 call BattleFrontier_BattleTowerLobby_EventScript_23E84D @@ -148,7 +148,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E830:: @ 823E830 BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D message BattleFrontier_BattleTowerLobby_Text_23F70F waitmessage - setvar VAR_0x8004, 8 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8 special CallFrontierUtilFunc special LoadPlayerParty special HealPlayerParty @@ -179,7 +179,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_23E8B4:: @ 823E8B4 BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4:: @ 823E8B4 BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4:: @ 823E8B4 BattleFrontier_BattleTowerLobby_EventScript_23E8B4:: @ 823E8B4 - setvar VAR_0x8004, 19 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_19 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7 @@ -204,7 +204,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_23E8E0:: @ 823E8E0 BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0:: @ 823E8E0 BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0:: @ 823E8E0 BattleFrontier_BattleTowerLobby_EventScript_23E8E0:: @ 823E8E0 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 6 special CallFrontierUtilFunc return @@ -223,7 +223,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE special sub_8161F74 playse SE_SAVE waitse - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -259,11 +259,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 switch VAR_RESULT case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - setvar VAR_0x8004, 15 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15 special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -283,7 +283,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_TEMP_0, 0 @@ -293,7 +293,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special sub_8161F74 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -339,11 +339,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED switch VAR_RESULT case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - setvar VAR_0x8004, 15 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15 special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -363,7 +363,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_TEMP_0, 0 @@ -373,7 +373,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special sub_8161F74 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -420,11 +420,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 switch VAR_RESULT case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - setvar VAR_0x8004, 15 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15 special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -444,7 +444,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_TEMP_0, 0 @@ -454,7 +454,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special sub_8161F74 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -500,11 +500,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 switch VAR_RESULT case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - setvar VAR_0x8004, 15 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15 special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -524,7 +524,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_TEMP_0, 0 @@ -534,7 +534,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special sub_8161F74 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -629,7 +629,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFBE:: @ 823EFBE BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7 lockall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -640,7 +640,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7 BattleFrontier_BattleTowerLobby_EventScript_23EFE0:: @ 823EFE0 lockall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc @@ -651,7 +651,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFE0:: @ 823EFE0 BattleFrontier_BattleTowerLobby_EventScript_23EFF9:: @ 823EFF9 lockall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW setvar VAR_0x8005, 0 setvar VAR_0x8006, 2 special CallFrontierUtilFunc @@ -662,7 +662,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFF9:: @ 823EFF9 BattleFrontier_BattleTowerLobby_EventScript_23F012:: @ 823F012 lockall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special CallFrontierUtilFunc @@ -713,7 +713,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0C2:: @ 823F0C2 end BattleFrontier_BattleTowerLobby_EventScript_23F0D0:: @ 823F0D0 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 special CallFrontierUtilFunc goto BattleFrontier_BattleTowerLobby_EventScript_23F0E6 @@ -732,7 +732,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0F1:: @ 823F0F1 BattleFrontier_BattleTowerLobby_EventScript_23F0F3:: @ 823F0F3 special SavePlayerParty - setvar VAR_0x8004, 3 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY call BattleFrontier_BattleTowerLobby_EventScript_23F272 special CallFrontierUtilFunc setvar VAR_RESULT, 0 @@ -897,7 +897,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F272:: @ 823F272 return BattleFrontier_BattleTowerLobby_EventScript_23F29F:: @ 823F29F - setvar VAR_0x8005, 3 + setvar VAR_0x8005, FRONTIER_PARTY_SIZE return BattleFrontier_BattleTowerLobby_EventScript_23F2A5:: @ 823F2A5 @@ -920,7 +920,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_23F2B7:: @ 823F2B7 BattleFrontier_BattlePikeLobby_EventScript_23F2B7:: @ 823F2B7 BattleFrontier_BattlePyramidLobby_EventScript_23F2B7:: @ 823F2B7 BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 1 special CallFrontierUtilFunc return diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index d053c33e4..c26a8098e 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -94,7 +94,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special CallFrontierUtilFunc diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index eeb6f6904..4f5ab96af 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -89,7 +89,7 @@ BattleFrontier_ScottsHouse_EventScript_263811:: @ 8263811 BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B setvar VAR_FRONTIER_BATTLE_MODE, 0 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -98,7 +98,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B special sub_8161F74 compare VAR_RESULT, 50 goto_if_ge BattleFrontier_ScottsHouse_EventScript_26387A - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 1 special CallFrontierUtilFunc @@ -132,7 +132,7 @@ BattleFrontier_ScottsHouse_EventScript_2638AA:: @ 82638AA BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 setvar VAR_FRONTIER_BATTLE_MODE, 0 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -141,7 +141,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 special sub_8161F74 compare VAR_RESULT, 100 goto_if_ge BattleFrontier_ScottsHouse_EventScript_263913 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 1 special CallFrontierUtilFunc diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index 1f8989955..efa3cc488 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -35,7 +35,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7 showobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B8D waitmovement 0 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 @@ -68,7 +68,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F msgbox FallarborTown_BattleTentBattleRoom_Text_257CCE, MSGBOX_DEFAULT FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special CallFrontierUtilFunc @@ -85,11 +85,11 @@ FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C closemessage FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -105,15 +105,15 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 msgbox FallarborTown_BattleTentBattleRoom_Text_257CE9, MSGBOX_DEFAULT special LoadPlayerParty special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY + setvar VAR_0x8005, FRONTIER_PARTY_SIZE special CallFrontierUtilFunc playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 @@ -153,7 +153,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AD8:: @ 8200AD8 FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3 delay 60 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special CallFrontierUtilFunc @@ -190,7 +190,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200B51:: @ 8200B51 playse SE_SAVE waitse fadescreen 1 - setvar VAR_0x8004, 4 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET special CallFrontierUtilFunc end diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 5823f0611..b5cc43558 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -21,7 +21,7 @@ FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85 .2byte 0 FallarborTown_BattleTentLobby_EventScript_1FFEAF:: @ 81FFEAF - setvar VAR_0x8004, 0 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 special CallFrontierUtilFunc end @@ -29,12 +29,12 @@ FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8 lockall msgbox FallarborTown_BattleTentLobby_Text_2C4DED, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -48,7 +48,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED waitmessage setvar VAR_0x8004, 4 special sub_81B9B80 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -64,7 +64,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27 special sub_81B9B80 switch VAR_RESULT case 0, FallarborTown_BattleTentLobby_EventScript_1FFF73 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -96,7 +96,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93 lockall message FallarborTown_BattleTentLobby_Text_2C4FD7 waitmessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -120,7 +120,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD special sub_81B9B80 playse SE_SAVE waitse - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -151,11 +151,11 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D setvar VAR_FRONTIER_FACILITY, 3 setvar VAR_FRONTIER_BATTLE_MODE, 0 setvar VAR_RESULT, 2 - setvar VAR_0x8004, 15 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15 special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq FallarborTown_BattleTentLobby_EventScript_200176 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 special CallFrontierUtilFunc @@ -175,16 +175,16 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, 0 special sub_81B9B80 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -198,8 +198,8 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY + setvar VAR_0x8005, FRONTIER_PARTY_SIZE special CallFrontierUtilFunc msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, MSGBOX_DEFAULT closemessage @@ -227,7 +227,7 @@ FallarborTown_BattleTentLobby_EventScript_20019E:: @ 820019E goto FallarborTown_BattleTentLobby_EventScript_2001CD FallarborTown_BattleTentLobby_EventScript_2001AB:: @ 82001AB - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 29162f3e0..54364eaf3 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -558,7 +558,7 @@ LilycoveCity_ContestLobby_EventScript_21A77A:: @ 821A77A LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784 lockall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW setvar VAR_0x8005, 7 special CallFrontierUtilFunc waitbuttonpress diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 14b1b6368..765b96482 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -258,14 +258,14 @@ MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle:: @ 822400C MossdeepCity_SpaceCenter_2F_EventScript_DoStevenMultiBattle:: @ 8224032 special ReducePlayerPartyToSelectedMons - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, SPECIAL_BATTLE_STEVEN setvar VAR_0x8005, 0 special DoSpecialTrainerBattle waitstate - setvar VAR_0x8004, 6 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_6 special CallFrontierUtilFunc special LoadPlayerParty switch VAR_RESULT diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index e178155a9..e5195dce2 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -63,7 +63,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE case 1, SlateportCity_BattleTentBattleRoom_EventScript_209A39 SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special CallFrontierUtilFunc @@ -72,11 +72,11 @@ SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B waitstate SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -89,7 +89,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39 SlateportCity_BattleTentBattleRoom_EventScript_209A7B:: @ 8209A7B SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special CallFrontierUtilFunc diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index c5e5616ce..a8abf0cb6 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -68,7 +68,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE special HealPlayerParty SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 @@ -135,7 +135,7 @@ SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022 playse SE_SAVE waitse fadescreen 1 - setvar VAR_0x8004, 4 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET special CallFrontierUtilFunc end diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index dcd90d16c..8f453c147 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -21,7 +21,7 @@ SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F .2byte 0 SlateportCity_BattleTentLobby_EventScript_208779:: @ 8208779 - setvar VAR_0x8004, 0 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 special CallFrontierUtilFunc end @@ -29,12 +29,12 @@ SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782 lockall msgbox SlateportCity_BattleTentLobby_Text_2C5DFA, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -47,7 +47,7 @@ SlateportCity_BattleTentLobby_EventScript_2087B7:: @ 82087B7 waitmessage setvar VAR_0x8004, 4 special sub_81B9D08 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -63,7 +63,7 @@ SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9 special sub_81B9D08 switch VAR_RESULT case 0, SlateportCity_BattleTentLobby_EventScript_20882A - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -81,7 +81,7 @@ SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837 lockall message SlateportCity_BattleTentLobby_Text_2C5BA2 waitmessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -107,7 +107,7 @@ SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871 special sub_81B9D08 playse SE_SAVE waitse - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -138,7 +138,7 @@ SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906 setvar VAR_FRONTIER_FACILITY, 4 setvar VAR_FRONTIER_BATTLE_MODE, 0 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 special CallFrontierUtilFunc @@ -150,16 +150,16 @@ SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906 SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, 0 special sub_81B9D08 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -221,7 +221,7 @@ SlateportCity_BattleTentLobby_EventScript_208A07:: @ 8208A07 goto SlateportCity_BattleTentLobby_EventScript_2088CA SlateportCity_BattleTentLobby_EventScript_208A14:: @ 8208A14 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 3cd012a33..b2c900e31 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -34,7 +34,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348 showobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_202575 waitmovement 0 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 @@ -55,7 +55,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8 VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special CallFrontierUtilFunc @@ -64,11 +64,11 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA waitstate VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -83,15 +83,15 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, MSGBOX_DEFAULT special LoadPlayerParty special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY + setvar VAR_0x8005, FRONTIER_PARTY_SIZE special CallFrontierUtilFunc playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 @@ -128,7 +128,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA:: @ 82024EA goto VerdanturfTown_BattleTentBattleRoom_EventScript_20236F VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special CallFrontierUtilFunc @@ -145,7 +145,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20251F:: @ 820251F playse SE_SAVE waitse fadescreen 1 - setvar VAR_0x8004, 4 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SOFT_RESET special CallFrontierUtilFunc end diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index d22933443..88c98fc1a 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -21,7 +21,7 @@ VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF .2byte 0 VerdanturfTown_BattleTentLobby_EventScript_201719:: @ 8201719 - setvar VAR_0x8004, 0 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 special CallFrontierUtilFunc end @@ -29,12 +29,12 @@ VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722 lockall msgbox VerdanturfTown_BattleTentLobby_Text_24E636, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -48,7 +48,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757 waitmessage setvar VAR_0x8004, 6 special sub_81B99B4 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -64,7 +64,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791 special sub_81B99B4 switch VAR_RESULT case 0, VerdanturfTown_BattleTentLobby_EventScript_2017DD - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -96,7 +96,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD lockall message VerdanturfTown_BattleTentLobby_Text_2C56B8 waitmessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -121,7 +121,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837 special sub_81B99B4 playse SE_SAVE waitse - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -152,11 +152,11 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF setvar VAR_FRONTIER_FACILITY, 2 setvar VAR_FRONTIER_BATTLE_MODE, 0 setvar VAR_RESULT, 2 - setvar VAR_0x8004, 15 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_15 special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 special CallFrontierUtilFunc @@ -176,16 +176,16 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, 0 special sub_81B99B4 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -199,8 +199,8 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE special SavePlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY + setvar VAR_0x8005, FRONTIER_PARTY_SIZE special CallFrontierUtilFunc msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, MSGBOX_DEFAULT closemessage @@ -228,7 +228,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201A10:: @ 8201A10 goto VerdanturfTown_BattleTentLobby_EventScript_201A3F VerdanturfTown_BattleTentLobby_EventScript_201A1D:: @ 8201A1D - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc index 9892ffb7b..2a6da1a58 100644 --- a/data/scripts/battle_pike.inc +++ b/data/scripts/battle_pike.inc @@ -100,11 +100,11 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallBattlePikeFunction - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -181,11 +181,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallBattlePikeFunction - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -245,11 +245,11 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallBattlePikeFunction - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -276,7 +276,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D:: @ 82C420D end BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special CallFrontierUtilFunc @@ -287,7 +287,7 @@ BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222 BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E: @ 82C423E BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E: @ 82C423E setorcopyvar VAR_0x8006, VAR_RESULT - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 0 special CallFrontierUtilFunc compare VAR_RESULT, 2 @@ -302,7 +302,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B:: @ 82C426B BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271:: @ 82C4271 BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271 - setvar VAR_0x8004, 21 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21 special CallFrontierUtilFunc return diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc index 7d898a93d..db6105249 100644 --- a/data/scripts/trainer_hill.inc +++ b/data/scripts/trainer_hill.inc @@ -6,7 +6,7 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 setvar VAR_TEMP_2, 0 setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER special CallTrainerHillFunction - setvar VAR_0x8004, 1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 5 special CallFrontierUtilFunc compare VAR_RESULT, B_OUTCOME_LOST diff --git a/include/constants/frontier_util.h b/include/constants/frontier_util.h new file mode 100644 index 000000000..52bde509f --- /dev/null +++ b/include/constants/frontier_util.h @@ -0,0 +1,32 @@ +#ifndef GUARD_CONSTANTS_FRONTIER_UTIL_H +#define GUARD_CONSTANTS_FRONTIER_UTIL_H + +#define FRONTIER_BEFORE_TEXT 0 +#define FRONTIER_PLAYER_LOST_TEXT 1 +#define FRONTIER_PLAYER_WON_TEXT 2 + +#define FRONTIER_UTIL_FUNC_0 0 +#define FRONTIER_UTIL_FUNC_1 1 +#define FRONTIER_UTIL_FUNC_2 2 +#define FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY 3 +#define FRONTIER_UTIL_FUNC_SOFT_RESET 4 +#define FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS 5 +#define FRONTIER_UTIL_FUNC_6 6 +#define FRONTIER_UTIL_FUNC_RESULTS_WINDOW 7 +#define FRONTIER_UTIL_FUNC_8 8 +#define FRONTIER_UTIL_FUNC_9 9 +#define FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN 10 +#define FRONTIER_UTIL_FUNC_11 11 +#define FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS 12 +#define FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL 13 +#define FRONTIER_UTIL_FUNC_CHECK_BATTLE_TYPE 14 +#define FRONTIER_UTIL_FUNC_15 15 +#define FRONTIER_UTIL_FUNC_CHECK_VISIT_TRAINER 16 +#define FRONTIER_UTIL_FUNC_17 17 +#define FRONTIER_UTIL_FUNC_18 18 +#define FRONTIER_UTIL_FUNC_19 19 +#define FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME 20 +#define FRONTIER_UTIL_FUNC_21 21 +#define FRONTIER_UTIL_FUNC_SET_BRAIN_OBJECT 22 + +#endif // GUARD_CONSTANTS_FRONTIER_UTIL_H diff --git a/include/constants/items.h b/include/constants/items.h index 3664f6dd2..b4e4798fb 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -471,10 +471,14 @@ #define LAST_BERRY_MASTER_BERRY ITEM_NOMEL_BERRY #define FIRST_BERRY_MASTER_WIFE_BERRY ITEM_CHERI_BERRY #define LAST_BERRY_MASTER_WIFE_BERRY ITEM_SITRUS_BERRY +#define FIRST_KIRI_BERRY ITEM_POMEG_BERRY +#define LAST_KIRI_BERRY ITEM_NOMEL_BERRY #define NUM_BERRY_MASTER_BERRIES LAST_BERRY_MASTER_BERRY - FIRST_BERRY_MASTER_BERRY + 1 #define NUM_BERRY_MASTER_BERRIES_SKIPPED FIRST_BERRY_MASTER_BERRY - FIRST_BERRY_INDEX #define NUM_BERRY_MASTER_WIFE_BERRIES LAST_BERRY_MASTER_WIFE_BERRY - FIRST_BERRY_MASTER_WIFE_BERRY + 1 +#define NUM_KIRI_BERRIES LAST_KIRI_BERRY - FIRST_KIRI_BERRY + 1 +#define NUM_KIRI_BERRIES_SKIPPED FIRST_KIRI_BERRY - FIRST_BERRY_INDEX #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1)) diff --git a/include/frontier_util.h b/include/frontier_util.h index 9464ba91c..627b5bef5 100644 --- a/include/frontier_util.h +++ b/include/frontier_util.h @@ -1,10 +1,6 @@ #ifndef GUARD_FRONTIER_UTIL_H #define GUARD_FRONTIER_UTIL_H -#define FRONTIER_BEFORE_TEXT 0 -#define FRONTIER_PLAYER_LOST_TEXT 1 -#define FRONTIER_PLAYER_WON_TEXT 2 - void CallFrontierUtilFunc(void); u8 sub_81A3610(void); void CopyFrontierTrainerText(u8 whichText, u16 trainerId); diff --git a/src/battle_message.c b/src/battle_message.c index 80c6f583b..fd4213baf 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -20,6 +20,7 @@ #include "trainer_hill.h" #include "window.h" #include "constants/battle_string_ids.h" +#include "constants/frontier_util.h" #include "constants/items.h" #include "constants/moves.h" #include "constants/trainers.h" diff --git a/src/frontier_util.c b/src/frontier_util.c index 37840f834..4a17159a6 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -29,6 +29,7 @@ #include "load_save.h" #include "battle_dome.h" #include "constants/battle_frontier.h" +#include "constants/frontier_util.h" #include "constants/trainers.h" #include "constants/species.h" #include "constants/game_stat.h" @@ -51,26 +52,26 @@ struct FrontierBrainMon static void sub_81A17A0(void); static void sub_81A1830(void); static void sub_81A1968(void); -static void sub_81A1AD4(void); +static void LoadSelectedParty(void); static void DoSoftReset_(void); -static void sub_81A1B28(void); +static void SetFrontierTrainers(void); static void sub_81A1B38(void); static void ShowFacilityResultsWindow(void); static void sub_81A31FC(void); static void sub_81A35EC(void); -static void sub_81A3B00(void); +static void IsTrainerFrontierBrain(void); static void sub_81A3B64(void); -static void sub_81A3D30(void); -static void sub_81A3D58(void); -static void sub_81A3DA0(void); +static void GetFacilitySymbolCount(void); +static void GiveFacilitySymbol(void); +static void CheckBattleTypeFlag(void); static void sub_81A3FD4(void); -static void sub_81A4224(void); +static void ValidateVisitingTrainer(void); static void sub_81A4230(void); static void sub_81A43A8(void); static void sub_81A4410(void); -static void sub_81A443C(void); +static void BufferFrontierTrainerName(void); static void sub_81A447C(void); -static void sub_81A457C(void); +static void SetFacilityBrainEventObject(void); static void ShowTowerResultsWindow(u8); static void ShowDomeResultsWindow(u8); static void ShowPalaceResultsWindow(u8); @@ -603,29 +604,29 @@ static const u16 gUnknown_08611BFC[][2] = static void (* const sFrontierUtilFuncs[])(void) = { - sub_81A17A0, - sub_81A1830, - sub_81A1968, - sub_81A1AD4, - DoSoftReset_, - sub_81A1B28, - sub_81A1B38, - ShowFacilityResultsWindow, - sub_81A31FC, - sub_81A35EC, - sub_81A3B00, - sub_81A3B64, - sub_81A3D30, - sub_81A3D58, - sub_81A3DA0, - sub_81A3FD4, - sub_81A4224, - sub_81A4230, - sub_81A43A8, - sub_81A4410, - sub_81A443C, - sub_81A447C, - sub_81A457C, + [FRONTIER_UTIL_FUNC_0] = sub_81A17A0, + [FRONTIER_UTIL_FUNC_1] = sub_81A1830, + [FRONTIER_UTIL_FUNC_2] = sub_81A1968, + [FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY] = LoadSelectedParty, + [FRONTIER_UTIL_FUNC_SOFT_RESET] = DoSoftReset_, + [FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS] = SetFrontierTrainers, + [FRONTIER_UTIL_FUNC_6] = sub_81A1B38, + [FRONTIER_UTIL_FUNC_RESULTS_WINDOW] = ShowFacilityResultsWindow, + [FRONTIER_UTIL_FUNC_8] = sub_81A31FC, + [FRONTIER_UTIL_FUNC_9] = sub_81A35EC, + [FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN] = IsTrainerFrontierBrain, + [FRONTIER_UTIL_FUNC_11] = sub_81A3B64, + [FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS] = GetFacilitySymbolCount, + [FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL] = GiveFacilitySymbol, + [FRONTIER_UTIL_FUNC_CHECK_BATTLE_TYPE] = CheckBattleTypeFlag, + [FRONTIER_UTIL_FUNC_15] = sub_81A3FD4, + [FRONTIER_UTIL_FUNC_CHECK_VISIT_TRAINER] = ValidateVisitingTrainer, + [FRONTIER_UTIL_FUNC_17] = sub_81A4230, + [FRONTIER_UTIL_FUNC_18] = sub_81A43A8, + [FRONTIER_UTIL_FUNC_19] = sub_81A4410, + [FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME] = BufferFrontierTrainerName, + [FRONTIER_UTIL_FUNC_21] = sub_81A447C, + [FRONTIER_UTIL_FUNC_SET_BRAIN_OBJECT] = SetFacilityBrainEventObject, }; static const struct WindowTemplate gUnknown_08611C74 = @@ -880,7 +881,7 @@ static void sub_81A1968(void) } } -static void sub_81A1AD4(void) +static void LoadSelectedParty(void) { s32 i; @@ -895,7 +896,7 @@ static void DoSoftReset_(void) DoSoftReset(); } -static void sub_81A1B28(void) +static void SetFrontierTrainers(void) { gFacilityTrainers = gBattleFrontierTrainers; } @@ -1827,7 +1828,7 @@ void sub_81A3ACC(void) gSaveBlock2Ptr->frontier.trainerIds[i] = 0xFFFF; } -static void sub_81A3B00(void) +static void IsTrainerFrontierBrain(void) { if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) gSpecialVar_Result = TRUE; @@ -1900,13 +1901,13 @@ static void sub_81A3B64(void) gSaveBlock2Ptr->frontier.field_EBA = points; } -static void sub_81A3D30(void) +static void GetFacilitySymbolCount(void) { s32 facility = VarGet(VAR_FRONTIER_FACILITY); gSpecialVar_Result = GetPlayerSymbolCountForFacility(facility); } -static void sub_81A3D58(void) +static void GiveFacilitySymbol(void) { s32 facility = VarGet(VAR_FRONTIER_FACILITY); if (GetPlayerSymbolCountForFacility(facility) == 0) @@ -1915,7 +1916,7 @@ static void sub_81A3D58(void) FlagSet(FLAG_SYS_TOWER_GOLD + facility * 2); } -static void sub_81A3DA0(void) +static void CheckBattleTypeFlag(void) { if (gBattleTypeFlags & gSpecialVar_0x8005) gSpecialVar_Result = TRUE; @@ -2087,7 +2088,7 @@ static void sub_81A3FD4(void) } } -static void sub_81A4224(void) +static void ValidateVisitingTrainer(void) { ValidateEReaderTrainer(); } @@ -2160,7 +2161,7 @@ static void sub_81A4410(void) gSaveBlock2Ptr->frontier.field_CA9_b = 1; } -static void sub_81A443C(void) +static void BufferFrontierTrainerName(void) { switch (gSpecialVar_0x8005) { @@ -2198,7 +2199,7 @@ static void sub_81A447C(void) } } -static void sub_81A457C(void) +static void SetFacilityBrainEventObject(void) { SetFrontierBrainEventObjGfx(VarGet(VAR_FRONTIER_FACILITY)); } |