diff options
Diffstat (limited to 'data/maps')
16 files changed, 121 insertions, 121 deletions
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 69df3aca2..84f0ebeea 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -73,7 +73,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E waitse waitmovement 0 setvar VAR_0x8004, 6 - special sub_81A5238 + special CallBattleArenaFunction msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C68, 4 closemessage applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2 @@ -88,7 +88,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2 waitmovement 0 setvar VAR_0x8004, 5 - special sub_8195960 + special CallBattlePalaceFunction msgbox gStringVar4, 4 waitmessage call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C @@ -105,7 +105,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB:: @ 82575DB waitse waitmovement 0 setvar VAR_0x8004, 6 - special sub_81A5238 + special CallBattleArenaFunction msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CCE, 4 BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615 @@ -266,7 +266,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A waitmessage setvar VAR_0x8004, 3 setvar VAR_0x8005, 2 - special sub_81A5238 + special CallBattleArenaFunction playse SE_SAVE waitse fadescreen 1 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 710dd1ece..19976c855 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -32,11 +32,11 @@ BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_81A5238 + special CallBattleArenaFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 - special sub_81A5238 + special CallBattleArenaFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 @@ -78,7 +78,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255D2B:: @ 8255D2B setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 - special sub_81A5238 + special CallBattleArenaFunction call BattleFrontier_BattleArenaLobby_EventScript_255D59 msgbox BattleFrontier_BattleArenaLobby_Text_256A74, 4 closemessage @@ -93,7 +93,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59 special HealPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 - special sub_81A5238 + special CallBattleArenaFunction playse SE_SAVE waitse call BattleFrontier_BattleArenaLobby_EventScript_23E8E0 @@ -119,7 +119,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255DC0:: @ 8255DC0 waitmessage setvar VAR_0x8004, 3 setvar VAR_0x8005, 1 - special sub_81A5238 + special CallBattleArenaFunction playse SE_SAVE waitse setvar VAR_0x8004, 2 @@ -183,11 +183,11 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, 0 - special sub_81A5238 + special CallBattleArenaFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 - special sub_81A5238 + special CallBattleArenaFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 6d2350b6f..74b10e0f0 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -69,7 +69,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67 waitmovement 0 call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4 setvar VAR_0x8004, 11 - special sub_81A5E74 + special CallBattleFactoryFunction removeobject 2 setobjectxyperm 2, 7, 1 addobject 2 @@ -80,7 +80,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 compare VAR_TEMP_F, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C setvar VAR_0x8004, 5 - special sub_8195960 + special CallBattlePalaceFunction lockall msgbox gStringVar4, 4 waitmessage @@ -109,14 +109,14 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8:: @ 825AEF8 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F:: @ 825AF0F setvar VAR_0x8004, 1 setvar VAR_0x8005, 3 - special sub_81A5E74 + special CallBattleFactoryFunction compare VAR_RESULT, 9999 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E addvar VAR_RESULT, 1 setorcopyvar VAR_0x8006, VAR_RESULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 - special sub_81A5E74 + special CallBattleFactoryFunction BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E:: @ 825AF3E call BattleFrontier_BattleFactoryBattleRoom_EventScript_241EBA @@ -235,24 +235,24 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105 setvar VAR_0x8004, 1 setvar VAR_0x8005, 3 - special sub_81A5E74 + special CallBattleFactoryFunction compare VAR_RESULT, 9999 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E addvar VAR_RESULT, 1 setorcopyvar VAR_0x8006, VAR_RESULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - special sub_81A5E74 + special CallBattleFactoryFunction compare VAR_RESULT, 9999 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43 addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index 1a535c893..6ea24b81f 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -30,19 +30,19 @@ BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A msgbox BattleFrontier_BattleFactoryLobby_Text_258ECA, 4 closemessage setvar VAR_0x8004, 8 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 @@ -77,7 +77,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6 special LoadPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 - special sub_81A5E74 + special CallBattleFactoryFunction playse SE_SAVE waitse goto BattleFrontier_BattleFactoryLobby_EventScript_25853B @@ -93,10 +93,10 @@ BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 - special sub_81A5E74 + special CallBattleFactoryFunction playse SE_SAVE waitse @@ -128,7 +128,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258592:: @ 8258592 waitmessage setvar VAR_0x8004, 3 setvar VAR_0x8005, 1 - special sub_81A5E74 + special CallBattleFactoryFunction playse SE_SAVE waitse setvar VAR_0x8004, 2 @@ -193,7 +193,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653 BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 0 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 @@ -201,7 +201,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index 5764025e0..d99fed1b2 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -32,23 +32,23 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9 compare VAR_0x8006, 2 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69 setvar VAR_0x8004, 13 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 12 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 14 - special sub_81A5E74 + special CallBattleFactoryFunction setorcopyvar VAR_0x8005, VAR_RESULT setvar VAR_0x8004, 15 - special sub_81A5E74 + special CallBattleFactoryFunction setorcopyvar VAR_0x8006, VAR_RESULT call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004 msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8, 4 fadescreen 1 setvar VAR_0x8004, 8 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 6 - special sub_81A5E74 + special CallBattleFactoryFunction waitstate BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74 @@ -66,9 +66,9 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 setvar VAR_0x8004, 9 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 16 - special sub_81A5E74 + special CallBattleFactoryFunction msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, 4 playfanfare MUS_ME_ASA waitfanfare @@ -165,12 +165,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66:: @ 8259D66 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98:: @ 8259D98 setvar VAR_0x8004, 12 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 14 - special sub_81A5E74 + special CallBattleFactoryFunction setorcopyvar VAR_0x8005, VAR_RESULT setvar VAR_0x8004, 15 - special sub_81A5E74 + special CallBattleFactoryFunction setorcopyvar VAR_0x8006, VAR_RESULT call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004 @@ -183,12 +183,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98:: @ 8259D98 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2:: @ 8259DF2 fadescreen 1 setvar VAR_0x8004, 7 - special sub_81A5E74 + special CallBattleFactoryFunction waitstate compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 setvar VAR_0x8004, 8 - special sub_81A5E74 + special CallBattleFactoryFunction msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C, 4 goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 @@ -227,7 +227,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47 waitmessage setvar VAR_0x8004, 3 setvar VAR_0x8005, 2 - special sub_81A5E74 + special CallBattleFactoryFunction playse SE_SAVE waitse fadescreen 1 @@ -239,7 +239,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69 special SavePlayerParty setvar VAR_0x8004, 10 setvar VAR_0x8005, 0 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 @@ -381,39 +381,39 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068:: @ 825A068 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAE6, 4 + msgbox Text_StyleUnrestrained, 4 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071:: @ 825A071 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A9CE, 4 + msgbox Text_StyleTotalPreparation, 4 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A:: @ 825A07A - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A8D9, 4 + msgbox Text_StyleSlowAndSteady, 4 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083:: @ 825A083 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A912, 4 + msgbox Text_StyleEndurance, 4 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C:: @ 825A08C - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A94C, 4 + msgbox Text_StyleHighRisk, 4 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095:: @ 825A095 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA16, 4 + msgbox Text_StyleWeakenFoe, 4 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E:: @ 825A09E - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAA7, 4 + msgbox Text_StyleImpossibleToPredict, 4 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7:: @ 825A0A7 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A98C, 4 + msgbox Text_StyleDependsOnFlow, 4 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0:: @ 825A0B0 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA5A, 4 + msgbox Text_StyleFlexible, 4 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9:: @ 825A0B9 @@ -642,39 +642,39 @@ BattleFrontier_BattleFactoryPreBattleRoom_Text_25A893: @ 825A893 .string "The TRAINER appears to have no clear\n" .string "favorites when it comes to type.$" -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A8D9: @ 825A8D9 +Text_StyleSlowAndSteady: @ 825A8D9 .string "The favorite battle style appears to\n" .string "be slow and steady.$" -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A912: @ 825A912 +Text_StyleEndurance: @ 825A912 .string "The favorite battle style appears to\n" .string "be one of endurance.$" -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A94C: @ 825A94C +Text_StyleHighRisk: @ 825A94C .string "The favorite battle style appears to\n" .string "be high risk, high return.$" -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A98C: @ 825A98C +Text_StyleDependsOnFlow: @ 825A98C .string "The favorite battle style appears to\n" .string "depend on the battle’s flow.$" -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A9CE: @ 825A9CE +Text_StyleTotalPreparation: @ 825A9CE .string "The favorite battle style appears to\n" .string "be one based on total preparation.$" -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA16: @ 825AA16 +Text_StyleWeakenFoe: @ 825AA16 .string "The favorite battle style appears\n" .string "to be weakening the foe to start.$" -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA5A: @ 825AA5A +Text_StyleFlexible: @ 825AA5A .string "The favorite battle style appears to\n" .string "be flexibly adaptable to the situation.$" -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAA7: @ 825AAA7 +Text_StyleImpossibleToPredict: @ 825AAA7 .string "The favorite battle style appears to\n" .string "be impossible to predict.$" -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAE6: @ 825AAE6 +Text_StyleUnrestrained: @ 825AAE6 .string "The favorite battle style appears to\n" .string "be free-spirited and unrestrained.$" diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 5cfc4c88b..a179aec55 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -60,7 +60,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1 waitmovement 0 setvar VAR_0x8004, 5 - special sub_8195960 + special CallBattlePalaceFunction msgbox gStringVar4, 4 waitmessage call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 @@ -189,7 +189,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F waitmessage setvar VAR_0x8004, 7 setvar VAR_0x8005, 2 - special sub_8195960 + special CallBattlePalaceFunction playse SE_SAVE waitse fadescreen 1 @@ -263,7 +263,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 setvar VAR_0x8004, 6 - special sub_8195960 + special CallBattlePalaceFunction setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 0 @@ -306,7 +306,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 setvar VAR_0x8004, 6 - special sub_8195960 + special CallBattlePalaceFunction setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 2 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc index bd916e931..23bad0421 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc @@ -13,7 +13,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 waitmovement 0 lockall setvar VAR_0x8004, 3 - special sub_8195960 + special CallBattlePalaceFunction compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F58B compare VAR_RESULT, 1 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 804fd7bce..82d3aa5cf 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -32,11 +32,11 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_8195960 + special CallBattlePalaceFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 - special sub_8195960 + special CallBattlePalaceFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 @@ -78,7 +78,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 - special sub_8195960 + special CallBattlePalaceFunction call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1 msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4 closemessage @@ -93,7 +93,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1 special HealPlayerParty setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 - special sub_8195960 + special CallBattlePalaceFunction playse SE_SAVE waitse call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0 @@ -120,7 +120,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908 waitmessage setvar VAR_0x8004, 7 setvar VAR_0x8005, 1 - special sub_8195960 + special CallBattlePalaceFunction playse SE_SAVE waitse setvar VAR_0x8004, 2 @@ -149,7 +149,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D956:: @ 824D956 BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968 setvar VAR_0x8004, 1 setvar VAR_0x8005, 0 - special sub_8195960 + special CallBattlePalaceFunction compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceLobby_EventScript_24D817 special SavePlayerParty @@ -207,11 +207,11 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, 0 - special sub_8195960 + special CallBattlePalaceFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 - special sub_8195960 + special CallBattlePalaceFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index 4bdf3c80e..3b2921737 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -14,10 +14,10 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 setvar VAR_0x8006, 1 special CallFrontierUtilFunc setvar VAR_0x8004, 20 - special sub_81A703C + special CallBattlePikeFunction setvar VAR_0x8004, 24 setvar VAR_0x8005, 1 - special sub_81A703C + special CallBattlePikeFunction applymovement 255, BattleFrontier_BattlePikeCorridor_Movement_25C80B applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812 waitmovement 0 diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index 6bbb21bd1..6bdb7f848 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -27,18 +27,18 @@ BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707 BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 special HealPlayerParty setvar VAR_0x8004, 27 - special sub_81A703C + special CallBattlePikeFunction lockall msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, 4 closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_81A703C + special CallBattlePikeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 setvar VAR_0x8006, 0 - special sub_81A703C + special CallBattlePikeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 @@ -70,21 +70,21 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D special CallFrontierUtilFunc setvar VAR_0x8004, 1 setvar VAR_0x8005, 3 - special sub_81A703C + special CallBattlePikeFunction addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 copyvar VAR_0x8006, VAR_RESULT - special sub_81A703C + special CallBattlePikeFunction special LoadPlayerParty special HealPlayerParty setvar VAR_0x8004, 27 - special sub_81A703C + special CallBattlePikeFunction message BattleFrontier_BattlePikeLobby_Text_25C1DF waitmessage setvar VAR_0x8004, 8 setvar VAR_0x8005, 0 - special sub_81A703C + special CallBattlePikeFunction playse SE_SAVE waitse msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 @@ -106,14 +106,14 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 setvar VAR_0x8006, 0 - special sub_81A703C + special CallBattlePikeFunction special LoadPlayerParty special HealPlayerParty setvar VAR_0x8004, 27 - special sub_81A703C + special CallBattlePikeFunction setvar VAR_0x8004, 8 setvar VAR_0x8005, 0 - special sub_81A703C + special CallBattlePikeFunction playse SE_SAVE waitse msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 @@ -177,7 +177,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, 28 - special sub_81A703C + special CallBattlePikeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 @@ -185,9 +185,9 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 setvar VAR_0x8006, 1 - special sub_81A703C + special CallBattlePikeFunction setvar VAR_0x8004, 26 - special sub_81A703C + special CallBattlePikeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 @@ -198,7 +198,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C call BattleFrontier_BattlePikeLobby_EventScript_27134F setvar VAR_TEMP_0, 255 setvar VAR_0x8004, 26 - special sub_81A703C + special CallBattlePikeFunction compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C special SavePlayerParty diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index 6f7140f30..9709e4794 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -12,7 +12,7 @@ BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171:: @ 825D171 setvar VAR_TEMP_0, 1 setvar VAR_0x8004, 5 - special sub_81A703C + special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6 case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E @@ -29,7 +29,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6 waitmovement 0 setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 - special sub_81A703C + special CallBattlePikeFunction msgbox gStringVar4, 4 waitmessage closemessage @@ -65,7 +65,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231 waitmovement 0 setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 - special sub_81A703C + special CallBattlePikeFunction msgbox gStringVar4, 4 waitmessage closemessage @@ -103,7 +103,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF waitmovement 0 setvar VAR_0x8004, 23 - special sub_81A703C + special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA @@ -137,7 +137,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7 waitmovement 0 setvar VAR_0x8004, 22 - special sub_81A703C + special CallBattlePikeFunction switch VAR_RESULT case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416 case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD @@ -219,12 +219,12 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - special sub_81A703C + special CallBattlePikeFunction addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A703C + special CallBattlePikeFunction call BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 waitstate end @@ -281,7 +281,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E waitmovement 0 setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 - special sub_81A703C + special CallBattlePikeFunction msgbox gStringVar4, 4 closemessage delay 16 @@ -289,7 +289,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E waitmovement 0 setvar VAR_0x8004, 21 setvar VAR_0x8005, 1 - special sub_81A703C + special CallBattlePikeFunction msgbox gStringVar4, 4 closemessage setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_DOUBLE @@ -318,7 +318,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA waitmovement 0 setvar VAR_0x8004, 12 - special sub_81A703C + special CallBattlePikeFunction copyvar VAR_0x8004, VAR_RESULT compare VAR_0x8004, 0 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643 @@ -336,7 +336,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 playmoncry SPECIES_KIRLIA, 0 waitmoncry setvar VAR_0x8004, 11 - special sub_81A703C + special CallBattlePikeFunction compare VAR_RESULT, 2 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751 compare VAR_RESULT, 1 @@ -346,7 +346,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 compare VAR_RESULT, 4 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766 setvar VAR_0x8004, 15 - special sub_81A703C + special CallBattlePikeFunction waitstate applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2 waitmovement 0 @@ -373,13 +373,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 playmoncry SPECIES_DUSCLOPS, 0 waitmoncry setvar VAR_0x8004, 11 - special sub_81A703C + special CallBattlePikeFunction compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774 setvar VAR_0x8004, 15 - special sub_81A703C + special CallBattlePikeFunction waitstate applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2 waitmovement 0 @@ -579,7 +579,7 @@ BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA: @ 825D7EA BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED setvar VAR_0x8004, 5 - special sub_81A703C + special CallBattlePikeFunction switch VAR_RESULT case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831 @@ -589,7 +589,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B lock faceplayer setvar VAR_0x8004, 14 - special sub_81A703C + special CallBattlePikeFunction msgbox gStringVar4, 4 waitmessage closemessage @@ -606,7 +606,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831:: @ 825D831 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E setvar VAR_0x8004, 13 - special sub_81A703C + special CallBattlePikeFunction compare VAR_RESULT, 2 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881 compare VAR_RESULT, 1 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc index d1d968054..b00b41fd7 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc @@ -12,7 +12,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C:: @ 825E43C setvar VAR_TEMP_0, 1 setvar VAR_0x8004, 6 - special sub_81A703C + special CallBattlePikeFunction end BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A:: @ 825E44A diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index 6f5e8db1c..0ff9ff5db 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -37,7 +37,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4 waitmessage setvar VAR_0x8004, 8 setvar VAR_0x8005, 1 - special sub_81A703C + special CallBattlePikeFunction playse SE_SAVE waitse setvar VAR_0x8004, 2 @@ -139,7 +139,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD special LoadPlayerParty setvar VAR_0x8004, 8 setvar VAR_0x8005, 2 - special sub_81A703C + special CallBattlePikeFunction playse SE_SAVE waitse fadescreen 1 @@ -167,7 +167,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78 setvar VAR_0x8004, 17 - special sub_81A703C + special CallBattlePikeFunction compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91 setvar VAR_TEMP_5, 255 @@ -190,7 +190,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB setvar VAR_0x8004, 19 - special sub_81A703C + special CallBattlePikeFunction compare VAR_RESULT, 4 goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2 lock @@ -210,7 +210,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00:: @ 825CB00 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A:: @ 825CB0A setvar VAR_0x8004, 18 - special sub_81A703C + special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39 case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB46 @@ -231,7 +231,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53:: @ 825CB53 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60:: @ 825CB60 setvar VAR_0x8004, 19 - special sub_81A703C + special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBA4 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index 6ec39dfd2..8bbcef830 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -162,14 +162,14 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3 waitstate setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - special sub_81A5238 + special CallBattleArenaFunction compare VAR_RESULT, 9999 goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2009B3 addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A5238 + special CallBattleArenaFunction FallarborTown_BattleTentBattleRoom_EventScript_200B43:: @ 8200B43 message FallarborTown_BattleTentBattleRoom_Text_257D17 diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index 833abdf99..6b63f13f8 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -42,7 +42,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE applymovement 3, SlateportCity_BattleTentBattleRoom_Movement_209A99 waitmovement 0 setvar VAR_0x8004, 11 - special sub_81A5E74 + special CallBattleFactoryFunction setobjectxyperm 2, 5, 1 removeobject 2 addobject 2 diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index c2ef5e3da..57df51237 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -59,9 +59,9 @@ SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE setvar VAR_0x8004, 9 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 16 - special sub_81A5E74 + special CallBattleFactoryFunction msgbox SlateportCity_BattleTentCorridor_Text_25A22D, 4 playfanfare MUS_ME_ASA waitfanfare @@ -143,7 +143,7 @@ SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044 special SavePlayerParty setvar VAR_0x8004, 10 setvar VAR_0x8005, 0 - special sub_81A5E74 + special CallBattleFactoryFunction goto SlateportCity_BattleTentCorridor_EventScript_208F0D SlateportCity_BattleTentCorridor_Movement_209059: @ 8209059 |