diff --git a/generated/vars_flags.txt b/generated/vars_flags.txt index 729654185c..1ddedada7c 100644 --- a/generated/vars_flags.txt +++ b/generated/vars_flags.txt @@ -4401,6 +4401,11 @@ VAR_0x8008 VAR_0x8009 VAR_0x800A VAR_0x800B -VAR_RESULT -VAR_LAST_TALKED +VAR_0x800C +VAR_RESULT = VAR_0x800C +VAR_0x800D +VAR_LAST_TALKED = VAR_0x800D SCRIPT_LOCAL_VARS_END = VAR_LAST_TALKED +FR_VAR_0x800E +FR_VAR_0x800F +FR_VAR_0x8010 diff --git a/res/field/frontier_scripts/frontier_scripts_battle_arcade.s b/res/field/frontier_scripts/frontier_scripts_battle_arcade.s index 28c15d007a..e9697f1191 100644 --- a/res/field/frontier_scripts/frontier_scripts_battle_arcade.s +++ b/res/field/frontier_scripts/frontier_scripts_battle_arcade.s @@ -1079,17 +1079,17 @@ _065C: .short 0xFD13 _0662: - FrontierScrCmd_3E VAR_BATTLE_ARCADE_CHALLENGE_TYPE, 0x8001 - FrontierScrCmd_3E 0x4003, 0x8003 - FrontierScrCmd_3E 0x4002, 0x8004 - FrontierScrCmd_3E 0x4005, 0x8005 - FrontierScrCmd_3E 0x4006, 0x8006 + FrontierScrCmd_3E VAR_BATTLE_ARCADE_CHALLENGE_TYPE, VAR_0x8001 + FrontierScrCmd_3E VAR_MAP_LOCAL_3, VAR_0x8003 + FrontierScrCmd_3E VAR_MAP_LOCAL_2, VAR_0x8004 + FrontierScrCmd_3E VAR_MAP_LOCAL_5, VAR_0x8005 + FrontierScrCmd_3E VAR_MAP_LOCAL_6, VAR_0x8006 FrontierScrCmd_6C - FrontierScrCmd_B8 0x8003, 0x8001, 0x8004, 0x8005, 0x8006, 0x8008 - GetPlayerObjEventGfx 0x8007 - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _06BE - SetVar 0x800F, 231 + FrontierScrCmd_B8 VAR_0x8003, VAR_0x8001, VAR_0x8004, VAR_0x8005, VAR_0x8006, VAR_0x8008 + GetPlayerObjEventGfx VAR_0x8007 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _06BE + SetVar FR_VAR_0x800F, 231 Call _333A GoTo _06DC End @@ -1097,7 +1097,7 @@ _0662: _06BE: Call _225F IncrementTrainerScore TRAINER_SCORE_EVENT_UNK_43 - SetVar 0x800F, 232 + SetVar FR_VAR_0x800F, 232 Call _335A GoTo _06DC End @@ -1105,8 +1105,8 @@ _06BE: _06DC: Call _32C0 FadeScreenIn - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0742 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0742 FrontierScrCmd_28 20, _0274 FrontierScrCmd_28 4, _0238 FrontierScrCmd_29 @@ -1116,7 +1116,7 @@ _06DC: FrontierScrCmd_25 0 FrontierScrCmd_25 20 FrontierScrCmd_25 4 - FrontierScrCmd_23 0x800F + FrontierScrCmd_23 FR_VAR_0x800F GoTo _0788 End @@ -1131,36 +1131,36 @@ _0742: FrontierScrCmd_25 1 FrontierScrCmd_25 2 FrontierScrCmd_25 20 - FrontierScrCmd_23 0x800F + FrontierScrCmd_23 FR_VAR_0x800F GoTo _0788 End _0788: FrontierScrCmd_03 16 - SetVar 0x800D, 0 - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _07BC - SetVar 0x800F, 231 + SetVar VAR_0x800D, 0 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _07BC + SetVar FR_VAR_0x800F, 231 Call _3383 GoTo _07D9 End _07BC: - FrontierScrCmd_BF 37, 0, 0, 0x8008 - SetVar 0x800F, 232 + FrontierScrCmd_BF 37, 0, 0, VAR_0x8008 + SetVar FR_VAR_0x800F, 232 Call _33A3 GoTo _07D9 End _07D9: - WaitTime 1, 0x8008 + WaitTime 1, VAR_0x8008 Call _33CC Call _33E3 Call _3246 Call _32CB FadeScreenIn - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0821 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0821 GoTo _0883 End @@ -1173,26 +1173,26 @@ _0821: End _0837: - SetVar 0x8002, 0 - FrontierScrCmd_C1 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _0837 - FrontierScrCmd_C2 0x8002 + SetVar VAR_0x8002, 0 + FrontierScrCmd_C1 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0837 + FrontierScrCmd_C2 VAR_0x8002 ClearReceivedTempDataAllPlayers GoTo _0883 End _0860: - SetVar 0x8002, 0 - FrontierScrCmd_C1 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _0860 - FrontierScrCmd_C2 0x8002 + SetVar VAR_0x8002, 0 + FrontierScrCmd_C1 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0860 + FrontierScrCmd_C2 VAR_0x8002 ClearReceivedTempDataAllPlayers Return _0883: - FrontierScrCmd_B9 0x8003 - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _08A5 + FrontierScrCmd_B9 VAR_0x8003 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _08A5 GoTo _091F End @@ -1204,10 +1204,10 @@ _08A5: End _08B5: - SetVar 0x8002, 1 - FrontierScrCmd_C1 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _08B5 - FrontierScrCmd_C2 0x8002 + SetVar VAR_0x8002, 1 + FrontierScrCmd_C1 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _08B5 + FrontierScrCmd_C2 VAR_0x8002 ClearReceivedTempDataAllPlayers ClearReceivedTempDataAllPlayers FrontierScrCmd_35 158 @@ -1217,10 +1217,10 @@ _08B5: End _08EA: - SetVar 0x8002, 5 - FrontierScrCmd_C1 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _08EA - FrontierScrCmd_C2 0x8002 + SetVar VAR_0x8002, 5 + FrontierScrCmd_C1 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _08EA + FrontierScrCmd_C2 VAR_0x8002 ClearReceivedTempDataAllPlayers ClearReceivedTempDataAllPlayers FrontierScrCmd_35 202 @@ -1230,9 +1230,9 @@ _08EA: End _091F: - SetVar 0x8003, 0 - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0975 + SetVar VAR_0x8003, 0 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0975 FrontierScrCmd_28 0, _0290 FrontierScrCmd_28 4, _0298 FrontierScrCmd_28 20, _02C4 @@ -1257,14 +1257,14 @@ _0975: _09B7: FrontierScrCmd_25 20 - FrontierScrCmd_23 0x800F + FrontierScrCmd_23 FR_VAR_0x800F Call _3198 - FrontierScrCmd_BF 23, 0, 0, 0x8008 - GoToIfEq 0x8008, 0, _09F9 + FrontierScrCmd_BF 23, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _09F9 Call _0A07 FrontierScrCmd_28 3, _05E8 FrontierScrCmd_29 - SetVar 0x8003, 1 + SetVar VAR_0x8003, 1 GoTo _28B3 End @@ -1274,15 +1274,15 @@ _09F9: End _0A07: - WaitTime 1, 0x8008 - FrontierScrCmd_BF 28, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _0A2D + WaitTime 1, VAR_0x8008 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _0A2D FrontierScrCmd_BD Call _2EB2 Return _0A2D: - FrontierScrCmd_BF 52, 0, 0, 0x8008 + FrontierScrCmd_BF 52, 0, 0, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 205 ClearReceivedTempDataAllPlayers @@ -1290,18 +1290,18 @@ _0A2D: End _0A46: - SetVar 0x8002, 2 - FrontierScrCmd_C1 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _0A46 - FrontierScrCmd_C2 0x8002 + SetVar VAR_0x8002, 2 + FrontierScrCmd_C1 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0A46 + FrontierScrCmd_C2 VAR_0x8002 ClearReceivedTempDataAllPlayers ClearReceivedTempDataAllPlayers FrontierScrCmd_35 206 ClearReceivedTempDataAllPlayers - FrontierScrCmd_BF 49, 0, 0, 0x8008 - WaitTime 1, 0x8008 - FrontierScrCmd_BF 50, 0, 0, 0x8008 - WaitTime 1, 0x8008 + FrontierScrCmd_BF 49, 0, 0, VAR_0x8008 + WaitTime 1, VAR_0x8008 + FrontierScrCmd_BF 50, 0, 0, VAR_0x8008 + WaitTime 1, VAR_0x8008 Return _0A8F: @@ -1309,10 +1309,10 @@ _0A8F: FrontierScrCmd_29 Message BattleArcadeScene_Text_Welcome PlaySoundEffect SEQ_SE_DP_DENDOU - FrontierScrCmd_BF 23, 0, 0, 0x8008 - CallIfEq 0x8008, 0, _0B1A - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0AD5 + FrontierScrCmd_BF 23, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 0, _0B1A + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0AD5 GoTo _0B20 End @@ -1330,11 +1330,11 @@ _0AE1: _0AF1: FrontierScrCmd_41 0, 3, 1 - FrontierScrCmd_BF 39, 0x8005, 0x8006, 0x8008 - WaitTime 120, 0x8008 + FrontierScrCmd_BF 39, VAR_0x8005, VAR_0x8006, VAR_0x8008 + WaitTime 120, VAR_0x8008 FrontierScrCmd_42 0 - WaitTime 60, 0x8008 - AddVar 0x8005, 1 + WaitTime 60, VAR_0x8008 + AddVar VAR_0x8005, 1 Return _0B1A: @@ -1343,16 +1343,16 @@ _0B1A: _0B20: Call _32A0 - BufferNumber 0, 0x8008 - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 0, _0B50 - GoToIfEq 0x8008, 1, _0B8A + BufferNumber 0, VAR_0x8008 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0B50 + GoToIfEq VAR_0x8008, 1, _0B8A End _0B50: - FrontierScrCmd_BF 23, 0, 0, 0x8008 - AddVar 0x8008, 1 - BufferNumber 0, 0x8008 + FrontierScrCmd_BF 23, 0, 0, VAR_0x8008 + AddVar VAR_0x8008, 1 + BufferNumber 0, VAR_0x8008 Message BattleArcadeScene_Text_GameStart WaitABPress CloseMessage @@ -1365,17 +1365,17 @@ _0B50: End _0B8A: - FrontierScrCmd_BF 23, 0, 0, 0x8008 - AddVar 0x8008, 1 - BufferNumber 0, 0x8008 + FrontierScrCmd_BF 23, 0, 0, VAR_0x8008 + AddVar VAR_0x8008, 1 + BufferNumber 0, VAR_0x8008 MessageNoSkip BattleArcadeScene_Text_GameStart - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 CloseMessage Call _2229 FrontierScrCmd_28 3, _05AC FrontierScrCmd_29 MessageNoSkip BattleArcadeScene_Text_ActivateBoard - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 143 ClearReceivedTempDataAllPlayers @@ -1385,25 +1385,25 @@ _0B8A: _0BD4: FadeScreenOut CloseMessage - FrontierScrCmd_BF 48, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _0C9E - CallIfEq 0x8008, 2, _0C9E + FrontierScrCmd_BF 48, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _0C9E + CallIfEq VAR_0x8008, 2, _0C9E Call _32A0 Call _2F24 Call _2F4A Call _3272 - FrontierScrCmd_BF 28, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _0CA4 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _0CA4 FrontierScrCmd_C3 FrontierScrCmd_2A _01E8 Call _3246 Call _2EEC - FrontierScrCmd_BF 11, 0, 0, 0x8008 + FrontierScrCmd_BF 11, 0, 0, VAR_0x8008 FrontierScrCmd_C5 - FrontierScrCmd_BF 28, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _227E - FrontierScrCmd_BF 28, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _0860 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _227E + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _0860 Call _32CB Call _32EA FadeScreenIn @@ -1440,77 +1440,77 @@ _0CD0: _0CD6: FrontierScrCmd_41 0, 3, 1 - FrontierScrCmd_BF 16, 0, 0, 0x8008 + FrontierScrCmd_BF 16, 0, 0, VAR_0x8008 PlaySoundEffect SEQ_SE_DP_DENDOU - SetVar 0x8010, 0x8008 - GoToIfEq 0x8010, 0, _0E93 - GoToIfEq 0x8010, 1, _0F5F - GoToIfEq 0x8010, 2, _100C - GoToIfEq 0x8010, 3, _10C3 - GoToIfEq 0x8010, 4, _1170 - GoToIfEq 0x8010, 5, _1227 - GoToIfEq 0x8010, 6, _12D4 - GoToIfEq 0x8010, 7, _136D - GoToIfEq 0x8010, 8, _1406 - GoToIfEq 0x8010, 9, _14C8 - GoToIfEq 0x8010, 10, _158A - GoToIfEq 0x8010, 11, _1641 - GoToIfEq 0x8010, 12, _16EE - GoToIfEq 0x8010, 13, _17A5 - GoToIfEq 0x8010, 14, _1852 - GoToIfEq 0x8010, 15, _1909 - GoToIfEq 0x8010, 16, _19A2 - GoToIfEq 0x8010, 17, _1A3B - GoToIfEq 0x8010, 18, _1B07 - GoToIfEq 0x8010, 19, _1B37 - GoToIfEq 0x8010, 20, _1B67 - GoToIfEq 0x8010, 21, _1B91 - GoToIfEq 0x8010, 22, _1BC1 - GoToIfEq 0x8010, 23, _1BEB - GoToIfEq 0x8010, 24, _1E5C - GoToIfEq 0x8010, 25, _1E86 - GoToIfEq 0x8010, 26, _1EB0 - GoToIfEq 0x8010, 27, _1C15 - GoToIfEq 0x8010, 28, _1EDA - GoToIfEq 0x8010, 29, _1FFC - GoToIfEq 0x8010, 30, _2086 - GoToIfEq 0x8010, 31, _1F71 + SetVar FR_VAR_0x8010, VAR_0x8008 + GoToIfEq FR_VAR_0x8010, 0, _0E93 + GoToIfEq FR_VAR_0x8010, 1, _0F5F + GoToIfEq FR_VAR_0x8010, 2, _100C + GoToIfEq FR_VAR_0x8010, 3, _10C3 + GoToIfEq FR_VAR_0x8010, 4, _1170 + GoToIfEq FR_VAR_0x8010, 5, _1227 + GoToIfEq FR_VAR_0x8010, 6, _12D4 + GoToIfEq FR_VAR_0x8010, 7, _136D + GoToIfEq FR_VAR_0x8010, 8, _1406 + GoToIfEq FR_VAR_0x8010, 9, _14C8 + GoToIfEq FR_VAR_0x8010, 10, _158A + GoToIfEq FR_VAR_0x8010, 11, _1641 + GoToIfEq FR_VAR_0x8010, 12, _16EE + GoToIfEq FR_VAR_0x8010, 13, _17A5 + GoToIfEq FR_VAR_0x8010, 14, _1852 + GoToIfEq FR_VAR_0x8010, 15, _1909 + GoToIfEq FR_VAR_0x8010, 16, _19A2 + GoToIfEq FR_VAR_0x8010, 17, _1A3B + GoToIfEq FR_VAR_0x8010, 18, _1B07 + GoToIfEq FR_VAR_0x8010, 19, _1B37 + GoToIfEq FR_VAR_0x8010, 20, _1B67 + GoToIfEq FR_VAR_0x8010, 21, _1B91 + GoToIfEq FR_VAR_0x8010, 22, _1BC1 + GoToIfEq FR_VAR_0x8010, 23, _1BEB + GoToIfEq FR_VAR_0x8010, 24, _1E5C + GoToIfEq FR_VAR_0x8010, 25, _1E86 + GoToIfEq FR_VAR_0x8010, 26, _1EB0 + GoToIfEq FR_VAR_0x8010, 27, _1C15 + GoToIfEq FR_VAR_0x8010, 28, _1EDA + GoToIfEq FR_VAR_0x8010, 29, _1FFC + GoToIfEq FR_VAR_0x8010, 30, _2086 + GoToIfEq FR_VAR_0x8010, 31, _1F71 End _0E93: Message BattleArcadeScene_Text_CurrentEvent Call _3288 Call _20AA - FrontierScrCmd_BF 28, 0, 0, 0x8006 - GoToIfEq 0x8006, 0, _0F1F - GoToIfEq 0x8006, 1, _0F39 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + GoToIfEq VAR_0x8006, 0, _0F1F + GoToIfEq VAR_0x8006, 1, _0F39 End _0EC8: Call _32D6 Call _21C5 - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 38, 1, 1, 0x8008 + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 FrontierScrCmd_28 3, _05E0 FrontierScrCmd_29 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _0F53 - CallIfEq 0x8006, 1, _0F59 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _0F53 + CallIfEq VAR_0x8006, 1, _0F59 PlaySoundEffect SEQ_SE_DP_DENDOU GoTo _2357 End _0F1F: - SetVar 0x8005, 24 - SetVar 0x8006, 26 - SetVar 0x800E, 25 + SetVar VAR_0x8005, 24 + SetVar VAR_0x8006, 26 + SetVar FR_VAR_0x800E, 25 GoTo _0EC8 End _0F39: - SetVar 0x8005, 24 - SetVar 0x8006, 26 - SetVar 0x800E, 27 + SetVar VAR_0x8005, 24 + SetVar VAR_0x8006, 26 + SetVar FR_VAR_0x800E, 27 GoTo _0EC8 End @@ -1527,27 +1527,27 @@ _0F5F: Call _3288 Call _20AA Call _32D6 - SetVar 0x8005, 34 - SetVar 0x8006, 35 + SetVar VAR_0x8005, 34 + SetVar VAR_0x8006, 35 Call _21A9 - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 38, 1, 1, 0x8008 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _0FC8 - CallIfEq 0x8006, 1, _0FE4 + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _0FC8 + CallIfEq VAR_0x8006, 1, _0FE4 PlaySoundEffect SEQ_SE_DP_DENDOU GoTo _2357 End _0FC8: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1000 + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1000 Message BattleArcadeScene_Text_SoloPoisoned Return _0FE4: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1006 + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1006 Message BattleArcadeScene_Text_MultiPoisoned Return @@ -1564,29 +1564,29 @@ _100C: Call _3288 Call _20AA Call _32D6 - SetVar 0x8005, 46 - SetVar 0x8006, 47 + SetVar VAR_0x8005, 46 + SetVar VAR_0x8006, 47 Call _21A9 - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 38, 1, 1, 0x8008 + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 FrontierScrCmd_28 3, _05E0 FrontierScrCmd_29 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _107F - CallIfEq 0x8006, 1, _109B + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _107F + CallIfEq VAR_0x8006, 1, _109B PlaySoundEffect SEQ_SE_DP_DENDOU GoTo _2357 End _107F: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _10B7 + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _10B7 Message BattleArcadeScene_Text_SoloParalyzed Return _109B: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _10BD + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _10BD Message BattleArcadeScene_Text_MultiParalyzed Return @@ -1603,27 +1603,27 @@ _10C3: Call _3288 Call _20AA Call _32D6 - SetVar 0x8005, 38 - SetVar 0x8006, 39 + SetVar VAR_0x8005, 38 + SetVar VAR_0x8006, 39 Call _21A9 - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 38, 1, 1, 0x8008 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _112C - CallIfEq 0x8006, 1, _1148 + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _112C + CallIfEq VAR_0x8006, 1, _1148 PlaySoundEffect SEQ_SE_DP_DENDOU GoTo _2357 End _112C: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1164 + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1164 Message BattleArcadeScene_Text_SoloBurned Return _1148: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _116A + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _116A Message BattleArcadeScene_Text_MultiBurned Return @@ -1640,29 +1640,29 @@ _1170: Call _3288 Call _20AA Call _32D6 - SetVar 0x8005, 42 - SetVar 0x8006, 43 + SetVar VAR_0x8005, 42 + SetVar VAR_0x8006, 43 Call _21A9 - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 38, 1, 1, 0x8008 + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 FrontierScrCmd_28 3, _05E0 FrontierScrCmd_29 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _11E3 - CallIfEq 0x8006, 1, _11FF + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _11E3 + CallIfEq VAR_0x8006, 1, _11FF PlaySoundEffect SEQ_SE_DP_DENDOU GoTo _2357 End _11E3: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _121B + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _121B Message BattleArcadeScene_Text_SoloAsleep Return _11FF: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1221 + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1221 Message BattleArcadeScene_Text_MultiAsleep Return @@ -1679,27 +1679,27 @@ _1227: Call _3288 Call _20AA Call _32D6 - SetVar 0x8005, 30 - SetVar 0x8006, 31 + SetVar VAR_0x8005, 30 + SetVar VAR_0x8006, 31 Call _21A9 - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 38, 1, 1, 0x8008 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _1290 - CallIfEq 0x8006, 1, _12AC + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _1290 + CallIfEq VAR_0x8006, 1, _12AC PlaySoundEffect SEQ_SE_DP_DENDOU GoTo _2357 End _1290: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _12C8 + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _12C8 Message BattleArcadeScene_Text_SoloFrozen Return _12AC: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _12CE + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _12CE Message BattleArcadeScene_Text_MultiFrozen Return @@ -1716,9 +1716,9 @@ _12D4: Call _20AA CloseMessage Call _2211 - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 15, 1, 0, 0x8008 - BufferItemName 2, 0x8008 + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 15, 1, 0, VAR_0x8008 + BufferItemName 2, VAR_0x8008 FrontierScrCmd_C6 1, 0, 1 FrontierScrCmd_C6 1, 1, 1 FrontierScrCmd_C6 1, 2, 1 @@ -1726,9 +1726,9 @@ _12D4: Message BattleArcadeScene_Text_HereYouGo CloseMessage Call _221D - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _1358 - CallIfEq 0x8006, 1, _135E + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _1358 + CallIfEq VAR_0x8006, 1, _135E PlaySoundEffect SEQ_SE_DP_DENDOU GoTo _2357 End @@ -1738,7 +1738,7 @@ _1358: Return _135E: - FrontierScrCmd_BF 38, 1, 1, 0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 Message BattleArcadeScene_Text_MultiLoanItem Return @@ -1747,9 +1747,9 @@ _136D: Call _20AA CloseMessage Call _2211 - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 15, 1, 0, 0x8008 - BufferItemName 2, 0x8008 + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 15, 1, 0, VAR_0x8008 + BufferItemName 2, VAR_0x8008 FrontierScrCmd_C6 1, 0, 1 FrontierScrCmd_C6 1, 1, 1 FrontierScrCmd_C6 1, 2, 1 @@ -1757,9 +1757,9 @@ _136D: Message BattleArcadeScene_Text_HereYouGo CloseMessage Call _221D - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _13F1 - CallIfEq 0x8006, 1, _13F7 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _13F1 + CallIfEq VAR_0x8006, 1, _13F7 PlaySoundEffect SEQ_SE_DP_DENDOU GoTo _2357 End @@ -1769,7 +1769,7 @@ _13F1: Return _13F7: - FrontierScrCmd_BF 38, 1, 1, 0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 Message BattleArcadeScene_Text_MultiLoanItem Return @@ -1777,34 +1777,34 @@ _1406: Message BattleArcadeScene_Text_CurrentEvent Call _3288 Call _20AA - FrontierScrCmd_BF 28, 0, 0, 0x8006 - GoToIfEq 0x8006, 0, _1488 - GoToIfEq 0x8006, 1, _14A2 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + GoToIfEq VAR_0x8006, 0, _1488 + GoToIfEq VAR_0x8006, 1, _14A2 End _143B: Call _32D6 Call _21C5 - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 38, 1, 1, 0x8008 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _14BC - CallIfEq 0x8006, 1, _14C2 + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _14BC + CallIfEq VAR_0x8006, 1, _14C2 PlaySoundEffect SEQ_SE_DP_DENDOU GoTo _2357 End _1488: - SetVar 0x8005, 16 - SetVar 0x8006, 18 - SetVar 0x800E, 17 + SetVar VAR_0x8005, 16 + SetVar VAR_0x8006, 18 + SetVar FR_VAR_0x800E, 17 GoTo _143B End _14A2: - SetVar 0x8005, 16 - SetVar 0x8006, 18 - SetVar 0x800E, 19 + SetVar VAR_0x8005, 16 + SetVar VAR_0x8006, 18 + SetVar FR_VAR_0x800E, 19 GoTo _143B End @@ -1820,34 +1820,34 @@ _14C8: Message BattleArcadeScene_Text_CurrentEvent Call _3294 Call _2092 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - GoToIfEq 0x8006, 0, _154A - GoToIfEq 0x8006, 1, _1564 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + GoToIfEq VAR_0x8006, 0, _154A + GoToIfEq VAR_0x8006, 1, _1564 End _14FD: Call _32D6 Call _21C5 - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 38, 1, 1, 0x8008 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _157E - CallIfEq 0x8006, 1, _1584 + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _157E + CallIfEq VAR_0x8006, 1, _1584 PlaySoundEffect SEQ_SE_DP_DENDOU GoTo _2357 End _154A: - SetVar 0x8005, 20 - SetVar 0x8006, 22 - SetVar 0x800E, 21 + SetVar VAR_0x8005, 20 + SetVar VAR_0x8006, 22 + SetVar FR_VAR_0x800E, 21 GoTo _14FD End _1564: - SetVar 0x8005, 20 - SetVar 0x8006, 22 - SetVar 0x800E, 23 + SetVar VAR_0x8005, 20 + SetVar VAR_0x8006, 22 + SetVar FR_VAR_0x800E, 23 GoTo _14FD End @@ -1864,29 +1864,29 @@ _158A: Call _3294 Call _2092 Call _32D6 - SetVar 0x8005, 32 - SetVar 0x8006, 33 + SetVar VAR_0x8005, 32 + SetVar VAR_0x8006, 33 Call _21A9 - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 38, 1, 1, 0x8008 + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 FrontierScrCmd_28 3, _05E0 FrontierScrCmd_29 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _15FD - CallIfEq 0x8006, 1, _1619 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _15FD + CallIfEq VAR_0x8006, 1, _1619 PlaySoundEffect SEQ_SE_DP_DENDOU GoTo _2357 End _15FD: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1635 + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1635 Message BattleArcadeScene_Text_SoloPoisoned Return _1619: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _163B + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _163B Message BattleArcadeScene_Text_MultiPoisoned Return @@ -1903,27 +1903,27 @@ _1641: Call _3294 Call _2092 Call _32D6 - SetVar 0x8005, 44 - SetVar 0x8006, 45 + SetVar VAR_0x8005, 44 + SetVar VAR_0x8006, 45 Call _21A9 - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 38, 1, 1, 0x8008 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _16AA - CallIfEq 0x8006, 1, _16C6 + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _16AA + CallIfEq VAR_0x8006, 1, _16C6 PlaySoundEffect SEQ_SE_DP_DENDOU GoTo _2357 End _16AA: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _16E2 + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _16E2 Message BattleArcadeScene_Text_SoloParalyzed Return _16C6: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _16E8 + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _16E8 Message BattleArcadeScene_Text_MultiParalyzed Return @@ -1940,29 +1940,29 @@ _16EE: Call _3294 Call _2092 Call _32D6 - SetVar 0x8005, 36 - SetVar 0x8006, 37 + SetVar VAR_0x8005, 36 + SetVar VAR_0x8006, 37 Call _21A9 - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 38, 1, 1, 0x8008 + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 FrontierScrCmd_28 3, _05E0 FrontierScrCmd_29 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _1761 - CallIfEq 0x8006, 1, _177D + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _1761 + CallIfEq VAR_0x8006, 1, _177D PlaySoundEffect SEQ_SE_DP_DENDOU GoTo _2357 End _1761: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1799 + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1799 Message BattleArcadeScene_Text_SoloBurned Return _177D: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _179F + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _179F Message BattleArcadeScene_Text_MultiBurned Return @@ -1979,27 +1979,27 @@ _17A5: Call _3294 Call _2092 Call _32D6 - SetVar 0x8005, 40 - SetVar 0x8006, 41 + SetVar VAR_0x8005, 40 + SetVar VAR_0x8006, 41 Call _21A9 - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 38, 1, 1, 0x8008 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _180E - CallIfEq 0x8006, 1, _182A + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _180E + CallIfEq VAR_0x8006, 1, _182A PlaySoundEffect SEQ_SE_DP_DENDOU GoTo _2357 End _180E: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1846 + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1846 Message BattleArcadeScene_Text_SoloAsleep Return _182A: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _184C + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _184C Message BattleArcadeScene_Text_MultiAsleep Return @@ -2016,29 +2016,29 @@ _1852: Call _3294 Call _2092 Call _32D6 - SetVar 0x8005, 28 - SetVar 0x8006, 29 + SetVar VAR_0x8005, 28 + SetVar VAR_0x8006, 29 Call _21A9 - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 38, 1, 1, 0x8008 + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 FrontierScrCmd_28 3, _05E0 FrontierScrCmd_29 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _18C5 - CallIfEq 0x8006, 1, _18E1 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _18C5 + CallIfEq VAR_0x8006, 1, _18E1 PlaySoundEffect SEQ_SE_DP_DENDOU GoTo _2357 End _18C5: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _18FD + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _18FD Message BattleArcadeScene_Text_SoloFrozen Return _18E1: - FrontierScrCmd_BF 47, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1903 + FrontierScrCmd_BF 47, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1903 Message BattleArcadeScene_Text_MultiFrozen Return @@ -2055,9 +2055,9 @@ _1909: Call _2092 CloseMessage Call _21ED - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 15, 0, 0, 0x8008 - BufferItemName 2, 0x8008 + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 15, 0, 0, VAR_0x8008 + BufferItemName 2, VAR_0x8008 FrontierScrCmd_C6 0, 0, 1 FrontierScrCmd_C6 0, 1, 1 FrontierScrCmd_C6 0, 2, 1 @@ -2065,9 +2065,9 @@ _1909: Message BattleArcadeScene_Text_HereYouGo CloseMessage Call _21F9 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _198D - CallIfEq 0x8006, 1, _1993 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _198D + CallIfEq VAR_0x8006, 1, _1993 PlaySoundEffect SEQ_SE_DP_DENDOU GoTo _2357 End @@ -2077,7 +2077,7 @@ _198D: Return _1993: - FrontierScrCmd_BF 38, 1, 1, 0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 Message BattleArcadeScene_Text_MultiLoanItem Return @@ -2086,9 +2086,9 @@ _19A2: Call _2092 CloseMessage Call _21ED - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 15, 0, 0, 0x8008 - BufferItemName 2, 0x8008 + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 15, 0, 0, VAR_0x8008 + BufferItemName 2, VAR_0x8008 FrontierScrCmd_C6 0, 0, 1 FrontierScrCmd_C6 0, 1, 1 FrontierScrCmd_C6 0, 2, 1 @@ -2096,9 +2096,9 @@ _19A2: Message BattleArcadeScene_Text_HereYouGo CloseMessage Call _21F9 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _1A26 - CallIfEq 0x8006, 1, _1A2C + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _1A26 + CallIfEq VAR_0x8006, 1, _1A2C PlaySoundEffect SEQ_SE_DP_DENDOU GoTo _2357 End @@ -2108,7 +2108,7 @@ _1A26: Return _1A2C: - FrontierScrCmd_BF 38, 1, 1, 0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 Message BattleArcadeScene_Text_MultiLoanItem Return @@ -2116,36 +2116,36 @@ _1A3B: Message BattleArcadeScene_Text_CurrentEvent Call _3294 Call _2092 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - GoToIfEq 0x8006, 0, _1AC7 - GoToIfEq 0x8006, 1, _1AE1 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + GoToIfEq VAR_0x8006, 0, _1AC7 + GoToIfEq VAR_0x8006, 1, _1AE1 End _1A70: Call _32D6 Call _21C5 - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 38, 1, 1, 0x8008 + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 FrontierScrCmd_28 3, _05E0 FrontierScrCmd_29 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _1AFB - CallIfEq 0x8006, 1, _1B01 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _1AFB + CallIfEq VAR_0x8006, 1, _1B01 PlaySoundEffect SEQ_SE_DP_DENDOU GoTo _2357 End _1AC7: - SetVar 0x8005, 12 - SetVar 0x8006, 14 - SetVar 0x800E, 13 + SetVar VAR_0x8005, 12 + SetVar VAR_0x8006, 14 + SetVar FR_VAR_0x800E, 13 GoTo _1A70 End _1AE1: - SetVar 0x8005, 12 - SetVar 0x8006, 14 - SetVar 0x800E, 15 + SetVar VAR_0x8005, 12 + SetVar VAR_0x8006, 14 + SetVar FR_VAR_0x800E, 15 GoTo _1A70 End @@ -2229,63 +2229,63 @@ _1BEB: _1C15: Message BattleArcadeScene_Text_CurrentEvent Call _20D4 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _1DEC - CallIfEq 0x8006, 1, _1E00 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _1DEC + CallIfEq VAR_0x8006, 1, _1E00 FrontierScrCmd_31 4, 2 FrontierScrCmd_31 5, 6 FrontierScrCmd_31 6, 3 FrontierScrCmd_31 7, 7 PlaySoundEffect SEQ_SE_DP_Z_SEARCH - FrontierScrCmd_BF 41, 0, 3, 0x8008 - FrontierScrCmd_BF 42, 0, 3, 0x8008 + FrontierScrCmd_BF 41, 0, 3, VAR_0x8008 + FrontierScrCmd_BF 42, 0, 3, VAR_0x8008 FrontierScrCmd_C6 0, 3, 0 FrontierScrCmd_C6 1, 3, 0 - WaitTime 14, 0x8008 - FrontierScrCmd_BF 41, 0, 2, 0x8008 - FrontierScrCmd_BF 42, 0, 2, 0x8008 + WaitTime 14, VAR_0x8008 + FrontierScrCmd_BF 41, 0, 2, VAR_0x8008 + FrontierScrCmd_BF 42, 0, 2, VAR_0x8008 FrontierScrCmd_C6 0, 2, 0 FrontierScrCmd_C6 1, 2, 0 - WaitTime 14, 0x8008 - FrontierScrCmd_BF 41, 0, 1, 0x8008 - FrontierScrCmd_BF 42, 0, 1, 0x8008 + WaitTime 14, VAR_0x8008 + FrontierScrCmd_BF 41, 0, 1, VAR_0x8008 + FrontierScrCmd_BF 42, 0, 1, VAR_0x8008 FrontierScrCmd_C6 0, 1, 0 FrontierScrCmd_C6 1, 1, 0 - WaitTime 14, 0x8008 - FrontierScrCmd_BF 41, 0, 0, 0x8008 - FrontierScrCmd_BF 42, 0, 0, 0x8008 + WaitTime 14, VAR_0x8008 + FrontierScrCmd_BF 41, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 42, 0, 0, VAR_0x8008 FrontierScrCmd_C6 0, 0, 0 FrontierScrCmd_C6 1, 0, 0 - WaitTime 14, 0x8008 - FrontierScrCmd_BF 25, 0, 0, 0x8008 + WaitTime 14, VAR_0x8008 + FrontierScrCmd_BF 25, 0, 0, VAR_0x8008 PlaySoundEffect SEQ_SE_DP_Z_SEARCH - FrontierScrCmd_BF 41, 1, 0, 0x8008 - FrontierScrCmd_BF 42, 1, 0, 0x8008 + FrontierScrCmd_BF 41, 1, 0, VAR_0x8008 + FrontierScrCmd_BF 42, 1, 0, VAR_0x8008 FrontierScrCmd_C6 0, 0, 1 FrontierScrCmd_C6 1, 0, 1 - WaitTime 14, 0x8008 - FrontierScrCmd_BF 41, 1, 1, 0x8008 - FrontierScrCmd_BF 42, 1, 1, 0x8008 + WaitTime 14, VAR_0x8008 + FrontierScrCmd_BF 41, 1, 1, VAR_0x8008 + FrontierScrCmd_BF 42, 1, 1, VAR_0x8008 FrontierScrCmd_C6 0, 1, 1 FrontierScrCmd_C6 1, 1, 1 - WaitTime 14, 0x8008 - FrontierScrCmd_BF 41, 1, 2, 0x8008 - FrontierScrCmd_BF 42, 1, 2, 0x8008 + WaitTime 14, VAR_0x8008 + FrontierScrCmd_BF 41, 1, 2, VAR_0x8008 + FrontierScrCmd_BF 42, 1, 2, VAR_0x8008 FrontierScrCmd_C6 0, 2, 1 FrontierScrCmd_C6 1, 2, 1 - WaitTime 14, 0x8008 - FrontierScrCmd_BF 41, 1, 3, 0x8008 - FrontierScrCmd_BF 42, 1, 3, 0x8008 + WaitTime 14, VAR_0x8008 + FrontierScrCmd_BF 41, 1, 3, VAR_0x8008 + FrontierScrCmd_BF 42, 1, 3, VAR_0x8008 FrontierScrCmd_C6 0, 3, 1 FrontierScrCmd_C6 1, 3, 1 - WaitTime 14, 0x8008 + WaitTime 14, VAR_0x8008 FrontierScrCmd_28 3, _05E0 FrontierScrCmd_29 Message BattleArcadeScene_Text_PokemonSwap StopSoundEffect SEQ_SE_DP_Z_SEARCH - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _1E24 - CallIfEq 0x8006, 1, _1E38 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _1E24 + CallIfEq VAR_0x8006, 1, _1E38 PlaySoundEffect SEQ_SE_DP_DENDOU GoTo _2357 End @@ -2356,17 +2356,17 @@ _1EDA: Call _2092 CloseMessage Call _21ED - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 38, 1, 1, 0x8008 - FrontierScrCmd_BF 12, 0, 0, 0x8008 - AddToRecordValue RECORD_UNK_067, 0x8008 - GiveBattlePoints 0x8008 - BufferNumber 2, 0x8008 + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 + FrontierScrCmd_BF 12, 0, 0, VAR_0x8008 + AddToRecordValue RECORD_UNK_067, VAR_0x8008 + GiveBattlePoints VAR_0x8008 + BufferNumber 2, VAR_0x8008 StopSoundEffect SEQ_SE_DP_DENDOU PlayFanfare SEQ_PL_DON2 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _1F65 - CallIfEq 0x8006, 1, _1F6B + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _1F65 + CallIfEq VAR_0x8006, 1, _1F6B WaitFanfare CloseMessage Call _2205 @@ -2390,17 +2390,17 @@ _1F71: Call _2092 CloseMessage Call _21ED - FrontierScrCmd_BF 38, 0, 0, 0x8008 - FrontierScrCmd_BF 38, 1, 1, 0x8008 - FrontierScrCmd_BF 12, 0, 0, 0x8008 - AddToRecordValue RECORD_UNK_067, 0x8008 - GiveBattlePoints 0x8008 - BufferNumber 2, 0x8008 + FrontierScrCmd_BF 38, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 38, 1, 1, VAR_0x8008 + FrontierScrCmd_BF 12, 0, 0, VAR_0x8008 + AddToRecordValue RECORD_UNK_067, VAR_0x8008 + GiveBattlePoints VAR_0x8008 + BufferNumber 2, VAR_0x8008 StopSoundEffect SEQ_SE_DP_DENDOU PlayFanfare SEQ_PL_DON2 - FrontierScrCmd_BF 28, 0, 0, 0x8006 - CallIfEq 0x8006, 0, _1F65 - CallIfEq 0x8006, 1, _1F6B + FrontierScrCmd_BF 28, 0, 0, VAR_0x8006 + CallIfEq VAR_0x8006, 0, _1F65 + CallIfEq VAR_0x8006, 1, _1F6B WaitFanfare CloseMessage Call _2205 @@ -2412,7 +2412,7 @@ _1F71: End _1FFC: - SetVar 0x800D, 1 + SetVar VAR_0x800D, 1 Message BattleArcadeScene_Text_CurrentEvent Call _20AA CloseMessage @@ -2420,9 +2420,9 @@ _1FFC: Call _2668 Call _3288 Message BattleArcadeScene_Text_SkipBattle - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 0, _2049 - GoToIfEq 0x8008, 1, _2053 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _2049 + GoToIfEq VAR_0x8008, 1, _2053 End _2049: @@ -2431,7 +2431,7 @@ _2049: End _2053: - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 147 ClearReceivedTempDataAllPlayers @@ -2442,7 +2442,7 @@ _2069: CloseMessage FrontierScrCmd_28 3, _05B4 FrontierScrCmd_29 - FrontierScrCmd_BF 46, 0, 0, 0x8008 + FrontierScrCmd_BF 46, 0, 0, VAR_0x8008 GoTo _26BC End @@ -2454,25 +2454,25 @@ _2086: _2092: Call _0CAE PlaySoundEffect SEQ_SE_PL_FR05 - WaitTime 45, 0x8008 + WaitTime 45, VAR_0x8008 Call _0CCA Return _20AA: - FrontierScrCmd_BF 28, 0, 0, 0x8005 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8005 Call _0CBC PlaySoundEffect SEQ_SE_PL_FR05 - WaitTime 45, 0x8008 - FrontierScrCmd_BF 28, 0, 0, 0x8005 + WaitTime 45, VAR_0x8008 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8005 Call _0CD0 Return _20D4: - FrontierScrCmd_BF 28, 0, 0, 0x8005 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8005 Call _0CAE Call _0CBC PlaySoundEffect SEQ_SE_PL_FR05 - WaitTime 45, 0x8008 + WaitTime 45, VAR_0x8008 Call _0CCA Call _0CD0 Return @@ -2481,7 +2481,7 @@ _2101: PlaySoundEffect SEQ_SE_PL_FR04 FrontierScrCmd_43 0, 6 FrontierScrCmd_43 0, 7 - WaitTime 60, 0x8008 + WaitTime 60, VAR_0x8008 WaitSoundEffect SEQ_SE_PL_FR04 Return @@ -2489,7 +2489,7 @@ _211D: PlaySoundEffect SEQ_SE_PL_FR04 FrontierScrCmd_43 0, 8 FrontierScrCmd_43 0, 9 - WaitTime 60, 0x8008 + WaitTime 60, VAR_0x8008 WaitSoundEffect SEQ_SE_PL_FR04 Return @@ -2497,7 +2497,7 @@ _2139: PlaySoundEffect SEQ_SE_PL_FR04 FrontierScrCmd_43 0, 10 FrontierScrCmd_43 0, 11 - WaitTime 60, 0x8008 + WaitTime 60, VAR_0x8008 WaitSoundEffect SEQ_SE_PL_FR04 Return @@ -2505,7 +2505,7 @@ _2155: PlaySoundEffect SEQ_SE_PL_FR03 FrontierScrCmd_43 0, 0 FrontierScrCmd_43 0, 1 - WaitTime 60, 0x8008 + WaitTime 60, VAR_0x8008 WaitSoundEffect SEQ_SE_PL_FR03 Return @@ -2513,7 +2513,7 @@ _2171: PlaySoundEffect SEQ_SE_PL_FR03 FrontierScrCmd_43 0, 2 FrontierScrCmd_43 0, 3 - WaitTime 60, 0x8008 + WaitTime 60, VAR_0x8008 WaitSoundEffect SEQ_SE_PL_FR03 Return @@ -2521,24 +2521,24 @@ _218D: PlaySoundEffect SEQ_SE_PL_FR03 FrontierScrCmd_43 0, 4 FrontierScrCmd_43 0, 5 - WaitTime 60, 0x8008 + WaitTime 60, VAR_0x8008 WaitSoundEffect SEQ_SE_PL_FR03 Return _21A9: PlaySoundEffect SEQ_SE_PL_FR04 - FrontierScrCmd_43 0, 0x8005 - FrontierScrCmd_43 0, 0x8006 - WaitTime 60, 0x8008 + FrontierScrCmd_43 0, VAR_0x8005 + FrontierScrCmd_43 0, VAR_0x8006 + WaitTime 60, VAR_0x8008 WaitSoundEffect SEQ_SE_PL_FR04 Return _21C5: PlaySoundEffect SEQ_SE_PL_FR04 - FrontierScrCmd_43 0, 0x8005 - FrontierScrCmd_43 0, 0x8006 - FrontierScrCmd_43 0, 0x800E - WaitTime 60, 0x8008 + FrontierScrCmd_43 0, VAR_0x8005 + FrontierScrCmd_43 0, VAR_0x8006 + FrontierScrCmd_43 0, FR_VAR_0x800E + WaitTime 60, VAR_0x8008 WaitSoundEffect SEQ_SE_PL_FR04 Return @@ -2572,8 +2572,8 @@ _221D: Return _2229: - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _224F + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _224F GoTo _2247 End @@ -2589,49 +2589,49 @@ _224F: End _225F: - WaitTime 1, 0x8008 - FrontierScrCmd_BF 6, 0, 0, 0x8008 - WaitTime 1, 0x8008 + WaitTime 1, VAR_0x8008 + FrontierScrCmd_BF 6, 0, 0, VAR_0x8008 + WaitTime 1, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 180 ClearReceivedTempDataAllPlayers Return _227E: - WaitTime 1, 0x8008 - FrontierScrCmd_BF 6, 0, 0, 0x8008 - WaitTime 1, 0x8008 + WaitTime 1, VAR_0x8008 + FrontierScrCmd_BF 6, 0, 0, VAR_0x8008 + WaitTime 1, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 181 ClearReceivedTempDataAllPlayers Return _229D: - WaitTime 1, 0x8008 - FrontierScrCmd_BF 6, 0, 0, 0x8008 - WaitTime 1, 0x8008 + WaitTime 1, VAR_0x8008 + FrontierScrCmd_BF 6, 0, 0, VAR_0x8008 + WaitTime 1, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 182 ClearReceivedTempDataAllPlayers Return _22BC: - WaitTime 1, 0x8008 - FrontierScrCmd_BF 6, 0, 0, 0x8008 - WaitTime 1, 0x8008 + WaitTime 1, VAR_0x8008 + FrontierScrCmd_BF 6, 0, 0, VAR_0x8008 + WaitTime 1, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 183 ClearReceivedTempDataAllPlayers Return _22DB: - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _2337 - FrontierScrCmd_BF 48, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _2FC0 - GoToIfEq 0x8008, 2, _2FD9 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _2337 + FrontierScrCmd_BF 48, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _2FC0 + GoToIfEq VAR_0x8008, 2, _2FD9 Call _32A0 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 Call _2462 FrontierScrCmd_28 98, _02D4 FrontierScrCmd_29 @@ -2647,9 +2647,9 @@ _2337: Return _2357: - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 0, _237C - GoToIfEq 0x8008, 1, _23CC + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _237C + GoToIfEq VAR_0x8008, 1, _23CC End _237C: @@ -2660,10 +2660,10 @@ _237C: Message BattleArcadeScene_Text_BattleStart WaitABPress CloseMessage - WaitTime 15, 0x8008 + WaitTime 15, VAR_0x8008 FrontierScrCmd_28 98, _0288 FrontierScrCmd_29 - FrontierScrCmd_BF 40, 0, 0, 0x8008 + FrontierScrCmd_BF 40, 0, 0, VAR_0x8008 FrontierScrCmd_C4 0 WaitABPress CloseMessage @@ -2683,20 +2683,20 @@ _23CC: FrontierScrCmd_28 3, _05B4 FrontierScrCmd_29 MessageNoSkip BattleArcadeScene_Text_BattleStart - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 CloseMessage - WaitTime 15, 0x8008 + WaitTime 15, VAR_0x8008 FrontierScrCmd_28 98, _0288 FrontierScrCmd_29 - FrontierScrCmd_BF 40, 0, 0, 0x8008 + FrontierScrCmd_BF 40, 0, 0, VAR_0x8008 FrontierScrCmd_C4 0 - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 CloseMessage FrontierScrCmd_28 99, _0288 FrontierScrCmd_29 - FrontierScrCmd_BF 40, 0, 0, 0x8008 + FrontierScrCmd_BF 40, 0, 0, VAR_0x8008 FrontierScrCmd_C4 1 - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 CloseMessage FrontierScrCmd_28 1, _0310 FrontierScrCmd_28 2, _0310 @@ -2708,30 +2708,30 @@ _23CC: End _2462: - FrontierScrCmd_BF 20, 0, 0, 0x8008 - SetVar 0x800B, 0x8008 + FrontierScrCmd_BF 20, 0, 0, VAR_0x8008 + SetVar VAR_0x800B, VAR_0x8008 Call _3466 Return _2479: - FrontierScrCmd_BF 20, 0, 0, 0x8008 - SetVar 0x800B, 0x8008 - FrontierScrCmd_BF 20, 1, 0, 0x8008 - SetVar 0x800C, 0x8008 + FrontierScrCmd_BF 20, 0, 0, VAR_0x8008 + SetVar VAR_0x800B, VAR_0x8008 + FrontierScrCmd_BF 20, 1, 0, VAR_0x8008 + SetVar VAR_0x800C, VAR_0x8008 Call _347D Return _249F: - SetVar 0x800B, 218 + SetVar VAR_0x800B, 218 Call _3466 Return _24AD: - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _2506 - FrontierScrCmd_BF 48, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _24F2 - GoToIfEq 0x8008, 2, _24F2 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _2506 + FrontierScrCmd_BF 48, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _24F2 + GoToIfEq VAR_0x8008, 2, _24F2 FrontierScrCmd_3F 2 GoTo _251C End @@ -2754,12 +2754,12 @@ _2506: _251C: Call _32A0 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 Call _2F24 Call _2F4A - FrontierScrCmd_BF 48, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _2562 - GoToIfEq 0x8008, 2, _2562 + FrontierScrCmd_BF 48, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _2562 + GoToIfEq VAR_0x8008, 2, _2562 FrontierScrCmd_42 0 GoTo _2562 End @@ -2771,19 +2771,19 @@ _2562: FrontierScrCmd_BC FrontierScrCmd_BB Call _2EB2 - FrontierScrCmd_BF 37, 0, 0, 0x8008 + FrontierScrCmd_BF 37, 0, 0, VAR_0x8008 Call _3246 Call _32CB Call _32EA FadeScreenIn - FrontierScrCmd_C0 0x8008 - GoToIfEq 0x8008, 0, _2D52 + FrontierScrCmd_C0 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _2D52 IncrementRecordValue RECORD_UNK_063 - FrontierScrCmd_BF 48, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _31DE - GoToIfEq 0x8008, 2, _3212 + FrontierScrCmd_BF 48, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _31DE + GoToIfEq VAR_0x8008, 2, _3212 Call _32A0 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 GoTo _25EE End @@ -2793,13 +2793,13 @@ _25EE: End _25FC: - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _262E + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _262E FrontierScrCmd_28 98, _03F0 FrontierScrCmd_28 4, _0414 FrontierScrCmd_29 FrontierScrCmd_25 98 - FrontierScrCmd_23 0x800B + FrontierScrCmd_23 VAR_0x800B Return _262E: @@ -2811,17 +2811,17 @@ _262E: FrontierScrCmd_29 FrontierScrCmd_25 98 FrontierScrCmd_25 99 - FrontierScrCmd_23 0x800B - FrontierScrCmd_23 0x800C + FrontierScrCmd_23 VAR_0x800B + FrontierScrCmd_23 VAR_0x800C Return _2668: - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _2692 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _2692 FrontierScrCmd_28 98, _0408 FrontierScrCmd_29 FrontierScrCmd_25 98 - FrontierScrCmd_23 0x800B + FrontierScrCmd_23 VAR_0x800B Return _2692: @@ -2831,8 +2831,8 @@ _2692: FrontierScrCmd_29 FrontierScrCmd_25 98 FrontierScrCmd_25 99 - FrontierScrCmd_23 0x800B - FrontierScrCmd_23 0x800C + FrontierScrCmd_23 VAR_0x800B + FrontierScrCmd_23 VAR_0x800C Return _26BC: @@ -2850,30 +2850,30 @@ _26CC: End _26E0: - FrontierScrCmd_BF 14, 1, 0, 0x8008 - FrontierScrCmd_BF 5, 0, 0, 0x8008 + FrontierScrCmd_BF 14, 1, 0, VAR_0x8008 + FrontierScrCmd_BF 5, 0, 0, VAR_0x8008 Return _26F4: - FrontierScrCmd_BF 28, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _0860 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _0860 Return _270C: - FrontierScrCmd_BF 23, 0, 0, 0x8008 - GoToIfNe 0x8008, 7, _27DC + FrontierScrCmd_BF 23, 0, 0, VAR_0x8008 + GoToIfNe VAR_0x8008, 7, _27DC GoTo _272A End _272A: - GoToIfGe 0x800D, 1, _279A - FrontierScrCmd_71 0x8008 - GoToIfEq 0x8008, 0, _2780 - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _2C4E - CallIfEq 0x8008, 1, _2C54 - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _279A + GoToIfGe VAR_0x800D, 1, _279A + FrontierScrCmd_71 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _2780 + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _2C4E + CallIfEq VAR_0x8008, 1, _2C54 + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _279A GoTo _278C End @@ -2888,13 +2888,13 @@ _278C: End _279A: - FrontierScrCmd_BF 22, 0, 0, 0x8008 - FrontierScrCmd_3D 0x40BF, 1 + FrontierScrCmd_BF 22, 0, 0, VAR_0x8008 + FrontierScrCmd_3D VAR_UNK_0x40BF, 1 Message BattleArcadeScene_Text_BPEarned BufferPlayerName 0 - FrontierScrCmd_BF 45, 0, 0, 0x8008 - BufferNumber 1, 0x8008 - GiveBattlePoints 0x8008 + FrontierScrCmd_BF 45, 0, 0, VAR_0x8008 + BufferNumber 1, VAR_0x8008 + GiveBattlePoints VAR_0x8008 Message BattleArcadeScene_Text_ReceiveBP PlayFanfare SEQ_PL_POINTGET3 WaitFanfare @@ -2906,12 +2906,12 @@ _27D4: End _27DC: - GoToIfGe 0x800D, 1, _28AB + GoToIfGe VAR_0x800D, 1, _28AB Call _349D FrontierScrCmd_28 97, _0640 FrontierScrCmd_29 - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _2821 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _2821 FrontierScrCmd_28 4, _0654 FrontierScrCmd_29 GoTo _283B @@ -2930,8 +2930,8 @@ _283B: WaitFanfare CloseMessage HealParty - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _2879 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _2879 FrontierScrCmd_28 97, _064C FrontierScrCmd_28 4, _065C FrontierScrCmd_29 @@ -2948,7 +2948,7 @@ _2879: _289B: FrontierScrCmd_25 97 - FrontierScrCmd_23 0x800F + FrontierScrCmd_23 FR_VAR_0x800F GoTo _28B3 End @@ -2957,80 +2957,80 @@ _28AB: End _28B3: - FrontierScrCmd_BF 48, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _2F86 - GoToIfEq 0x8008, 2, _2F86 + FrontierScrCmd_BF 48, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _2F86 + GoToIfEq VAR_0x8008, 2, _2F86 GoTo _28DE End _28DE: Call _32A0 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 GoTo _28F1 End _28F1: Call _32A0 - BufferNumber 0, 0x8008 - FrontierScrCmd_BF 23, 0, 0, 0x8008 - AddVar 0x8008, 1 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 + FrontierScrCmd_BF 23, 0, 0, VAR_0x8008 + AddVar VAR_0x8008, 1 + BufferNumber 0, VAR_0x8008 Message BattleArcadeScene_Text_AreYouReady GoTo _291C End _291C: - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _2954 - GoToIfEq 0x800D, 1, _29A3 - GoToIfEq 0x8003, 0, _29B1 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _2954 + GoToIfEq VAR_0x800D, 1, _29A3 + GoToIfEq VAR_0x8003, 0, _29B1 GoTo _29A3 End _2954: - FrontierScrCmd_71 0x8008 - GoToIfEq 0x8008, 0, _2987 - GoToIfEq 0x800D, 1, _2987 - GoToIfEq 0x8003, 0, _2995 + FrontierScrCmd_71 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _2987 + GoToIfEq VAR_0x800D, 1, _2987 + GoToIfEq VAR_0x8003, 0, _2995 GoTo _2987 End _2987: - SetVar 0x8008, 1 + SetVar VAR_0x8008, 1 GoTo _29BF End _2995: - SetVar 0x8008, 2 + SetVar VAR_0x8008, 2 GoTo _29BF End _29A3: - SetVar 0x8008, 3 + SetVar VAR_0x8008, 3 GoTo _29BF End _29B1: - SetVar 0x8008, 4 + SetVar VAR_0x8008, 4 GoTo _29BF End _29BF: - GoToIfEq 0x8008, 1, _29F5 - GoToIfEq 0x8008, 2, _2A10 - GoToIfEq 0x8008, 3, _2A33 - GoToIfEq 0x8008, 4, _2A56 + GoToIfEq VAR_0x8008, 1, _29F5 + GoToIfEq VAR_0x8008, 2, _2A10 + GoToIfEq VAR_0x8008, 3, _2A33 + GoToIfEq VAR_0x8008, 4, _2A56 End _29F5: - InitLocalTextListMenu 31, 13, 0, 0, 0x800A + InitLocalTextListMenu 31, 13, 0, 0, VAR_0x800A SetMenuXOriginSide 1 AddListMenuEntry BattleArcadeScene_Text_ContinueOption, 255, 0 GoTo _2A81 End _2A10: - InitLocalTextListMenu 31, 11, 0, 0, 0x800A + InitLocalTextListMenu 31, 11, 0, 0, VAR_0x800A SetMenuXOriginSide 1 AddListMenuEntry BattleArcadeScene_Text_ContinueOption, 255, 0 AddListMenuEntry BattleArcadeScene_Text_RecordOption, 255, 1 @@ -3038,7 +3038,7 @@ _2A10: End _2A33: - InitLocalTextListMenu 31, 11, 0, 0, 0x800A + InitLocalTextListMenu 31, 11, 0, 0, VAR_0x800A SetMenuXOriginSide 1 AddListMenuEntry BattleArcadeScene_Text_ContinueOption, 255, 0 AddListMenuEntry BattleArcadeScene_Text_RestOption, 255, 2 @@ -3046,7 +3046,7 @@ _2A33: End _2A56: - InitLocalTextListMenu 31, 9, 0, 0, 0x800A + InitLocalTextListMenu 31, 9, 0, 0, VAR_0x800A SetMenuXOriginSide 1 AddListMenuEntry BattleArcadeScene_Text_ContinueOption, 255, 0 AddListMenuEntry BattleArcadeScene_Text_RecordOption, 255, 1 @@ -3061,17 +3061,17 @@ _2A81: End _2A93: - GoToIfEq 0x800A, 0, _2ACF - GoToIfEq 0x800A, 1, _2B8A - GoToIfEq 0x800A, 2, _2C5A - GoToIfEq 0x800A, 3, _2CB2 + GoToIfEq VAR_0x800A, 0, _2ACF + GoToIfEq VAR_0x800A, 1, _2B8A + GoToIfEq VAR_0x800A, 2, _2C5A + GoToIfEq VAR_0x800A, 3, _2CB2 GoTo _2CB2 End _2ACF: - SetVar 0x800D, 0 - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _2AF3 + SetVar VAR_0x800D, 0 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _2AF3 GoTo _2B5E End @@ -3082,13 +3082,13 @@ _2AF3: End _2B02: - SetVar 0x8002, 3 - FrontierScrCmd_C1 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _2B02 - FrontierScrCmd_C2 0x8002 + SetVar VAR_0x8002, 3 + FrontierScrCmd_C1 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _2B02 + FrontierScrCmd_C2 VAR_0x8002 ClearReceivedTempDataAllPlayers - FrontierScrCmd_BF 24, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _2B49 + FrontierScrCmd_BF 24, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _2B49 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 142 ClearReceivedTempDataAllPlayers @@ -3098,25 +3098,25 @@ _2B02: _2B49: BufferPartnerName 0 MessageNoSkip BattleArcadeScene_Text_PartnerRetired - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 GoTo _2D19 End _2B5E: - SetVar 0x8003, 0 + SetVar VAR_0x8003, 0 FrontierScrCmd_BE - WaitTime 1, 0x8008 - FrontierScrCmd_BF 28, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _0A2D + WaitTime 1, VAR_0x8008 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _0A2D GoTo _0B20 End _2B8A: - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _2C4E - CallIfEq 0x8008, 1, _2C54 - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _2BD0 + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _2C4E + CallIfEq VAR_0x8008, 1, _2C54 + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _2BD0 GoTo _2BC2 End @@ -3136,12 +3136,12 @@ _2BD8: _2BE6: Call _2BFA - AddVar 0x8009, 1 + AddVar VAR_0x8009, 1 GoTo _2C05 End _2BFA: - FrontierScrCmd_BF 4, 0, 0, 0x8009 + FrontierScrCmd_BF 4, 0, 0, VAR_0x8009 Return _2C05: @@ -3149,13 +3149,13 @@ _2C05: End _2C0D: - SetVar 0x8003, 1 + SetVar VAR_0x8003, 1 MessageInstant BattleArcadeScene_Text_Saving - FrontierScrCmd_BF 17, 0, 0, 0x8008 + FrontierScrCmd_BF 17, 0, 0, VAR_0x8008 ShowSavingIcon - FrontierScrCmd_6D 6, 0x8008, 0x8009, 0x8009 + FrontierScrCmd_6D 6, VAR_0x8008, VAR_0x8009, VAR_0x8009 HideSavingIcon - GoToIfEq 0x8009, 1, _2C41 + GoToIfEq VAR_0x8009, 1, _2C41 Message BattleArcadeScene_Text_VideoSaveFailed Return @@ -3175,20 +3175,20 @@ _2C54: _2C5A: Message BattleArcadeScene_Text_BreakQuestion - ShowYesNoMenu 0x8008, MENU_YES - GoToIfEq 0x8008, 1, _2CAA + ShowYesNoMenu VAR_0x8008, MENU_YES + GoToIfEq VAR_0x8008, 1, _2CAA GoTo _2C78 End _2C78: - FrontierScrCmd_3D 0x40BF, 2 - FrontierScrCmd_BF 10, 0, 0, 0x8008 + FrontierScrCmd_3D VAR_UNK_0x40BF, 2 + FrontierScrCmd_BF 10, 0, 0, VAR_0x8008 FrontierScrCmd_6F FrontierScrCmd_BA Call _2E9C FadeScreenOut CloseMessage - FrontierScrCmd_BF 7, 0, 0, 0x8008 + FrontierScrCmd_BF 7, 0, 0, VAR_0x8008 End _2CAA: @@ -3197,10 +3197,10 @@ _2CAA: _2CB2: Message BattleArcadeScene_Text_RetireQuestion - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _2D4A - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _2CEA + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _2D4A + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _2CEA Message BattleArcadeScene_Text_ReturnItems GoTo _2D31 End @@ -3211,9 +3211,9 @@ _2CEA: End _2CF6: - SetVar 0x8002, 3 - FrontierScrCmd_C1 0x8002, 1, 0x8008 - GoToIfEq 0x8008, 0, _2CF6 + SetVar VAR_0x8002, 3 + FrontierScrCmd_C1 VAR_0x8002, 1, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _2CF6 GoTo _2D19 End @@ -3227,8 +3227,8 @@ _2D19: End _2D31: - FrontierScrCmd_BF 21, 0, 0, 0x8008 - FrontierScrCmd_3D 0x40BF, 3 + FrontierScrCmd_BF 21, 0, 0, VAR_0x8008 + FrontierScrCmd_3D VAR_UNK_0x40BF, 3 GoTo _2E0A End @@ -3240,13 +3240,13 @@ _2D4A: End _2D52: - FrontierScrCmd_71 0x8008 - GoToIfEq 0x8008, 0, _2D9B - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _2C4E - CallIfEq 0x8008, 1, _2C54 - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _2DB5 + FrontierScrCmd_71 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _2D9B + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _2C4E + CallIfEq VAR_0x8008, 1, _2C54 + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _2DB5 GoTo _2DA7 End @@ -3265,15 +3265,15 @@ _2DB5: End _2DBD: - FrontierScrCmd_BF 21, 0, 0, 0x8008 - FrontierScrCmd_3D 0x40BF, 3 + FrontierScrCmd_BF 21, 0, 0, VAR_0x8008 + FrontierScrCmd_3D VAR_UNK_0x40BF, 3 GoTo _2DD4 End _2DD4: Message BattleArcadeScene_Text_ReturnItems - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _2DF6 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _2DF6 GoTo _2E0A End @@ -3292,16 +3292,16 @@ _2E0A: End _2E1A: - FrontierScrCmd_BF 28, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _2E86 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _2E86 FadeScreenOut Call _2F5E Call _2F4A Call _3272 - FrontierScrCmd_BF 17, 0, 0, 0x8008 - CallIfEq 0x8008, 2, _2E80 - FrontierScrCmd_BF 17, 0, 0, 0x8008 - GoToIfEq 0x8008, 3, _2E90 + FrontierScrCmd_BF 17, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 2, _2E80 + FrontierScrCmd_BF 17, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 3, _2E90 FrontierScrCmd_6F FrontierScrCmd_BA FrontierScrCmd_02 @@ -3325,68 +3325,68 @@ _2E90: _2E9C: MessageInstant BattleArcadeScene_Text_Saving2 ShowSavingIcon - FrontierScrCmd_73 0x8008 + FrontierScrCmd_73 VAR_0x8008 HideSavingIcon PlaySoundEffect SEQ_SE_DP_SAVE WaitSoundEffect SEQ_SE_DP_SAVE Return _2EB2: - FrontierScrCmd_BF 29, 0, 0, 0x8008 - FrontierScrCmd_BF 33, 0, 0, 0x8008 - FrontierScrCmd_BF 35, 0, 0, 0x8008 - FrontierScrCmd_BF 31, 0, 0, 0x8008 + FrontierScrCmd_BF 29, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 33, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 35, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 31, 0, 0, VAR_0x8008 Return _2ED8: - FrontierScrCmd_BF 35, 1, 0, 0x8008 - FrontierScrCmd_BF 31, 1, 0, 0x8008 + FrontierScrCmd_BF 35, 1, 0, VAR_0x8008 + FrontierScrCmd_BF 31, 1, 0, VAR_0x8008 Return _2EEC: - FrontierScrCmd_BF 29, 0, 0, 0x8008 - FrontierScrCmd_BF 33, 0, 0, 0x8008 - FrontierScrCmd_BF 35, 0, 0, 0x8008 - FrontierScrCmd_BF 35, 1, 0, 0x8008 - FrontierScrCmd_BF 31, 0, 0, 0x8008 - FrontierScrCmd_BF 31, 1, 0, 0x8008 + FrontierScrCmd_BF 29, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 33, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 35, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 35, 1, 0, VAR_0x8008 + FrontierScrCmd_BF 31, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 31, 1, 0, VAR_0x8008 Return _2F24: - FrontierScrCmd_BF 36, 0, 0, 0x8008 - FrontierScrCmd_BF 36, 1, 0, 0x8008 - FrontierScrCmd_BF 32, 0, 0, 0x8008 - FrontierScrCmd_BF 32, 1, 0, 0x8008 + FrontierScrCmd_BF 36, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 36, 1, 0, VAR_0x8008 + FrontierScrCmd_BF 32, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 32, 1, 0, VAR_0x8008 Return _2F4A: - FrontierScrCmd_BF 30, 0, 0, 0x8008 - FrontierScrCmd_BF 34, 0, 0, 0x8008 + FrontierScrCmd_BF 30, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 34, 0, 0, VAR_0x8008 Return _2F5E: - FrontierScrCmd_BF 36, 0, 0, 0x8008 - FrontierScrCmd_BF 32, 0, 0, 0x8008 + FrontierScrCmd_BF 36, 0, 0, VAR_0x8008 + FrontierScrCmd_BF 32, 0, 0, VAR_0x8008 Return _2F72: - FrontierScrCmd_BF 36, 1, 0, 0x8008 - FrontierScrCmd_BF 32, 1, 0, 0x8008 + FrontierScrCmd_BF 36, 1, 0, VAR_0x8008 + FrontierScrCmd_BF 32, 1, 0, VAR_0x8008 Return _2F86: - GoToIfEq 0x8003, 1, _28DE - FrontierScrCmd_BF 51, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _28DE + GoToIfEq VAR_0x8003, 1, _28DE + FrontierScrCmd_BF 51, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _28DE Call _32A0 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 Message BattleArcadeScene_Text_ArcadeStarApproaching GoTo _28F1 End _2FC0: Call _32A0 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 Call _2FF2 Message BattleArcadeScene_Text_DahliaIntro CloseMessage @@ -3394,7 +3394,7 @@ _2FC0: _2FD9: Call _32A0 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 Call _2FF2 Message BattleArcadeScene_Text_DahliaIntroGold CloseMessage @@ -3485,30 +3485,30 @@ _3198: _31DE: Call _32A0 - BufferNumber 0, 0x8008 - FrontierScrCmd_3E 0x4053, 0x8008 - CallIfEq 0x8008, 0, _320A + BufferNumber 0, VAR_0x8008 + FrontierScrCmd_3E VAR_BATTLE_ARCADE_PRINT_STATE, VAR_0x8008 + CallIfEq VAR_0x8008, 0, _320A Message BattleArcadeScene_Text_BeatDahlia CloseMessage GoTo _25EE End _320A: - FrontierScrCmd_3D 0x4053, 1 + FrontierScrCmd_3D VAR_BATTLE_ARCADE_PRINT_STATE, 1 Return _3212: Call _32A0 - BufferNumber 0, 0x8008 - FrontierScrCmd_3E 0x4053, 0x8008 - CallIfEq 0x8008, 2, _323E + BufferNumber 0, VAR_0x8008 + FrontierScrCmd_3E VAR_BATTLE_ARCADE_PRINT_STATE, VAR_0x8008 + CallIfEq VAR_0x8008, 2, _323E Message BattleArcadeScene_Text_BeatDahliaGold CloseMessage GoTo _25EE End _323E: - FrontierScrCmd_3D 0x4053, 3 + FrontierScrCmd_3D VAR_BATTLE_ARCADE_PRINT_STATE, 3 Return _3246: @@ -3540,112 +3540,112 @@ _3294: Return _32A0: - FrontierScrCmd_BF 4, 0, 0, 0x8008 - GoToIfGe 0x8008, 9999, _32BE - AddVar 0x8008, 1 + FrontierScrCmd_BF 4, 0, 0, VAR_0x8008 + GoToIfGe VAR_0x8008, 9999, _32BE + AddVar VAR_0x8008, 1 Return _32BE: Return _32C0: - FrontierScrCmd_BF 43, 8, 0, 0x8008 + FrontierScrCmd_BF 43, 8, 0, VAR_0x8008 Return _32CB: - FrontierScrCmd_BF 43, 8, 1, 0x8008 + FrontierScrCmd_BF 43, 8, 1, VAR_0x8008 Return _32D6: - FrontierScrCmd_BF 43, 0, 1, 0x8008 - FrontierScrCmd_BF 44, 0, 0, 0x8008 + FrontierScrCmd_BF 43, 0, 1, VAR_0x8008 + FrontierScrCmd_BF 44, 0, 0, VAR_0x8008 Return _32EA: - FrontierScrCmd_BF 44, 8, 3, 0x8008 - FrontierScrCmd_BF 44, 8, 98, 0x8008 - FrontierScrCmd_BF 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _331D - FrontierScrCmd_BF 44, 8, 4, 0x8008 + FrontierScrCmd_BF 44, 8, 3, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 98, VAR_0x8008 + FrontierScrCmd_BF 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _331D + FrontierScrCmd_BF 44, 8, 4, VAR_0x8008 Return _331D: - FrontierScrCmd_BF 44, 8, 1, 0x8008 - FrontierScrCmd_BF 44, 8, 2, 0x8008 - FrontierScrCmd_BF 44, 8, 99, 0x8008 + FrontierScrCmd_BF 44, 8, 1, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 2, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 99, VAR_0x8008 Return _333A: FrontierScrCmd_22 _0008 FrontierScrCmd_24 _001C - FrontierScrCmd_BF 44, 8, 20, 0x8008 - FrontierScrCmd_BF 44, 8, 4, 0x8008 + FrontierScrCmd_BF 44, 8, 20, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 4, VAR_0x8008 Return _335A: FrontierScrCmd_22 _0010 FrontierScrCmd_24 _0040 - FrontierScrCmd_BF 44, 8, 20, 0x8008 - FrontierScrCmd_BF 44, 8, 1, 0x8008 - FrontierScrCmd_BF 44, 8, 2, 0x8008 + FrontierScrCmd_BF 44, 8, 20, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 1, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 2, VAR_0x8008 Return _3383: FrontierScrCmd_22 _0070 FrontierScrCmd_24 _00A0 - FrontierScrCmd_BF 44, 8, 4, 0x8008 - FrontierScrCmd_BF 44, 8, 3, 0x8008 + FrontierScrCmd_BF 44, 8, 4, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 3, VAR_0x8008 Return _33A3: FrontierScrCmd_22 _0078 FrontierScrCmd_24 _00C4 - FrontierScrCmd_BF 44, 8, 3, 0x8008 - FrontierScrCmd_BF 44, 8, 1, 0x8008 - FrontierScrCmd_BF 44, 8, 2, 0x8008 + FrontierScrCmd_BF 44, 8, 3, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 1, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 2, VAR_0x8008 Return _33CC: FrontierScrCmd_22 _0098 FrontierScrCmd_24 _00F4 - FrontierScrCmd_BF 44, 8, 20, 0x8008 + FrontierScrCmd_BF 44, 8, 20, VAR_0x8008 Return _33E3: FrontierScrCmd_22 _0088 FrontierScrCmd_24 _0104 - FrontierScrCmd_BF 44, 8, 5, 0x8008 - FrontierScrCmd_BF 44, 8, 6, 0x8008 - FrontierScrCmd_BF 44, 8, 7, 0x8008 - FrontierScrCmd_BF 44, 8, 8, 0x8008 - FrontierScrCmd_BF 44, 8, 9, 0x8008 - FrontierScrCmd_BF 44, 8, 11, 0x8008 - FrontierScrCmd_BF 44, 8, 12, 0x8008 - FrontierScrCmd_BF 44, 8, 13, 0x8008 - FrontierScrCmd_BF 44, 8, 14, 0x8008 - FrontierScrCmd_BF 44, 8, 15, 0x8008 - FrontierScrCmd_BF 44, 8, 16, 0x8008 - FrontierScrCmd_BF 44, 8, 17, 0x8008 - FrontierScrCmd_BF 44, 8, 18, 0x8008 + FrontierScrCmd_BF 44, 8, 5, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 6, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 7, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 8, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 9, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 11, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 12, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 13, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 14, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 15, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 16, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 17, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 18, VAR_0x8008 Return _3466: FrontierScrCmd_22 _0198 FrontierScrCmd_24 _01A8 - FrontierScrCmd_BF 44, 8, 98, 0x8008 + FrontierScrCmd_BF 44, 8, 98, VAR_0x8008 Return _347D: FrontierScrCmd_22 _01A0 FrontierScrCmd_24 _01B8 - FrontierScrCmd_BF 44, 8, 98, 0x8008 - FrontierScrCmd_BF 44, 8, 99, 0x8008 + FrontierScrCmd_BF 44, 8, 98, VAR_0x8008 + FrontierScrCmd_BF 44, 8, 99, VAR_0x8008 Return _349D: FrontierScrCmd_22 _01D0 FrontierScrCmd_24 _01D8 - FrontierScrCmd_BF 44, 8, 97, 0x8008 + FrontierScrCmd_BF 44, 8, 97, VAR_0x8008 Return .balign 4, 0 diff --git a/res/field/frontier_scripts/frontier_scripts_battle_castle.s b/res/field/frontier_scripts/frontier_scripts_battle_castle.s index 727dd2395d..b6bfd0d813 100644 --- a/res/field/frontier_scripts/frontier_scripts_battle_castle.s +++ b/res/field/frontier_scripts/frontier_scripts_battle_castle.s @@ -651,16 +651,16 @@ _03BC: .short 0xFD13 _03C2: - FrontierScrCmd_3E VAR_BATTLE_CASTLE_CHALLENGE_TYPE, 0x8001 - FrontierScrCmd_3E 0x4003, 0x8003 - FrontierScrCmd_3E 0x4002, 0x8004 - FrontierScrCmd_3E 0x4005, 0x8005 - FrontierScrCmd_3E 0x4006, 0x8006 - GetPlayerObjEventGfx 0x8007 - SetVar 0x800E, 0 - GoToIfEq 0x8001, FRONTIER_CHALLENGE_MULTI, _041E - GoToIfEq 0x8001, FRONTIER_CHALLENGE_MULTI_WFC, _041E - SetVar 0x800F, 231 + FrontierScrCmd_3E VAR_BATTLE_CASTLE_CHALLENGE_TYPE, VAR_0x8001 + FrontierScrCmd_3E VAR_MAP_LOCAL_3, VAR_0x8003 + FrontierScrCmd_3E VAR_MAP_LOCAL_2, VAR_0x8004 + FrontierScrCmd_3E VAR_MAP_LOCAL_5, VAR_0x8005 + FrontierScrCmd_3E VAR_MAP_LOCAL_6, VAR_0x8006 + GetPlayerObjEventGfx VAR_0x8007 + SetVar FR_VAR_0x800E, 0 + GoToIfEq VAR_0x8001, FRONTIER_CHALLENGE_MULTI, _041E + GoToIfEq VAR_0x8001, FRONTIER_CHALLENGE_MULTI_WFC, _041E + SetVar FR_VAR_0x800F, 231 FrontierScrCmd_22 _0008 FrontierScrCmd_24 _0024 GoTo _043C @@ -668,7 +668,7 @@ _03C2: _041E: IncrementTrainerScore TRAINER_SCORE_EVENT_UNK_43 - SetVar 0x800F, 232 + SetVar FR_VAR_0x800F, 232 FrontierScrCmd_22 _0010 FrontierScrCmd_24 _0048 GoTo _043C @@ -679,9 +679,9 @@ _043C: FrontierScrCmd_24 _0078 FadeScreenIn FrontierScrCmd_6C - FrontierScrCmd_97 0x8003, 0x8001, 0x8004, 0x8005, 0x8006, 0x8008 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0480 + FrontierScrCmd_97 VAR_0x8003, VAR_0x8001, VAR_0x8004, VAR_0x8005, VAR_0x8006, VAR_0x8008 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0480 GoTo _04F0 End @@ -695,10 +695,10 @@ _0480: End _049C: - SetVar 0x8002, 0 - FrontierScrCmd_A2 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _049C - FrontierScrCmd_A3 0x8002 + SetVar VAR_0x8002, 0 + FrontierScrCmd_A2 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _049C + FrontierScrCmd_A3 VAR_0x8002 ClearReceivedTempDataAllPlayers GoTo _04F0 End @@ -708,17 +708,17 @@ _04C5: End _04CD: - SetVar 0x8002, 0 - FrontierScrCmd_A2 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _04CD - FrontierScrCmd_A3 0x8002 + SetVar VAR_0x8002, 0 + FrontierScrCmd_A2 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _04CD + FrontierScrCmd_A3 VAR_0x8002 ClearReceivedTempDataAllPlayers Return _04F0: - FrontierScrCmd_98 0x8003 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0510 + FrontierScrCmd_98 VAR_0x8003 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0510 GoTo _058A End @@ -730,10 +730,10 @@ _0510: End _0520: - SetVar 0x8002, 1 - FrontierScrCmd_A2 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _0520 - FrontierScrCmd_A3 0x8002 + SetVar VAR_0x8002, 1 + FrontierScrCmd_A2 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0520 + FrontierScrCmd_A3 VAR_0x8002 ClearReceivedTempDataAllPlayers ClearReceivedTempDataAllPlayers FrontierScrCmd_35 125 @@ -743,10 +743,10 @@ _0520: End _0555: - SetVar 0x8002, 6 - FrontierScrCmd_A2 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _0555 - FrontierScrCmd_A3 0x8002 + SetVar VAR_0x8002, 6 + FrontierScrCmd_A2 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0555 + FrontierScrCmd_A3 VAR_0x8002 ClearReceivedTempDataAllPlayers ClearReceivedTempDataAllPlayers FrontierScrCmd_35 210 @@ -756,9 +756,9 @@ _0555: End _058A: - SetVar 0x8003, 0 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _05C6 + SetVar VAR_0x8003, 0 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _05C6 FrontierScrCmd_28 0, _01F0 FrontierScrCmd_28 4, _01F0 FrontierScrCmd_28 7, _0200 @@ -776,15 +776,15 @@ _05C6: End _05F0: - FrontierScrCmd_A0 23, 0, 0, 0x8008 - GoToIfEq 0x8008, 0, _0612 - SetVar 0x8003, 1 + FrontierScrCmd_A0 23, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0612 + SetVar VAR_0x8003, 1 GoTo _1349 End _0612: - FrontierScrCmd_A0 35, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _0630 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _0630 FrontierScrCmd_9E GoTo _0679 End @@ -797,21 +797,21 @@ _0630: End _0640: - SetVar 0x8002, 3 - FrontierScrCmd_A2 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _0640 - FrontierScrCmd_A3 0x8002 + SetVar VAR_0x8002, 3 + FrontierScrCmd_A2 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0640 + FrontierScrCmd_A3 VAR_0x8002 ClearReceivedTempDataAllPlayers ClearReceivedTempDataAllPlayers FrontierScrCmd_35 214 ClearReceivedTempDataAllPlayers - FrontierScrCmd_A0 41, 0, 0, 0x8008 - FrontierScrCmd_A0 42, 0, 0, 0x8008 + FrontierScrCmd_A0 41, 0, 0, VAR_0x8008 + FrontierScrCmd_A0 42, 0, 0, VAR_0x8008 Return _0679: - FrontierScrCmd_A0 39, 0, 0, 0x8008 - GoToIfEq 0x8008, 0, _0695 + FrontierScrCmd_A0 39, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0695 GoTo _06A1 End @@ -827,11 +827,11 @@ _06A1: End _06B0: - FrontierScrCmd_A0 19, 0, 0, 0x8008 - CallIfEq 0x8008, 3, _06E4 + FrontierScrCmd_A0 19, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 3, _06E4 Message BattleCastleScene_Text_Choose - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _06EA + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _06EA GoTo _0706 End @@ -858,38 +858,38 @@ _0706: End _0714: - FrontierScrCmd_A0 19, 0, 0, 0x8006 - CallIfLt 0x8006, 3, _07A2 - CallIfGe 0x8006, 3, _07AC + FrontierScrCmd_A0 19, 0, 0, VAR_0x8006 + CallIfLt VAR_0x8006, 3, _07A2 + CallIfGe VAR_0x8006, 3, _07AC SetMenuXOriginSide 1 AddListMenuEntry BattleCastleScene_Text_SelfOption, BattleCastleScene_Text_HealOrRentItem, 1 AddListMenuEntry BattleCastleScene_Text_OpponentOption, BattleCastleScene_Text_CheckOpponentsMons, 2 AddListMenuEntry BattleCastleScene_Text_BattleOption, BattleCastleScene_Text_BattleTrainer, 4 - FrontierScrCmd_A0 19, 0, 0, 0x8006 - CallIfGe 0x8006, 3, _07D7 + FrontierScrCmd_A0 19, 0, 0, VAR_0x8006 + CallIfGe VAR_0x8006, 3, _07D7 ShowListMenu - GoToIfEq 0x8008, 1, _0804 - GoToIfEq 0x8008, 2, _08B6 - GoToIfEq 0x8008, 4, _0964 - GoToIfEq 0x8008, 5, _0A1C + GoToIfEq VAR_0x8008, 1, _0804 + GoToIfEq VAR_0x8008, 2, _08B6 + GoToIfEq VAR_0x8008, 4, _0964 + GoToIfEq VAR_0x8008, 5, _0A1C GoTo _1974 End _07A2: - InitLocalTextListMenu 31, 11, 0, 0, 0x8008 + InitLocalTextListMenu 31, 11, 0, 0, VAR_0x8008 Return _07AC: - FrontierScrCmd_A0 40, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _07A2 - GoToIfEq 0x8008, 2, _07A2 - InitLocalTextListMenu 31, 9, 0, 0, 0x8008 + FrontierScrCmd_A0 40, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _07A2 + GoToIfEq VAR_0x8008, 2, _07A2 + InitLocalTextListMenu 31, 9, 0, 0, VAR_0x8008 Return _07D7: - FrontierScrCmd_A0 40, 0, 0, 0x800D - GoToIfEq 0x800D, 1, _0802 - GoToIfEq 0x800D, 2, _0802 + FrontierScrCmd_A0 40, 0, 0, VAR_0x800D + GoToIfEq VAR_0x800D, 1, _0802 + GoToIfEq VAR_0x800D, 2, _0802 AddListMenuEntry BattleCastleScene_Text_PassOption, BattleCastleScene_Text_PassOnBattle, 5 Return @@ -897,9 +897,9 @@ _0802: Return _0804: - FrontierScrCmd_A0 32, 1, 0, 0x8008 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0827 + FrontierScrCmd_A0 32, 1, 0, VAR_0x8008 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0827 GoTo _0833 End @@ -909,18 +909,18 @@ _0827: End _0833: - FrontierScrCmd_A0 34, 0, 0, 0x8008 - FrontierScrCmd_A0 31, 0, 0, 0x8008 + FrontierScrCmd_A0 34, 0, 0, VAR_0x8008 + FrontierScrCmd_A0 31, 0, 0, VAR_0x8008 FadeScreenOut CloseMessage FrontierScrCmd_51 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _08AC + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _08AC FrontierScrCmd_9A - FrontierScrCmd_A0 35, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _09C5 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _04C5 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _09C5 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _04C5 FadeScreenIn GoTo _0706 End @@ -937,9 +937,9 @@ _08AC: Return _08B6: - FrontierScrCmd_A0 32, 2, 0, 0x8008 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _08D9 + FrontierScrCmd_A0 32, 2, 0, VAR_0x8008 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _08D9 GoTo _08E5 End @@ -949,18 +949,18 @@ _08D9: End _08E5: - FrontierScrCmd_A0 34, 0, 0, 0x8008 - FrontierScrCmd_A0 31, 0, 0, 0x8008 + FrontierScrCmd_A0 34, 0, 0, VAR_0x8008 + FrontierScrCmd_A0 31, 0, 0, VAR_0x8008 FadeScreenOut CloseMessage FrontierScrCmd_51 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _095A + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _095A FrontierScrCmd_9D - FrontierScrCmd_A0 35, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _09E2 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _04C5 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _09E2 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _04C5 FadeScreenIn GoTo _0706 End @@ -976,15 +976,15 @@ _095A: Return _0964: - FrontierScrCmd_A0 32, 4, 0, 0x8008 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _099C + FrontierScrCmd_A0 32, 4, 0, VAR_0x8008 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _099C GoTo _0987 End _0987: - SetVar 0x8005, 0 - FrontierScrCmd_A0 31, 0, 0, 0x8008 + SetVar VAR_0x8005, 0 + FrontierScrCmd_A0 31, 0, 0, VAR_0x8008 GoTo _0C47 End @@ -994,36 +994,36 @@ _099C: End _09A8: - WaitTime 1, 0x8008 - FrontierScrCmd_A0 29, 0, 0, 0x8008 - WaitTime 1, 0x8008 + WaitTime 1, VAR_0x8008 + FrontierScrCmd_A0 29, 0, 0, VAR_0x8008 + WaitTime 1, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 190 ClearReceivedTempDataAllPlayers Return _09C5: - WaitTime 1, 0x8008 - FrontierScrCmd_A0 29, 0, 0, 0x8008 - WaitTime 1, 0x8008 + WaitTime 1, VAR_0x8008 + FrontierScrCmd_A0 29, 0, 0, VAR_0x8008 + WaitTime 1, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 191 ClearReceivedTempDataAllPlayers Return _09E2: - WaitTime 1, 0x8008 - FrontierScrCmd_A0 29, 0, 0, 0x8008 - WaitTime 1, 0x8008 + WaitTime 1, VAR_0x8008 + FrontierScrCmd_A0 29, 0, 0, VAR_0x8008 + WaitTime 1, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 192 ClearReceivedTempDataAllPlayers Return _09FF: - WaitTime 1, 0x8008 - FrontierScrCmd_A0 29, 0, 0, 0x8008 - WaitTime 1, 0x8008 + WaitTime 1, VAR_0x8008 + FrontierScrCmd_A0 29, 0, 0, VAR_0x8008 + WaitTime 1, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 193 ClearReceivedTempDataAllPlayers @@ -1032,13 +1032,13 @@ _09FF: _0A1C: BufferNumber 0, 50 Message BattleCastleScene_Text_ConfirmPurchase - ShowYesNoMenu 0x8008, MENU_YES - GoToIfEq 0x8008, 1, _0714 - FrontierScrCmd_A6 0x8001, 0x8008 - GoToIfLt 0x8008, 50, _0A6D - FrontierScrCmd_A0 32, 5, 0, 0x8008 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1974 + ShowYesNoMenu VAR_0x8008, MENU_YES + GoToIfEq VAR_0x8008, 1, _0714 + FrontierScrCmd_A6 VAR_0x8001, VAR_0x8008 + GoToIfLt VAR_0x8008, 50, _0A6D + FrontierScrCmd_A0 32, 5, 0, VAR_0x8008 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1974 GoTo _0A79 End @@ -1048,30 +1048,30 @@ _0A6D: End _0A79: - SetVar 0x8005, 1 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0A9B + SetVar VAR_0x8005, 1 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0A9B GoTo _0AB8 End _0A9B: - FrontierScrCmd_A0 34, 0, 0, 0x8008 - FrontierScrCmd_A0 33, 0, 0, 0x8008 - FrontierScrCmd_A0 31, 0, 0, 0x8008 + FrontierScrCmd_A0 34, 0, 0, VAR_0x8008 + FrontierScrCmd_A0 33, 0, 0, VAR_0x8008 + FrontierScrCmd_A0 31, 0, 0, VAR_0x8008 GoTo _0C47 End _0AB8: - FrontierScrCmd_A0 17, 0, 0, 0x8008 - FrontierScrCmd_A7 0x8008, 50 + FrontierScrCmd_A0 17, 0, 0, VAR_0x8008 + FrontierScrCmd_A7 VAR_0x8008, 50 GoTo _0C47 End _0ACD: CloseMessage FrontierScrCmd_51 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0B0C + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0B0C FrontierScrCmd_28 0, _0248 FrontierScrCmd_28 3, _0274 FrontierScrCmd_28 4, _0248 @@ -1096,14 +1096,14 @@ _0B36: PlaySoundEffect SEQ_SE_DP_KAIDAN2 WaitSoundEffect SEQ_SE_DP_KAIDAN2 FadeScreenOut - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0BBA + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0BBA FrontierScrCmd_25 0 FrontierScrCmd_25 3 FrontierScrCmd_25 4 FrontierScrCmd_23 217 FrontierScrCmd_03 13 - GetPlayerObjEventGfx 0x8007 + GetPlayerObjEventGfx VAR_0x8007 FrontierScrCmd_22 _019C FrontierScrCmd_24 _01B0 FadeScreenIn @@ -1122,7 +1122,7 @@ _0BBA: FrontierScrCmd_25 3 FrontierScrCmd_23 217 FrontierScrCmd_03 13 - GetPlayerObjEventGfx 0x8007 + GetPlayerObjEventGfx VAR_0x8007 FrontierScrCmd_22 _01A4 FrontierScrCmd_24 _01C8 FadeScreenIn @@ -1138,16 +1138,16 @@ _0BBA: _0C1E: Call _10CA - FrontierScrCmd_A0 28, 0, 0, 0x8008 - FrontierScrCmd_A0 23, 0, 0, 0x8008 - GoToIfNe 0x8008, 7, _1349 + FrontierScrCmd_A0 28, 0, 0, VAR_0x8008 + FrontierScrCmd_A0 23, 0, 0, VAR_0x8008 + GoToIfNe VAR_0x8008, 7, _1349 GoTo _12D3 End _0C47: FrontierScrCmd_51 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0C7F + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0C7F Message BattleCastleScene_Text_Proceed WaitABPress CloseMessage @@ -1159,7 +1159,7 @@ _0C47: _0C7F: MessageNoSkip BattleCastleScene_Text_Proceed - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 CloseMessage FrontierScrCmd_28 0, _0228 FrontierScrCmd_28 1, _0228 @@ -1172,9 +1172,9 @@ _0CAD: PlaySoundEffect SEQ_SE_DP_KAIDAN2 WaitSoundEffect SEQ_SE_DP_KAIDAN2 FadeScreenOut - CallIfEq 0x800E, 0, _0E64 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0DA3 + CallIfEq FR_VAR_0x800E, 0, _0E64 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0DA3 FrontierScrCmd_25 0 FrontierScrCmd_25 3 FrontierScrCmd_25 4 @@ -1188,19 +1188,19 @@ _0CAD: FrontierScrCmd_28 4, _0294 FrontierScrCmd_29 FrontierScrCmd_43 0, 0 - GoToIfEq 0x8005, 1, _0E89 - FrontierScrCmd_A0 40, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1A9B - GoToIfEq 0x8008, 2, _1ABA + GoToIfEq VAR_0x8005, 1, _0E89 + FrontierScrCmd_A0 40, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1A9B + GoToIfEq VAR_0x8008, 2, _1ABA Call _1B75 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 Call _0ED1 FrontierScrCmd_28 98, _0300 FrontierScrCmd_29 - WaitTime 15, 0x8008 + WaitTime 15, VAR_0x8008 FrontierScrCmd_28 98, _0284 FrontierScrCmd_29 - FrontierScrCmd_A0 37, 0, 0, 0x8008 + FrontierScrCmd_A0 37, 0, 0, VAR_0x8008 FrontierScrCmd_A9 0 WaitABPress CloseMessage @@ -1226,23 +1226,23 @@ _0DA3: FrontierScrCmd_28 2, _02BC FrontierScrCmd_29 FrontierScrCmd_43 0, 0 - GoToIfEq 0x8005, 1, _0E89 + GoToIfEq VAR_0x8005, 1, _0E89 Call _0EEC FrontierScrCmd_28 98, _0314 FrontierScrCmd_28 99, _0328 FrontierScrCmd_29 - WaitTime 15, 0x8008 + WaitTime 15, VAR_0x8008 FrontierScrCmd_28 98, _0284 FrontierScrCmd_29 - FrontierScrCmd_A0 37, 0, 0, 0x8008 + FrontierScrCmd_A0 37, 0, 0, VAR_0x8008 FrontierScrCmd_A9 0 - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 CloseMessage FrontierScrCmd_28 99, _0284 FrontierScrCmd_29 - FrontierScrCmd_A0 37, 0, 0, 0x8008 + FrontierScrCmd_A0 37, 0, 0, VAR_0x8008 FrontierScrCmd_A9 1 - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 CloseMessage MessageNoSkip BattleCastleScene_Text_PleaseWait GoTo _0F2E @@ -1250,19 +1250,19 @@ _0DA3: _0E64: FrontierScrCmd_25 7 - FrontierScrCmd_23 0x800F - SetVar 0x800E, 1 + FrontierScrCmd_23 FR_VAR_0x800F + SetVar FR_VAR_0x800E, 1 Return _0E74: FrontierScrCmd_41 0, 6, 1 - FrontierScrCmd_A0 36, 0, 0, 0x8008 - GetPlayerObjEventGfx 0x8007 + FrontierScrCmd_A0 36, 0, 0, VAR_0x8008 + GetPlayerObjEventGfx VAR_0x8007 Return _0E89: - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0EAD + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0EAD Message BattleCastleScene_Text_UsingPass WaitABPress CloseMessage @@ -1271,7 +1271,7 @@ _0E89: _0EAD: MessageNoSkip BattleCastleScene_Text_UsingPass - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 MessageNoSkip BattleCastleScene_Text_PleaseWait Call _10CA Call _122A @@ -1280,35 +1280,35 @@ _0EAD: End _0ED1: - FrontierScrCmd_A0 20, 0, 0, 0x8008 - SetVar 0x800B, 0x8008 + FrontierScrCmd_A0 20, 0, 0, VAR_0x8008 + SetVar VAR_0x800B, VAR_0x8008 FrontierScrCmd_22 _0154 FrontierScrCmd_24 _0164 Return _0EEC: - FrontierScrCmd_A0 20, 0, 0, 0x8008 - SetVar 0x800B, 0x8008 + FrontierScrCmd_A0 20, 0, 0, VAR_0x8008 + SetVar VAR_0x800B, VAR_0x8008 FrontierScrCmd_22 _0154 - FrontierScrCmd_A0 20, 1, 0, 0x8008 - SetVar 0x800C, 0x8008 + FrontierScrCmd_A0 20, 1, 0, VAR_0x8008 + SetVar VAR_0x800C, VAR_0x8008 FrontierScrCmd_22 _015C FrontierScrCmd_24 _0174 Return _0F1A: - SetVar 0x800B, 217 + SetVar VAR_0x800B, 217 FrontierScrCmd_22 _0154 FrontierScrCmd_24 _0164 Return _0F2E: FrontierScrCmd_42 0 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0F83 - FrontierScrCmd_A0 40, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0F73 - GoToIfEq 0x8008, 2, _0F73 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0F83 + FrontierScrCmd_A0 40, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0F73 + GoToIfEq VAR_0x8008, 2, _0F73 FrontierScrCmd_3F 4 GoTo _0F99 End @@ -1330,23 +1330,23 @@ _0F83: _0F99: Call _1B75 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 FrontierScrCmd_9C FrontierScrCmd_9B FrontierScrCmd_41 0, 6, 1 FrontierScrCmd_43 0, 0 - FrontierScrCmd_A0 36, 0, 0, 0x8008 + FrontierScrCmd_A0 36, 0, 0, VAR_0x8008 FadeScreenIn - FrontierScrCmd_A1 0x8008 - GoToIfEq 0x8008, 0, _180E + FrontierScrCmd_A1 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _180E IncrementRecordValue RECORD_UNK_061 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1040 - FrontierScrCmd_A0 40, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1AF8 - GoToIfEq 0x8008, 2, _1B2F + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1040 + FrontierScrCmd_A0 40, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1AF8 + GoToIfEq VAR_0x8008, 2, _1B2F Call _1B75 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 FrontierScrCmd_28 98, _0360 FrontierScrCmd_29 GoTo _1030 @@ -1354,7 +1354,7 @@ _0F99: _1030: FrontierScrCmd_25 98 - FrontierScrCmd_23 0x800B + FrontierScrCmd_23 VAR_0x800B GoTo _1070 End @@ -1365,8 +1365,8 @@ _1040: FrontierScrCmd_29 FrontierScrCmd_25 98 FrontierScrCmd_25 99 - FrontierScrCmd_23 0x800B - FrontierScrCmd_23 0x800C + FrontierScrCmd_23 VAR_0x800B + FrontierScrCmd_23 VAR_0x800C GoTo _1070 End @@ -1397,62 +1397,62 @@ _10C2: End _10CA: - FrontierScrCmd_A0 14, 1, 0, 0x8008 - FrontierScrCmd_A0 5, 0, 0, 0x8008 + FrontierScrCmd_A0 14, 1, 0, VAR_0x8008 + FrontierScrCmd_A0 5, 0, 0, VAR_0x8008 Return _10DA: BufferPlayerName 1 - FrontierScrCmd_A0 27, 0, 0, 0x800D - BufferNumber 0, 0x800D + FrontierScrCmd_A0 27, 0, 0, VAR_0x800D + BufferNumber 0, VAR_0x800D FrontierScrCmd_28 5, _03BC FrontierScrCmd_29 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1BA1 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1BA1 GoTo _1B93 End _110F: CloseMessage - FrontierScrCmd_A0 28, 0, 0, 0x8008 + FrontierScrCmd_A0 28, 0, 0, VAR_0x8008 FrontierScrCmd_22 _00F8 FrontierScrCmd_24 _018C FrontierScrCmd_28 6, _03A4 FrontierScrCmd_29 BufferPlayerName 1 - GoToIfGe 0x800D, 40, _1160 - GoToIfGe 0x800D, 25, _117C - GoToIfGe 0x800D, 15, _1198 + GoToIfGe VAR_0x800D, 40, _1160 + GoToIfGe VAR_0x800D, 25, _117C + GoToIfGe VAR_0x800D, 15, _1198 GoTo _11B4 End _1160: - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1BBF + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1BBF GoTo _1BB3 End _117C: - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1BDD + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1BDD GoTo _1BD1 End _1198: - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1BFB + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1BFB GoTo _1BEF End _11B4: - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1C19 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1C19 GoTo _1C0D End _11D0: - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1C37 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1C37 GoTo _1C2B End @@ -1464,8 +1464,8 @@ _11EC: FrontierScrCmd_29 FrontierScrCmd_25 6 FrontierScrCmd_23 217 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _121C + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _121C Return _121C: @@ -1475,26 +1475,26 @@ _121C: Return _122A: - FrontierScrCmd_A0 28, 0, 0, 0x8008 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _04C5 + FrontierScrCmd_A0 28, 0, 0, VAR_0x8008 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _04C5 Return _1247: - FrontierScrCmd_A0 23, 0, 0, 0x8008 - GoToIfNe 0x8008, 7, _1314 + FrontierScrCmd_A0 23, 0, 0, VAR_0x8008 + GoToIfNe VAR_0x8008, 7, _1314 GoTo _1263 End _1263: - GoToIfEq 0x8005, 1, _12D3 - FrontierScrCmd_71 0x8008 - GoToIfEq 0x8008, 0, _12B9 - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _1714 - CallIfEq 0x8008, 1, _171A - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _12D3 + GoToIfEq VAR_0x8005, 1, _12D3 + FrontierScrCmd_71 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _12B9 + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _1714 + CallIfEq VAR_0x8008, 1, _171A + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _12D3 GoTo _12C5 End @@ -1509,14 +1509,14 @@ _12C5: End _12D3: - FrontierScrCmd_A0 22, 0, 0, 0x8008 - FrontierScrCmd_3D 0x40BC, 1 + FrontierScrCmd_A0 22, 0, 0, VAR_0x8008 + FrontierScrCmd_3D VAR_UNK_0x40BC, 1 BufferPlayerName 0 Message BattleCastleScene_Text_BPEarned BufferPlayerName 0 - FrontierScrCmd_A0 38, 0, 0, 0x8008 - BufferNumber 1, 0x8008 - GiveBattlePoints 0x8008 + FrontierScrCmd_A0 38, 0, 0, VAR_0x8008 + BufferNumber 1, VAR_0x8008 + GiveBattlePoints VAR_0x8008 Message BattleCastleScene_Text_ReceiveBP PlayFanfare SEQ_PL_POINTGET3 WaitFanfare @@ -1528,9 +1528,9 @@ _130C: End _1314: - GoToIfEq 0x8005, 1, _1349 - FrontierScrCmd_A0 25, 0, 0, 0x8008 - GoToIfEq 0x8008, 0, _1349 + GoToIfEq VAR_0x8005, 1, _1349 + FrontierScrCmd_A0 25, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _1349 Message BattleCastleScene_Text_RevivePokemon PlaySoundEffect SEQ_SE_DP_UG_020 WaitSoundEffect SEQ_SE_DP_UG_020 @@ -1538,20 +1538,20 @@ _1314: End _1349: - FrontierScrCmd_A0 40, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1A60 - GoToIfEq 0x8008, 2, _1A60 + FrontierScrCmd_A0 40, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1A60 + GoToIfEq VAR_0x8008, 2, _1A60 GoTo _1372 End _1372: Call _1B75 - BufferNumber 0, 0x8008 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _13AF - FrontierScrCmd_A0 23, 0, 0, 0x8008 - AddVar 0x8008, 1 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _13AF + FrontierScrCmd_A0 23, 0, 0, VAR_0x8008 + AddVar VAR_0x8008, 1 + BufferNumber 0, VAR_0x8008 Message BattleCastleScene_Text_AreYouReady GoTo _13E4 End @@ -1562,10 +1562,10 @@ _13AF: FrontierScrCmd_35 127 ClearReceivedTempDataAllPlayers Call _1B75 - BufferNumber 0, 0x8008 - FrontierScrCmd_A0 23, 0, 0, 0x8008 - AddVar 0x8008, 1 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 + FrontierScrCmd_A0 23, 0, 0, VAR_0x8008 + AddVar VAR_0x8008, 1 + BufferNumber 0, VAR_0x8008 MessageInstant BattleCastleScene_Text_AreYouReady GoTo _13E4 End @@ -1575,57 +1575,57 @@ _13E4: End _13EC: - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1422 - GoToIfEq 0x8005, 1, _1471 - GoToIfEq 0x8003, 0, _147F + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1422 + GoToIfEq VAR_0x8005, 1, _1471 + GoToIfEq VAR_0x8003, 0, _147F GoTo _1471 End _1422: - FrontierScrCmd_71 0x8008 - GoToIfEq 0x8008, 0, _1455 - GoToIfEq 0x8005, 1, _1455 - GoToIfEq 0x8003, 0, _1463 + FrontierScrCmd_71 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _1455 + GoToIfEq VAR_0x8005, 1, _1455 + GoToIfEq VAR_0x8003, 0, _1463 GoTo _1455 End _1455: - SetVar 0x8008, 1 + SetVar VAR_0x8008, 1 GoTo _148D End _1463: - SetVar 0x8008, 2 + SetVar VAR_0x8008, 2 GoTo _148D End _1471: - SetVar 0x8008, 3 + SetVar VAR_0x8008, 3 GoTo _148D End _147F: - SetVar 0x8008, 4 + SetVar VAR_0x8008, 4 GoTo _148D End _148D: - GoToIfEq 0x8008, 1, _14C3 - GoToIfEq 0x8008, 2, _14DE - GoToIfEq 0x8008, 3, _1501 - GoToIfEq 0x8008, 4, _1524 + GoToIfEq VAR_0x8008, 1, _14C3 + GoToIfEq VAR_0x8008, 2, _14DE + GoToIfEq VAR_0x8008, 3, _1501 + GoToIfEq VAR_0x8008, 4, _1524 End _14C3: - InitLocalTextListMenu 31, 13, 0, 0, 0x800A + InitLocalTextListMenu 31, 13, 0, 0, VAR_0x800A SetMenuXOriginSide 1 AddListMenuEntry BattleCastleScene_Text_ContinueOption, 255, 0 GoTo _154F End _14DE: - InitLocalTextListMenu 31, 11, 0, 0, 0x800A + InitLocalTextListMenu 31, 11, 0, 0, VAR_0x800A SetMenuXOriginSide 1 AddListMenuEntry BattleCastleScene_Text_ContinueOption, 255, 0 AddListMenuEntry BattleCastleScene_Text_RecordOption, 255, 1 @@ -1633,7 +1633,7 @@ _14DE: End _1501: - InitLocalTextListMenu 31, 11, 0, 0, 0x800A + InitLocalTextListMenu 31, 11, 0, 0, VAR_0x800A SetMenuXOriginSide 1 AddListMenuEntry BattleCastleScene_Text_ContinueOption, 255, 0 AddListMenuEntry BattleCastleScene_Text_RestOption, 255, 2 @@ -1641,7 +1641,7 @@ _1501: End _1524: - InitLocalTextListMenu 31, 9, 0, 0, 0x800A + InitLocalTextListMenu 31, 9, 0, 0, VAR_0x800A SetMenuXOriginSide 1 AddListMenuEntry BattleCastleScene_Text_ContinueOption, 255, 0 AddListMenuEntry BattleCastleScene_Text_RecordOption, 255, 1 @@ -1656,16 +1656,16 @@ _154F: End _1561: - GoToIfEq 0x800A, 0, _159D - GoToIfEq 0x800A, 1, _1646 - GoToIfEq 0x800A, 2, _1720 - GoToIfEq 0x800A, 3, _1774 + GoToIfEq VAR_0x800A, 0, _159D + GoToIfEq VAR_0x800A, 1, _1646 + GoToIfEq VAR_0x800A, 2, _1720 + GoToIfEq VAR_0x800A, 3, _1774 GoTo _1774 End _159D: - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _15B9 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _15B9 GoTo _1622 End @@ -1676,13 +1676,13 @@ _15B9: End _15C8: - SetVar 0x8002, 4 - FrontierScrCmd_A2 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _15C8 - FrontierScrCmd_A3 0x8002 + SetVar VAR_0x8002, 4 + FrontierScrCmd_A2 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _15C8 + FrontierScrCmd_A3 VAR_0x8002 ClearReceivedTempDataAllPlayers - FrontierScrCmd_A0 24, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _160D + FrontierScrCmd_A0 24, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _160D ClearReceivedTempDataAllPlayers FrontierScrCmd_35 122 ClearReceivedTempDataAllPlayers @@ -1692,24 +1692,24 @@ _15C8: _160D: BufferPartnerName 0 MessageNoSkip BattleCastleScene_Text_PartnerRetired - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 GoTo _17D9 End _1622: - SetVar 0x8003, 0 + SetVar VAR_0x8003, 0 FrontierScrCmd_9F - FrontierScrCmd_A0 35, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _0630 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _0630 GoTo _0706 End _1646: - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _1714 - CallIfEq 0x8008, 1, _171A - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _168C + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _1714 + CallIfEq VAR_0x8008, 1, _171A + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _168C GoTo _167E End @@ -1729,12 +1729,12 @@ _1694: _16A2: Call _16B6 - AddVar 0x8009, 1 + AddVar VAR_0x8009, 1 GoTo _16BF End _16B6: - FrontierScrCmd_A0 4, 0, 0, 0x8009 + FrontierScrCmd_A0 4, 0, 0, VAR_0x8009 Return _16BF: @@ -1742,15 +1742,15 @@ _16BF: End _16C7: - SetVar 0x8003, 1 - FrontierScrCmd_A0 44, 0, 0, 0x8008 + SetVar VAR_0x8003, 1 + FrontierScrCmd_A0 44, 0, 0, VAR_0x8008 MessageInstant BattleCastleScene_Text_Saving - FrontierScrCmd_A0 17, 0, 0, 0x8008 + FrontierScrCmd_A0 17, 0, 0, VAR_0x8008 ShowSavingIcon - FrontierScrCmd_6D 4, 0x8008, 0x8009, 0x8009 + FrontierScrCmd_6D 4, VAR_0x8008, VAR_0x8009, VAR_0x8009 HideSavingIcon - FrontierScrCmd_A0 44, 1, 0, 0x8008 - GoToIfEq 0x8009, 1, _1707 + FrontierScrCmd_A0 44, 1, 0, VAR_0x8008 + GoToIfEq VAR_0x8009, 1, _1707 Message BattleCastleScene_Text_VideoSaveFailed Return @@ -1770,20 +1770,20 @@ _171A: _1720: Message BattleCastleScene_Text_BreakQuestion - ShowYesNoMenu 0x8008, MENU_YES - GoToIfEq 0x8008, 1, _176C + ShowYesNoMenu VAR_0x8008, MENU_YES + GoToIfEq VAR_0x8008, 1, _176C GoTo _173E End _173E: - FrontierScrCmd_3D 0x40BC, 2 - FrontierScrCmd_A0 10, 0, 0, 0x8008 + FrontierScrCmd_3D VAR_UNK_0x40BC, 2 + FrontierScrCmd_A0 10, 0, 0, VAR_0x8008 FrontierScrCmd_6F FrontierScrCmd_99 Call _195E FadeScreenOut CloseMessage - FrontierScrCmd_A0 7, 0, 0, 0x8008 + FrontierScrCmd_A0 7, 0, 0, VAR_0x8008 End _176C: @@ -1792,10 +1792,10 @@ _176C: _1774: Message BattleCastleScene_Text_RetireQuestion - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _1806 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _17AA + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _1806 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _17AA Message BattleCastleScene_Text_ReturnItems GoTo _17F1 End @@ -1806,9 +1806,9 @@ _17AA: End _17B6: - SetVar 0x8002, 4 - FrontierScrCmd_A2 0x8002, 1, 0x8008 - GoToIfEq 0x8008, 0, _17B6 + SetVar VAR_0x8002, 4 + FrontierScrCmd_A2 VAR_0x8002, 1, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _17B6 GoTo _17D9 End @@ -1822,8 +1822,8 @@ _17D9: End _17F1: - FrontierScrCmd_A0 21, 0, 0, 0x8008 - FrontierScrCmd_3D 0x40BC, 3 + FrontierScrCmd_A0 21, 0, 0, VAR_0x8008 + FrontierScrCmd_3D VAR_UNK_0x40BC, 3 GoTo _18E4 End @@ -1838,13 +1838,13 @@ _180E: FrontierScrCmd_25 5 FrontierScrCmd_23 219 Call _19E8 - FrontierScrCmd_71 0x8008 - GoToIfEq 0x8008, 0, _1879 - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _1714 - CallIfEq 0x8008, 1, _171A - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _1893 + FrontierScrCmd_71 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _1879 + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _1714 + CallIfEq VAR_0x8008, 1, _171A + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _1893 GoTo _1885 End @@ -1863,15 +1863,15 @@ _1893: End _189B: - FrontierScrCmd_A0 21, 0, 0, 0x8008 - FrontierScrCmd_3D 0x40BC, 3 + FrontierScrCmd_A0 21, 0, 0, VAR_0x8008 + FrontierScrCmd_3D VAR_UNK_0x40BC, 3 GoTo _18B0 End _18B0: Message BattleCastleScene_Text_ReturnItems - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _18D0 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _18D0 GoTo _18E4 End @@ -1890,13 +1890,13 @@ _18E4: End _18F4: - FrontierScrCmd_A0 35, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _1948 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _1948 FadeScreenOut - FrontierScrCmd_A0 17, 0, 0, 0x8008 - CallIfEq 0x8008, 2, _1942 - FrontierScrCmd_A0 17, 0, 0, 0x8008 - GoToIfEq 0x8008, 3, _1952 + FrontierScrCmd_A0 17, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 2, _1942 + FrontierScrCmd_A0 17, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 3, _1952 FrontierScrCmd_6F FrontierScrCmd_99 FrontierScrCmd_02 @@ -1920,17 +1920,17 @@ _1952: _195E: MessageInstant BattleCastleScene_Text_Saving2 ShowSavingIcon - FrontierScrCmd_73 0x8008 + FrontierScrCmd_73 VAR_0x8008 HideSavingIcon PlaySoundEffect SEQ_SE_DP_SAVE WaitSoundEffect SEQ_SE_DP_SAVE Return _1974: - SetVar 0x8002, 2 - FrontierScrCmd_A2 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _1974 - FrontierScrCmd_A3 0x8002 + SetVar VAR_0x8002, 2 + FrontierScrCmd_A2 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _1974 + FrontierScrCmd_A3 VAR_0x8002 ClearReceivedTempDataAllPlayers GoTo _199D End @@ -1939,23 +1939,23 @@ _199D: ClearReceivedTempDataAllPlayers FrontierScrCmd_35 126 ClearReceivedTempDataAllPlayers - FrontierScrCmd_A0 30, 0, 0, 0x8008 - SetVar 0x8010, 0x8008 - GoToIfEq 0x8010, 1, _0833 - GoToIfEq 0x8010, 2, _08E5 - GoToIfEq 0x8010, 4, _0987 - GoToIfEq 0x8010, 5, _0A79 + FrontierScrCmd_A0 30, 0, 0, VAR_0x8008 + SetVar FR_VAR_0x8010, VAR_0x8008 + GoToIfEq FR_VAR_0x8010, 1, _0833 + GoToIfEq FR_VAR_0x8010, 2, _08E5 + GoToIfEq FR_VAR_0x8010, 4, _0987 + GoToIfEq FR_VAR_0x8010, 5, _0A79 End _19E8: FrontierScrCmd_42 0 - FrontierScrCmd_A0 35, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1A30 + FrontierScrCmd_A0 35, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1A30 FrontierScrCmd_25 0 FrontierScrCmd_25 4 FrontierScrCmd_03 11 - GetPlayerObjEventGfx 0x8007 - SetVar 0x800F, 231 + GetPlayerObjEventGfx VAR_0x8007 + SetVar FR_VAR_0x800F, 231 FrontierScrCmd_22 _0008 FrontierScrCmd_24 _0088 FadeScreenIn @@ -1965,19 +1965,19 @@ _1A30: FrontierScrCmd_25 1 FrontierScrCmd_25 2 FrontierScrCmd_03 11 - GetPlayerObjEventGfx 0x8007 - SetVar 0x800F, 232 + GetPlayerObjEventGfx VAR_0x8007 + SetVar FR_VAR_0x800F, 232 FrontierScrCmd_22 _0010 FrontierScrCmd_24 _00AC FadeScreenIn Return _1A60: - GoToIfEq 0x8003, 1, _1372 - FrontierScrCmd_A0 43, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1372 + GoToIfEq VAR_0x8003, 1, _1372 + FrontierScrCmd_A0 43, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1372 Call _1B75 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 BufferPlayerName 0 Message BattleCastleScene_Text_CastleValetApproaching GoTo _13E4 @@ -1985,7 +1985,7 @@ _1A60: _1A9B: Call _1B75 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 Call _1ADC Message BattleCastleScene_Text_DarachIntro CloseMessage @@ -1994,7 +1994,7 @@ _1A9B: _1ABA: Call _1B75 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 Call _1ADC BufferPlayerName 0 Message BattleCastleScene_Text_DarachIntroGold @@ -2012,9 +2012,9 @@ _1ADC: _1AF8: Call _1B75 - BufferNumber 0, 0x8008 - FrontierScrCmd_3E 0x4052, 0x8008 - CallIfEq 0x8008, 0, _1B27 + BufferNumber 0, VAR_0x8008 + FrontierScrCmd_3E VAR_BATTLE_CASTLE_PRINT_STATE, VAR_0x8008 + CallIfEq VAR_0x8008, 0, _1B27 BufferPlayerName 0 Message BattleCastleScene_Text_BeatDarach CloseMessage @@ -2022,21 +2022,21 @@ _1AF8: End _1B27: - FrontierScrCmd_3D 0x4052, 1 + FrontierScrCmd_3D VAR_BATTLE_CASTLE_PRINT_STATE, 1 Return _1B2F: Call _1B75 - BufferNumber 0, 0x8008 - FrontierScrCmd_3E 0x4052, 0x8008 - CallIfEq 0x8008, 2, _1B5B + BufferNumber 0, VAR_0x8008 + FrontierScrCmd_3E VAR_BATTLE_CASTLE_PRINT_STATE, VAR_0x8008 + CallIfEq VAR_0x8008, 2, _1B5B Message BattleCastleScene_Text_BeatDarachGold CloseMessage GoTo _1B63 End _1B5B: - FrontierScrCmd_3D 0x4052, 3 + FrontierScrCmd_3D VAR_BATTLE_CASTLE_PRINT_STATE, 3 Return _1B63: @@ -2046,9 +2046,9 @@ _1B63: End _1B75: - FrontierScrCmd_A0 4, 0, 0, 0x8008 - GoToIfGe 0x8008, 9999, _1B91 - AddVar 0x8008, 1 + FrontierScrCmd_A0 4, 0, 0, VAR_0x8008 + GoToIfGe VAR_0x8008, 9999, _1B91 + AddVar VAR_0x8008, 1 Return _1B91: @@ -2062,7 +2062,7 @@ _1B93: _1BA1: MessageNoSkip BattleCastleScene_Text_GiveCP - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 GoTo _110F End @@ -2073,7 +2073,7 @@ _1BB3: _1BBF: MessageNoSkip BattleCastleScene_Text_FantasticWin - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 GoTo _11D0 End @@ -2084,7 +2084,7 @@ _1BD1: _1BDD: MessageNoSkip BattleCastleScene_Text_RemarkableWin - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 GoTo _11D0 End @@ -2095,7 +2095,7 @@ _1BEF: _1BFB: MessageNoSkip BattleCastleScene_Text_HardFoughtWin - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 GoTo _11D0 End @@ -2106,7 +2106,7 @@ _1C0D: _1C19: MessageNoSkip BattleCastleScene_Text_GoodEffort - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 GoTo _11D0 End diff --git a/res/field/frontier_scripts/frontier_scripts_battle_factory.s b/res/field/frontier_scripts/frontier_scripts_battle_factory.s index 46e878e505..aeddd3ddb3 100644 --- a/res/field/frontier_scripts/frontier_scripts_battle_factory.s +++ b/res/field/frontier_scripts/frontier_scripts_battle_factory.s @@ -490,13 +490,13 @@ _02A8: .short 0xFD13 _02D6: - FrontierScrCmd_3E VAR_BATTLE_FACTORY_CHALLENGE_TYPE, 0x8001 - FrontierScrCmd_3E 0x40B9, 0x8002 - FrontierScrCmd_3E 0x4003, 0x8003 - GetPlayerObjEventGfx 0x8007 - GoToIfEq 0x8001, FRONTIER_CHALLENGE_MULTI, _0320 - GoToIfEq 0x8001, FRONTIER_CHALLENGE_MULTI_WFC, _0320 - SetVar 0x800F, 231 + FrontierScrCmd_3E VAR_BATTLE_FACTORY_CHALLENGE_TYPE, VAR_0x8001 + FrontierScrCmd_3E VAR_UNK_0x40B9, VAR_0x8002 + FrontierScrCmd_3E VAR_MAP_LOCAL_3, VAR_0x8003 + GetPlayerObjEventGfx VAR_0x8007 + GoToIfEq VAR_0x8001, FRONTIER_CHALLENGE_MULTI, _0320 + GoToIfEq VAR_0x8001, FRONTIER_CHALLENGE_MULTI_WFC, _0320 + SetVar FR_VAR_0x800F, 231 FrontierScrCmd_22 _0008 FrontierScrCmd_24 _0028 GoTo _033E @@ -504,7 +504,7 @@ _02D6: _0320: IncrementTrainerScore TRAINER_SCORE_EVENT_UNK_43 - SetVar 0x800F, 232 + SetVar FR_VAR_0x800F, 232 FrontierScrCmd_22 _0014 FrontierScrCmd_24 _004C GoTo _033E @@ -514,10 +514,10 @@ _033E: FrontierScrCmd_22 _0020 FrontierScrCmd_24 _0088 FrontierScrCmd_6C - FrontierScrCmd_5C 0x8003, 0x8001, 0x8002 - FrontierScrCmd_67 31, 0, 0, 0x8008 - FrontierScrCmd_67 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0377 + FrontierScrCmd_5C VAR_0x8003, VAR_0x8001, VAR_0x8002 + FrontierScrCmd_67 31, 0, 0, VAR_0x8008 + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0377 GoTo _03B6 End @@ -527,10 +527,10 @@ _0377: End _0385: - SetVar 0x8002, 0 - FrontierScrCmd_69 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _0385 - FrontierScrCmd_6A 0x8002 + SetVar VAR_0x8002, 0 + FrontierScrCmd_69 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0385 + FrontierScrCmd_6A VAR_0x8002 ClearReceivedTempDataAllPlayers ClearReceivedTempDataAllPlayers FrontierScrCmd_35 230 @@ -539,17 +539,17 @@ _0385: End _03B6: - FrontierScrCmd_5D 0x8003 - FrontierScrCmd_67 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _03D6 + FrontierScrCmd_5D VAR_0x8003 + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _03D6 GoTo _0407 End _03D6: - SetVar 0x8002, 1 - FrontierScrCmd_69 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _03D6 - FrontierScrCmd_6A 0x8002 + SetVar VAR_0x8002, 1 + FrontierScrCmd_69 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _03D6 + FrontierScrCmd_6A VAR_0x8002 ClearReceivedTempDataAllPlayers ClearReceivedTempDataAllPlayers FrontierScrCmd_35 231 @@ -559,9 +559,9 @@ _03D6: _0407: FadeScreenIn - SetVar 0x8003, 0 - FrontierScrCmd_67 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0447 + SetVar VAR_0x8003, 0 + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0447 FrontierScrCmd_28 4, _0188 FrontierScrCmd_28 5, _0198 FrontierScrCmd_29 @@ -579,10 +579,10 @@ _0447: _0471: FrontierScrCmd_25 5 - FrontierScrCmd_23 0x800F - FrontierScrCmd_67 23, 0, 0, 0x8008 - GoToIfEq 0x8008, 0, _049B - SetVar 0x8003, 1 + FrontierScrCmd_23 FR_VAR_0x800F + FrontierScrCmd_67 23, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _049B + SetVar VAR_0x8003, 1 GoTo _0C29 End @@ -592,8 +592,8 @@ _049B: End _04A9: - FrontierScrCmd_67 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _04C5 + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _04C5 GoTo _05F3 End @@ -605,55 +605,55 @@ _04C5: End _04D5: - SetVar 0x8002, 3 - FrontierScrCmd_69 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _04D5 - FrontierScrCmd_6A 0x8002 + SetVar VAR_0x8002, 3 + FrontierScrCmd_69 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _04D5 + FrontierScrCmd_6A VAR_0x8002 ClearReceivedTempDataAllPlayers ClearReceivedTempDataAllPlayers FrontierScrCmd_35 232 ClearReceivedTempDataAllPlayers - FrontierScrCmd_67 39, 0, 0, 0x8008 - FrontierScrCmd_67 19, 0, 0, 0x8008 - SetVar 0x8009, 0x8008 - CallIfEq 0x8009, 0, _0555 - CallIfEq 0x8009, 1, _0597 - CallIfEq 0x8009, 2, _05BB - CallIfEq 0x8009, 3, _05D9 - CallIfGe 0x8009, 4, _05EB + FrontierScrCmd_67 39, 0, 0, VAR_0x8008 + FrontierScrCmd_67 19, 0, 0, VAR_0x8008 + SetVar VAR_0x8009, VAR_0x8008 + CallIfEq VAR_0x8009, 0, _0555 + CallIfEq VAR_0x8009, 1, _0597 + CallIfEq VAR_0x8009, 2, _05BB + CallIfEq VAR_0x8009, 3, _05D9 + CallIfGe VAR_0x8009, 4, _05EB Return _0555: - FrontierScrCmd_67 15, 0, 0, 0x8008 - BufferSpeciesName 1, 0x8008 - FrontierScrCmd_67 15, 1, 0, 0x8008 - BufferSpeciesName 2, 0x8008 - FrontierScrCmd_67 15, 2, 0, 0x8008 - BufferSpeciesName 3, 0x8008 - FrontierScrCmd_67 15, 3, 0, 0x8008 - BufferSpeciesName 4, 0x8008 + FrontierScrCmd_67 15, 0, 0, VAR_0x8008 + BufferSpeciesName 1, VAR_0x8008 + FrontierScrCmd_67 15, 1, 0, VAR_0x8008 + BufferSpeciesName 2, VAR_0x8008 + FrontierScrCmd_67 15, 2, 0, VAR_0x8008 + BufferSpeciesName 3, VAR_0x8008 + FrontierScrCmd_67 15, 3, 0, VAR_0x8008 + BufferSpeciesName 4, VAR_0x8008 Message BattleFactoryScene_Text_MultiOpponentInfo4Mon Return _0597: - FrontierScrCmd_67 15, 0, 0, 0x8008 - BufferSpeciesName 1, 0x8008 - FrontierScrCmd_67 15, 2, 0, 0x8008 - BufferSpeciesName 2, 0x8008 + FrontierScrCmd_67 15, 0, 0, VAR_0x8008 + BufferSpeciesName 1, VAR_0x8008 + FrontierScrCmd_67 15, 2, 0, VAR_0x8008 + BufferSpeciesName 2, VAR_0x8008 Message BattleFactoryScene_Text_MultiOpponentInfo2Mon Return _05BB: - FrontierScrCmd_67 16, 0, 0, 0x8008 - BufferMoveName 0, 0x8008 - FrontierScrCmd_67 16, 2, 0, 0x8008 - BufferMoveName 1, 0x8008 + FrontierScrCmd_67 16, 0, 0, VAR_0x8008 + BufferMoveName 0, VAR_0x8008 + FrontierScrCmd_67 16, 2, 0, VAR_0x8008 + BufferMoveName 1, VAR_0x8008 Message BattleFactoryScene_Text_MultiOpponentInfoFirstMoves Return _05D9: - FrontierScrCmd_67 16, 0, 0, 0x8008 - BufferMoveName 0, 0x8008 + FrontierScrCmd_67 16, 0, 0, VAR_0x8008 + BufferMoveName 0, VAR_0x8008 Message BattleFactoryScene_Text_MultiOpponentInfoCommonType Return @@ -662,55 +662,55 @@ _05EB: End _05F3: - FrontierScrCmd_67 19, 0, 0, 0x8008 - SetVar 0x8009, 0x8008 - CallIfEq 0x8009, 0, _0643 - CallIfEq 0x8009, 1, _0676 - CallIfEq 0x8009, 2, _069A - CallIfEq 0x8009, 3, _06BB - CallIfGe 0x8009, 4, _06CD + FrontierScrCmd_67 19, 0, 0, VAR_0x8008 + SetVar VAR_0x8009, VAR_0x8008 + CallIfEq VAR_0x8009, 0, _0643 + CallIfEq VAR_0x8009, 1, _0676 + CallIfEq VAR_0x8009, 2, _069A + CallIfEq VAR_0x8009, 3, _06BB + CallIfGe VAR_0x8009, 4, _06CD Return _0643: - FrontierScrCmd_67 15, 0, 0, 0x8008 - BufferSpeciesName 1, 0x8008 - FrontierScrCmd_67 15, 1, 0, 0x8008 - BufferSpeciesName 3, 0x8008 - FrontierScrCmd_67 15, 2, 0, 0x8008 - BufferSpeciesName 5, 0x8008 + FrontierScrCmd_67 15, 0, 0, VAR_0x8008 + BufferSpeciesName 1, VAR_0x8008 + FrontierScrCmd_67 15, 1, 0, VAR_0x8008 + BufferSpeciesName 3, VAR_0x8008 + FrontierScrCmd_67 15, 2, 0, VAR_0x8008 + BufferSpeciesName 5, VAR_0x8008 Message BattleFactoryScene_Text_OpponentInfo3Mon Return _0676: - FrontierScrCmd_67 15, 0, 0, 0x8008 - BufferSpeciesName 1, 0x8008 - FrontierScrCmd_67 15, 1, 0, 0x8008 - BufferSpeciesName 3, 0x8008 + FrontierScrCmd_67 15, 0, 0, VAR_0x8008 + BufferSpeciesName 1, VAR_0x8008 + FrontierScrCmd_67 15, 1, 0, VAR_0x8008 + BufferSpeciesName 3, VAR_0x8008 Message BattleFactoryScene_Text_OpponentInfo2Mon Return _069A: - FrontierScrCmd_67 16, 0, 0, 0x8008 - BufferMoveName 0, 0x8008 - FrontierScrCmd_67 15, 0, 0, 0x8008 - BufferSpeciesName 1, 0x8008 + FrontierScrCmd_67 16, 0, 0, VAR_0x8008 + BufferMoveName 0, VAR_0x8008 + FrontierScrCmd_67 15, 0, 0, VAR_0x8008 + BufferSpeciesName 1, VAR_0x8008 Message BattleFactoryScene_Text_OpponentInfo1Mon Return _06BB: - FrontierScrCmd_67 16, 0, 0, 0x8008 - BufferMoveName 0, 0x8008 + FrontierScrCmd_67 16, 0, 0, VAR_0x8008 + BufferMoveName 0, VAR_0x8008 Message BattleFactoryScene_Text_OpponentInfoFirstMove Return _06CD: - FrontierScrCmd_67 18, 0, 0, 0x8008 - CallIfNe 0x8008, 255, _06F0 - CallIfEq 0x8008, 255, _06FB + FrontierScrCmd_67 18, 0, 0, VAR_0x8008 + CallIfNe VAR_0x8008, 255, _06F0 + CallIfEq VAR_0x8008, 255, _06FB Return _06F0: - BufferTypeName 0, 0x8008 + BufferTypeName 0, VAR_0x8008 Message BattleFactoryScene_Text_OpponentInfoCommonType Return @@ -720,8 +720,8 @@ _06FB: _0701: Message BattleFactoryScene_Text_ChoosePokemon - FrontierScrCmd_67 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0721 + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0721 GoTo _0765 End @@ -731,12 +731,12 @@ _0721: End _072D: - SetVar 0x8002, 2 - FrontierScrCmd_69 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _072D - FrontierScrCmd_6A 0x8002 + SetVar VAR_0x8002, 2 + FrontierScrCmd_69 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _072D + FrontierScrCmd_6A VAR_0x8002 ClearReceivedTempDataAllPlayers - FrontierScrCmd_67 40, 0, 0, 0x8008 + FrontierScrCmd_67 40, 0, 0, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 160 ClearReceivedTempDataAllPlayers @@ -746,15 +746,15 @@ _072D: _0765: FadeScreenOut CloseMessage - FrontierScrCmd_67 32, 0, 0, 0x8008 - FrontierScrCmd_67 28, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _07D2 + FrontierScrCmd_67 32, 0, 0, VAR_0x8008 + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _07D2 FrontierScrCmd_5F - FrontierScrCmd_67 36, 0, 0, 0x8008 + FrontierScrCmd_67 36, 0, 0, VAR_0x8008 FrontierScrCmd_63 - FrontierScrCmd_67 31, 0, 0, 0x8008 - FrontierScrCmd_67 28, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _07C8 + FrontierScrCmd_67 31, 0, 0, VAR_0x8008 + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _07C8 FadeScreenIn GoTo _07DC End @@ -772,8 +772,8 @@ _07D2: Return _07DC: - FrontierScrCmd_67 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0812 + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0812 Message BattleFactoryScene_Text_GoIn WaitABPress CloseMessage @@ -785,7 +785,7 @@ _07DC: _0812: MessageNoSkip BattleFactoryScene_Text_GoIn - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 CloseMessage Call _164D FrontierScrCmd_28 3, _01E0 @@ -800,33 +800,33 @@ _084E: PlaySoundEffect SEQ_SE_DP_KAIDAN2 WaitSoundEffect SEQ_SE_DP_KAIDAN2 FadeScreenOut - FrontierScrCmd_67 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0927 + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0927 FrontierScrCmd_25 0 FrontierScrCmd_25 3 FrontierScrCmd_25 4 FrontierScrCmd_23 30 - FrontierScrCmd_67 32, 0, 0, 0x8008 + FrontierScrCmd_67 32, 0, 0, VAR_0x8008 FrontierScrCmd_03 4 - GetPlayerObjEventGfx 0x8007 + GetPlayerObjEventGfx VAR_0x8007 FrontierScrCmd_22 _00F8 FrontierScrCmd_24 _0108 FadeScreenIn FrontierScrCmd_28 4, _01F4 FrontierScrCmd_29 Call _1471 - FrontierScrCmd_67 37, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _14E6 - GoToIfEq 0x8008, 2, _150B + FrontierScrCmd_67 37, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _14E6 + GoToIfEq VAR_0x8008, 2, _150B Call _1612 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 Call _09E4 FrontierScrCmd_28 98, _021C FrontierScrCmd_29 - WaitTime 15, 0x8008 + WaitTime 15, VAR_0x8008 FrontierScrCmd_28 98, _01EC FrontierScrCmd_29 - FrontierScrCmd_67 33, 0, 0, 0x8008 + FrontierScrCmd_67 33, 0, 0, VAR_0x8008 FrontierScrCmd_6B 0 WaitABPress CloseMessage @@ -843,9 +843,9 @@ _0927: FrontierScrCmd_25 3 FrontierScrCmd_25 4 FrontierScrCmd_23 30 - FrontierScrCmd_67 32, 0, 0, 0x8008 + FrontierScrCmd_67 32, 0, 0, VAR_0x8008 FrontierScrCmd_03 4 - GetPlayerObjEventGfx 0x8007 + GetPlayerObjEventGfx VAR_0x8007 FrontierScrCmd_22 _0100 FrontierScrCmd_24 _0120 FadeScreenIn @@ -858,52 +858,52 @@ _0927: FrontierScrCmd_28 98, _0230 FrontierScrCmd_28 99, _0244 FrontierScrCmd_29 - WaitTime 15, 0x8008 + WaitTime 15, VAR_0x8008 FrontierScrCmd_28 98, _01EC FrontierScrCmd_29 - FrontierScrCmd_67 33, 0, 0, 0x8008 + FrontierScrCmd_67 33, 0, 0, VAR_0x8008 FrontierScrCmd_6B 0 - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 CloseMessage FrontierScrCmd_28 99, _01EC FrontierScrCmd_29 - FrontierScrCmd_67 33, 0, 0, 0x8008 + FrontierScrCmd_67 33, 0, 0, VAR_0x8008 FrontierScrCmd_6B 1 - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 CloseMessage MessageNoSkip BattleFactoryScene_Text_PleaseWait GoTo _0A41 End _09E4: - FrontierScrCmd_67 20, 0, 0, 0x8008 - SetVar 0x800B, 0x8008 + FrontierScrCmd_67 20, 0, 0, VAR_0x8008 + SetVar VAR_0x800B, VAR_0x8008 FrontierScrCmd_22 _0150 FrontierScrCmd_24 _0160 Return _09FF: - FrontierScrCmd_67 20, 0, 0, 0x8008 - SetVar 0x800B, 0x8008 + FrontierScrCmd_67 20, 0, 0, VAR_0x8008 + SetVar VAR_0x800B, VAR_0x8008 FrontierScrCmd_22 _0150 - FrontierScrCmd_67 20, 1, 0, 0x8008 - SetVar 0x800C, 0x8008 + FrontierScrCmd_67 20, 1, 0, VAR_0x8008 + SetVar VAR_0x800C, VAR_0x8008 FrontierScrCmd_22 _0158 FrontierScrCmd_24 _0170 Return _0A2D: - SetVar 0x800B, 215 + SetVar VAR_0x800B, 215 FrontierScrCmd_22 _0150 FrontierScrCmd_24 _0160 Return _0A41: - FrontierScrCmd_67 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0A92 - FrontierScrCmd_67 37, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0A82 - GoToIfEq 0x8008, 2, _0A82 + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0A92 + FrontierScrCmd_67 37, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0A82 + GoToIfEq VAR_0x8008, 2, _0A82 FrontierScrCmd_3F 3 GoTo _0AD0 End @@ -915,12 +915,12 @@ _0A82: End _0A92: - SetVar 0x8002, 6 - FrontierScrCmd_69 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _0A92 - FrontierScrCmd_6A 0x8002 + SetVar VAR_0x8002, 6 + FrontierScrCmd_69 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0A92 + FrontierScrCmd_6A VAR_0x8002 ClearReceivedTempDataAllPlayers - FrontierScrCmd_67 38, 0, 0, 0x8008 + FrontierScrCmd_67 38, 0, 0, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 161 ClearReceivedTempDataAllPlayers @@ -932,16 +932,16 @@ _0A92: _0AD0: FrontierScrCmd_61 FrontierScrCmd_60 - FrontierScrCmd_67 30, 4, 0, 0x8008 + FrontierScrCmd_67 30, 4, 0, VAR_0x8008 FadeScreenIn - FrontierScrCmd_68 0x8008 - GoToIfEq 0x8008, 0, _1233 + FrontierScrCmd_68 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _1233 IncrementRecordValue RECORD_UNK_060 - FrontierScrCmd_67 37, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _15AA - GoToIfEq 0x8008, 2, _15DE + FrontierScrCmd_67 37, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _15AA + GoToIfEq VAR_0x8008, 2, _15DE Call _1612 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 GoTo _0B30 End @@ -956,21 +956,21 @@ _0B3E: End _0B4C: - FrontierScrCmd_67 14, 1, 0, 0x8008 - FrontierScrCmd_67 5, 0, 0, 0x8008 - FrontierScrCmd_67 23, 0, 0, 0x8008 - GoToIfNe 0x8008, 7, _0C17 + FrontierScrCmd_67 14, 1, 0, VAR_0x8008 + FrontierScrCmd_67 5, 0, 0, VAR_0x8008 + FrontierScrCmd_67 23, 0, 0, VAR_0x8008 + GoToIfNe VAR_0x8008, 7, _0C17 GoTo _0B76 End _0B76: - FrontierScrCmd_71 0x8008 - GoToIfEq 0x8008, 0, _0BBF - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _1132 - CallIfEq 0x8008, 1, _1138 - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _0BD9 + FrontierScrCmd_71 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0BBF + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _1132 + CallIfEq VAR_0x8008, 1, _1138 + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _0BD9 GoTo _0BCB End @@ -985,13 +985,13 @@ _0BCB: End _0BD9: - FrontierScrCmd_67 22, 0, 0, 0x8008 - FrontierScrCmd_3D 0x40B7, 1 + FrontierScrCmd_67 22, 0, 0, VAR_0x8008 + FrontierScrCmd_3D VAR_UNK_0x40B7, 1 Message BattleFactoryScene_Text_BPEarned BufferPlayerName 0 - FrontierScrCmd_67 35, 0, 0, 0x8008 - BufferNumber 1, 0x8008 - GiveBattlePoints 0x8008 + FrontierScrCmd_67 35, 0, 0, VAR_0x8008 + BufferNumber 1, VAR_0x8008 + GiveBattlePoints VAR_0x8008 Message BattleFactoryScene_Text_ReceiveBP PlayFanfare SEQ_PL_POINTGET3 WaitFanfare @@ -1010,76 +1010,76 @@ _0C17: End _0C29: - FrontierScrCmd_67 37, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _14AE - GoToIfEq 0x8008, 2, _14AE + FrontierScrCmd_67 37, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _14AE + GoToIfEq VAR_0x8008, 2, _14AE GoTo _0C52 End _0C52: Call _1612 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 GoTo _0C65 End _0C65: - FrontierScrCmd_67 23, 0, 0, 0x8008 - AddVar 0x8008, 1 - BufferNumber 0, 0x8008 + FrontierScrCmd_67 23, 0, 0, VAR_0x8008 + AddVar VAR_0x8008, 1 + BufferNumber 0, VAR_0x8008 Message BattleFactoryScene_Text_AreYouReady GoTo _0C83 End _0C83: - FrontierScrCmd_67 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0CAC - GoToIfEq 0x8003, 0, _0CFC + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0CAC + GoToIfEq VAR_0x8003, 0, _0CFC GoTo _0CEE End _0CAC: - FrontierScrCmd_71 0x8008 - GoToIfEq 0x8008, 0, _0CD2 - GoToIfEq 0x8003, 0, _0CE0 + FrontierScrCmd_71 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0CD2 + GoToIfEq VAR_0x8003, 0, _0CE0 GoTo _0CD2 End _0CD2: - SetVar 0x8008, 1 + SetVar VAR_0x8008, 1 GoTo _0D0A End _0CE0: - SetVar 0x8008, 2 + SetVar VAR_0x8008, 2 GoTo _0D0A End _0CEE: - SetVar 0x8008, 3 + SetVar VAR_0x8008, 3 GoTo _0D0A End _0CFC: - SetVar 0x8008, 4 + SetVar VAR_0x8008, 4 GoTo _0D0A End _0D0A: - GoToIfEq 0x8008, 1, _0D40 - GoToIfEq 0x8008, 2, _0D5B - GoToIfEq 0x8008, 3, _0D7E - GoToIfEq 0x8008, 4, _0DA1 + GoToIfEq VAR_0x8008, 1, _0D40 + GoToIfEq VAR_0x8008, 2, _0D5B + GoToIfEq VAR_0x8008, 3, _0D7E + GoToIfEq VAR_0x8008, 4, _0DA1 End _0D40: - InitLocalTextListMenu 31, 13, 0, 0, 0x800A + InitLocalTextListMenu 31, 13, 0, 0, VAR_0x800A SetMenuXOriginSide 1 AddListMenuEntry BattleFactoryScene_Text_ContinueOption, 255, 0 GoTo _0DCC End _0D5B: - InitLocalTextListMenu 31, 11, 0, 0, 0x800A + InitLocalTextListMenu 31, 11, 0, 0, VAR_0x800A SetMenuXOriginSide 1 AddListMenuEntry BattleFactoryScene_Text_ContinueOption, 255, 0 AddListMenuEntry BattleFactoryScene_Text_RecordOption, 255, 1 @@ -1087,7 +1087,7 @@ _0D5B: End _0D7E: - InitLocalTextListMenu 31, 11, 0, 0, 0x800A + InitLocalTextListMenu 31, 11, 0, 0, VAR_0x800A SetMenuXOriginSide 1 AddListMenuEntry BattleFactoryScene_Text_ContinueOption, 255, 0 AddListMenuEntry BattleFactoryScene_Text_RestOption, 255, 2 @@ -1095,7 +1095,7 @@ _0D7E: End _0DA1: - InitLocalTextListMenu 31, 9, 0, 0, 0x800A + InitLocalTextListMenu 31, 9, 0, 0, VAR_0x800A SetMenuXOriginSide 1 AddListMenuEntry BattleFactoryScene_Text_ContinueOption, 255, 0 AddListMenuEntry BattleFactoryScene_Text_RecordOption, 255, 1 @@ -1110,16 +1110,16 @@ _0DCC: End _0DDE: - GoToIfEq 0x800A, 0, _0E1A - GoToIfEq 0x800A, 1, _1036 - GoToIfEq 0x800A, 2, _113E - GoToIfEq 0x800A, 3, _1199 + GoToIfEq VAR_0x800A, 0, _0E1A + GoToIfEq VAR_0x800A, 1, _1036 + GoToIfEq VAR_0x800A, 2, _113E + GoToIfEq VAR_0x800A, 3, _1199 GoTo _1199 End _0E1A: - FrontierScrCmd_67 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0E36 + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0E36 GoTo _0E9F End @@ -1130,13 +1130,13 @@ _0E36: End _0E45: - SetVar 0x8002, 4 - FrontierScrCmd_69 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _0E45 - FrontierScrCmd_6A 0x8002 + SetVar VAR_0x8002, 4 + FrontierScrCmd_69 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0E45 + FrontierScrCmd_6A VAR_0x8002 ClearReceivedTempDataAllPlayers - FrontierScrCmd_67 24, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0E8A + FrontierScrCmd_67 24, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0E8A ClearReceivedTempDataAllPlayers FrontierScrCmd_35 162 ClearReceivedTempDataAllPlayers @@ -1146,24 +1146,24 @@ _0E45: _0E8A: BufferPartnerName 0 MessageNoSkip BattleFactoryScene_Text_PartnerRetired - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 GoTo _11FE End _0E9F: - SetVar 0x8003, 0 + SetVar VAR_0x8003, 0 FrontierScrCmd_64 Call _04A9 - FrontierScrCmd_67 0, 1, 0, 0x8008 + FrontierScrCmd_67 0, 1, 0, VAR_0x8008 Message BattleFactoryScene_Text_TradeQuestion - ShowYesNoMenu 0x8008, MENU_YES - GoToIfEq 0x8008, 1, _0FBF + ShowYesNoMenu VAR_0x8008, MENU_YES + GoToIfEq VAR_0x8008, 1, _0FBF GoTo _0ED2 End _0ED2: - FrontierScrCmd_67 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0EEE + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0EEE GoTo _0F23 End @@ -1173,10 +1173,10 @@ _0EEE: End _0EFA: - SetVar 0x8002, 5 - FrontierScrCmd_69 0x8002, 0, 0x8008 - GoToIfEq 0x8008, 0, _0EFA - FrontierScrCmd_6A 0x8002 + SetVar VAR_0x8002, 5 + FrontierScrCmd_69 VAR_0x8002, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0EFA + FrontierScrCmd_6A VAR_0x8002 ClearReceivedTempDataAllPlayers GoTo _0F23 End @@ -1184,8 +1184,8 @@ _0EFA: _0F23: FadeScreenOut CloseMessage - FrontierScrCmd_67 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0F4D + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0F4D GoTo _0F5D End @@ -1197,14 +1197,14 @@ _0F4D: End _0F5D: - FrontierScrCmd_67 32, 0, 0, 0x8008 - FrontierScrCmd_67 28, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _0FAB + FrontierScrCmd_67 32, 0, 0, VAR_0x8008 + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _0FAB FrontierScrCmd_62 FrontierScrCmd_65 - FrontierScrCmd_67 31, 0, 0, 0x8008 - FrontierScrCmd_67 28, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _0FB5 + FrontierScrCmd_67 31, 0, 0, VAR_0x8008 + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _0FB5 FadeScreenIn GoTo _102C End @@ -1222,8 +1222,8 @@ _0FB5: Return _0FBF: - FrontierScrCmd_67 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0FDB + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0FDB GoTo _1022 End @@ -1232,13 +1232,13 @@ _0FDB: GoTo _0FE5 _0FE5: - SetVar 0x8002, 5 - FrontierScrCmd_69 0x8002, 1, 0x8008 - GoToIfEq 0x8008, 0, _0FE5 - FrontierScrCmd_6A 0x8002 + SetVar VAR_0x8002, 5 + FrontierScrCmd_69 VAR_0x8002, 1, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0FE5 + FrontierScrCmd_6A VAR_0x8002 ClearReceivedTempDataAllPlayers - FrontierScrCmd_67 26, 0, 0, 0x8008 - GoToIfEq 0x8008, 0, _0F23 + FrontierScrCmd_67 26, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0F23 GoTo _1022 End @@ -1253,11 +1253,11 @@ _102C: End _1036: - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _1132 - CallIfEq 0x8008, 1, _1138 - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _107C + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _1132 + CallIfEq VAR_0x8008, 1, _1138 + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _107C GoTo _106E End @@ -1277,12 +1277,12 @@ _1084: _1092: Call _10A6 - AddVar 0x8005, 1 + AddVar VAR_0x8005, 1 GoTo _10AF End _10A6: - FrontierScrCmd_67 4, 0, 0, 0x8005 + FrontierScrCmd_67 4, 0, 0, VAR_0x8005 Return _10AF: @@ -1290,29 +1290,29 @@ _10AF: End _10B7: - SetVar 0x8003, 1 + SetVar VAR_0x8003, 1 MessageInstant BattleFactoryScene_Text_Saving ShowSavingIcon - FrontierScrCmd_3E 0x40B9, 0x8008 - GoToIfEq 0x8008, 0, _10DE + FrontierScrCmd_3E VAR_UNK_0x40B9, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _10DE GoTo _10F7 End _10DE: - FrontierScrCmd_67 29, 0, 0, 0x8008 - FrontierScrCmd_6D 2, 0x8008, 0x8005, 0x8005 + FrontierScrCmd_67 29, 0, 0, VAR_0x8008 + FrontierScrCmd_6D 2, VAR_0x8008, VAR_0x8005, VAR_0x8005 GoTo _1110 End _10F7: - FrontierScrCmd_67 29, 0, 0, 0x8008 - FrontierScrCmd_6D 3, 0x8008, 0x8005, 0x8005 + FrontierScrCmd_67 29, 0, 0, VAR_0x8008 + FrontierScrCmd_6D 3, VAR_0x8008, VAR_0x8005, VAR_0x8005 GoTo _1110 End _1110: HideSavingIcon - GoToIfEq 0x8005, 1, _1125 + GoToIfEq VAR_0x8005, 1, _1125 Message BattleFactoryScene_Text_VideoSaveFailed Return @@ -1332,21 +1332,21 @@ _1138: _113E: Message BattleFactoryScene_Text_BreakQuestion - ShowYesNoMenu 0x8008, MENU_YES - GoToIfEq 0x8008, 1, _1191 + ShowYesNoMenu VAR_0x8008, MENU_YES + GoToIfEq VAR_0x8008, 1, _1191 GoTo _115C End _115C: - FrontierScrCmd_3D 0x40B7, 2 - FrontierScrCmd_67 10, 0, 0, 0x8008 + FrontierScrCmd_3D VAR_UNK_0x40B7, 2 + FrontierScrCmd_67 10, 0, 0, VAR_0x8008 Call _137B CloseMessage FadeScreenOut - FrontierScrCmd_67 32, 0, 0, 0x8008 + FrontierScrCmd_67 32, 0, 0, VAR_0x8008 FrontierScrCmd_6F FrontierScrCmd_5E - FrontierScrCmd_67 7, 0, 0, 0x8008 + FrontierScrCmd_67 7, 0, 0, VAR_0x8008 End _1191: @@ -1355,10 +1355,10 @@ _1191: _1199: Message BattleFactoryScene_Text_RetireQuestion - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _122B - FrontierScrCmd_67 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _11CF + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _122B + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _11CF Message BattleFactoryScene_Text_ReturnPokemon GoTo _1216 End @@ -1369,9 +1369,9 @@ _11CF: End _11DB: - SetVar 0x8002, 4 - FrontierScrCmd_69 0x8002, 1, 0x8008 - GoToIfEq 0x8008, 0, _11DB + SetVar VAR_0x8002, 4 + FrontierScrCmd_69 VAR_0x8002, 1, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _11DB GoTo _11FE End @@ -1385,8 +1385,8 @@ _11FE: End _1216: - FrontierScrCmd_67 21, 0, 0, 0x8008 - FrontierScrCmd_3D 0x40B7, 3 + FrontierScrCmd_67 21, 0, 0, VAR_0x8008 + FrontierScrCmd_3D VAR_UNK_0x40B7, 3 GoTo _12F3 End @@ -1397,13 +1397,13 @@ _122B: _1233: Call _141F Call _1391 - FrontierScrCmd_71 0x8008 - GoToIfEq 0x8008, 0, _1288 - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _1132 - CallIfEq 0x8008, 1, _1138 - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _12A2 + FrontierScrCmd_71 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _1288 + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _1132 + CallIfEq VAR_0x8008, 1, _1138 + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _12A2 GoTo _1294 End @@ -1422,15 +1422,15 @@ _12A2: End _12AA: - FrontierScrCmd_67 21, 0, 0, 0x8008 - FrontierScrCmd_3D 0x40B7, 3 + FrontierScrCmd_67 21, 0, 0, VAR_0x8008 + FrontierScrCmd_3D VAR_UNK_0x40B7, 3 GoTo _12BF End _12BF: Message BattleFactoryScene_Text_ReturnPokemon - FrontierScrCmd_67 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _12DF + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _12DF GoTo _12F3 End @@ -1449,14 +1449,14 @@ _12F3: End _1303: - FrontierScrCmd_67 28, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _135E + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _135E FadeScreenOut - FrontierScrCmd_67 29, 0, 0, 0x8008 - CallIfEq 0x8008, 2, _1358 - FrontierScrCmd_67 29, 0, 0, 0x8008 - GoToIfEq 0x8008, 3, _1368 - FrontierScrCmd_67 32, 0, 0, 0x8008 + FrontierScrCmd_67 29, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 2, _1358 + FrontierScrCmd_67 29, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 3, _1368 + FrontierScrCmd_67 32, 0, 0, VAR_0x8008 FrontierScrCmd_6F FrontierScrCmd_5E FrontierScrCmd_02 @@ -1472,7 +1472,7 @@ _135E: Return _1368: - FrontierScrCmd_67 32, 0, 0, 0x8008 + FrontierScrCmd_67 32, 0, 0, VAR_0x8008 FrontierScrCmd_6F FrontierScrCmd_5E FrontierScrCmd_04 14, 1 @@ -1481,7 +1481,7 @@ _1368: _137B: MessageInstant BattleFactoryScene_Text_Saving2 ShowSavingIcon - FrontierScrCmd_73 0x8008 + FrontierScrCmd_73 VAR_0x8008 HideSavingIcon PlaySoundEffect SEQ_SE_DP_SAVE WaitSoundEffect SEQ_SE_DP_SAVE @@ -1491,13 +1491,13 @@ _1391: PlaySoundEffect SEQ_SE_DP_KAIDAN2 WaitSoundEffect SEQ_SE_DP_KAIDAN2 FadeScreenOut - FrontierScrCmd_67 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _13EA + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _13EA FrontierScrCmd_25 0 FrontierScrCmd_25 4 FrontierScrCmd_03 3 - FrontierScrCmd_67 31, 0, 0, 0x8008 - GetPlayerObjEventGfx 0x8007 + FrontierScrCmd_67 31, 0, 0, VAR_0x8008 + GetPlayerObjEventGfx VAR_0x8007 FrontierScrCmd_22 _0008 FrontierScrCmd_24 _0098 FadeScreenIn @@ -1508,20 +1508,20 @@ _13EA: FrontierScrCmd_25 2 FrontierScrCmd_25 4 FrontierScrCmd_03 3 - FrontierScrCmd_67 31, 0, 0, 0x8008 - GetPlayerObjEventGfx 0x8007 + FrontierScrCmd_67 31, 0, 0, VAR_0x8008 + GetPlayerObjEventGfx VAR_0x8007 FrontierScrCmd_22 _0014 FrontierScrCmd_24 _00BC FadeScreenIn Return _141F: - FrontierScrCmd_67 28, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1447 + FrontierScrCmd_67 28, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1447 FrontierScrCmd_28 98, _0278 FrontierScrCmd_29 FrontierScrCmd_25 98 - FrontierScrCmd_23 0x800B + FrontierScrCmd_23 VAR_0x800B Return _1447: @@ -1531,35 +1531,35 @@ _1447: FrontierScrCmd_29 FrontierScrCmd_25 98 FrontierScrCmd_25 99 - FrontierScrCmd_23 0x800B - FrontierScrCmd_23 0x800C + FrontierScrCmd_23 VAR_0x800B + FrontierScrCmd_23 VAR_0x800C Return _1471: - FrontierScrCmd_67 30, 0, 0, 0x8008 - WaitTime 3, 0x8008 - FrontierScrCmd_67 30, 1, 0, 0x8008 - WaitTime 3, 0x8008 - FrontierScrCmd_67 30, 2, 0, 0x8008 - WaitTime 3, 0x8008 - FrontierScrCmd_67 30, 3, 0, 0x8008 - WaitTime 3, 0x8008 - FrontierScrCmd_67 30, 4, 0, 0x8008 + FrontierScrCmd_67 30, 0, 0, VAR_0x8008 + WaitTime 3, VAR_0x8008 + FrontierScrCmd_67 30, 1, 0, VAR_0x8008 + WaitTime 3, VAR_0x8008 + FrontierScrCmd_67 30, 2, 0, VAR_0x8008 + WaitTime 3, VAR_0x8008 + FrontierScrCmd_67 30, 3, 0, VAR_0x8008 + WaitTime 3, VAR_0x8008 + FrontierScrCmd_67 30, 4, 0, VAR_0x8008 Return _14AE: - GoToIfEq 0x8003, 1, _0C52 - FrontierScrCmd_67 41, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0C52 + GoToIfEq VAR_0x8003, 1, _0C52 + FrontierScrCmd_67 41, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0C52 Call _1612 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 Message BattleFactoryScene_Text_FactoryHeadApproaching GoTo _0C65 End _14E6: Call _1612 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 Call _154A Call _1530 Message BattleFactoryScene_Text_ThortonIntro @@ -1569,7 +1569,7 @@ _14E6: _150B: Call _1612 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 Call _154A Call _1530 Message BattleFactoryScene_Text_ThortonIntroGold @@ -1578,10 +1578,10 @@ _150B: End _1530: - FrontierScrCmd_67 34, 0, 0, 0x8008 - GetRandom 0x8008, 90 - AddVar 0x8008, 10 - BufferNumber 3, 0x8008 + FrontierScrCmd_67 34, 0, 0, VAR_0x8008 + GetRandom VAR_0x8008, 90 + AddVar VAR_0x8008, 10 + BufferNumber 3, VAR_0x8008 Return _154A: @@ -1595,9 +1595,9 @@ _154A: FrontierScrCmd_43 0, 1 FrontierScrCmd_43 0, 2 PlaySoundEffect SEQ_SE_PL_FAC01 - WaitTime 36, 0x8008 + WaitTime 36, VAR_0x8008 FrontierScrCmd_4C 0, 3, 2, 10 - WaitTime 11, 0x8008 + WaitTime 11, VAR_0x8008 FrontierScrCmd_28 98, _0270 FrontierScrCmd_29 FrontierScrCmd_44 @@ -1606,63 +1606,63 @@ _154A: _15AA: Call _1612 - BufferNumber 0, 0x8008 - FrontierScrCmd_3E 0x4050, 0x8008 - CallIfEq 0x8008, 0, _15D6 + BufferNumber 0, VAR_0x8008 + FrontierScrCmd_3E VAR_BATTLE_FACTORY_PRINT_STATE, VAR_0x8008 + CallIfEq VAR_0x8008, 0, _15D6 Message BattleFactoryScene_Text_BeatThorton CloseMessage GoTo _0B30 End _15D6: - FrontierScrCmd_3D 0x4050, 1 + FrontierScrCmd_3D VAR_BATTLE_FACTORY_PRINT_STATE, 1 Return _15DE: Call _1612 - BufferNumber 0, 0x8008 - FrontierScrCmd_3E 0x4050, 0x8008 - CallIfEq 0x8008, 2, _160A + BufferNumber 0, VAR_0x8008 + FrontierScrCmd_3E VAR_BATTLE_FACTORY_PRINT_STATE, VAR_0x8008 + CallIfEq VAR_0x8008, 2, _160A Message BattleFactoryScene_Text_BeatThortonGold CloseMessage GoTo _0B30 End _160A: - FrontierScrCmd_3D 0x4050, 3 + FrontierScrCmd_3D VAR_BATTLE_FACTORY_PRINT_STATE, 3 Return _1612: - FrontierScrCmd_67 4, 0, 0, 0x8008 - GoToIfGe 0x8008, 9999, _162E - AddVar 0x8008, 1 + FrontierScrCmd_67 4, 0, 0, VAR_0x8008 + GoToIfGe VAR_0x8008, 9999, _162E + AddVar VAR_0x8008, 1 Return _162E: Return _1630: - WaitTime 1, 0x8008 - FrontierScrCmd_67 27, 0, 0, 0x8008 - WaitTime 1, 0x8008 + WaitTime 1, VAR_0x8008 + FrontierScrCmd_67 27, 0, 0, VAR_0x8008 + WaitTime 1, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 195 ClearReceivedTempDataAllPlayers Return _164D: - WaitTime 1, 0x8008 - FrontierScrCmd_67 27, 0, 0, 0x8008 - WaitTime 1, 0x8008 + WaitTime 1, VAR_0x8008 + FrontierScrCmd_67 27, 0, 0, VAR_0x8008 + WaitTime 1, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 196 ClearReceivedTempDataAllPlayers Return _166A: - WaitTime 1, 0x8008 - FrontierScrCmd_67 27, 0, 0, 0x8008 - WaitTime 1, 0x8008 + WaitTime 1, VAR_0x8008 + FrontierScrCmd_67 27, 0, 0, VAR_0x8008 + WaitTime 1, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 197 ClearReceivedTempDataAllPlayers diff --git a/res/field/frontier_scripts/frontier_scripts_battle_hall.s b/res/field/frontier_scripts/frontier_scripts_battle_hall.s index f476d831c8..d22d8367ea 100644 --- a/res/field/frontier_scripts/frontier_scripts_battle_hall.s +++ b/res/field/frontier_scripts/frontier_scripts_battle_hall.s @@ -549,17 +549,17 @@ _0320: .short 0xFD13 _0326: - FrontierScrCmd_3E VAR_BATTLE_HALL_CHALLENGE_TYPE, 0x8001 - FrontierScrCmd_3E 0x4003, 0x8003 - FrontierScrCmd_3E 0x4002, 0x8002 - FrontierScrCmd_3E 0x4005, 0x8000 - GetPlayerObjEventGfx 0x800A - SetVar 0x800E, 0 + FrontierScrCmd_3E VAR_BATTLE_HALL_CHALLENGE_TYPE, VAR_0x8001 + FrontierScrCmd_3E VAR_MAP_LOCAL_3, VAR_0x8003 + FrontierScrCmd_3E VAR_MAP_LOCAL_2, VAR_0x8002 + FrontierScrCmd_3E VAR_MAP_LOCAL_5, VAR_0x8000 + GetPlayerObjEventGfx VAR_0x800A + SetVar FR_VAR_0x800E, 0 FrontierScrCmd_6C - FrontierScrCmd_8B 0x8003, 0x8001, 0x8002, 0x8000 - FrontierScrCmd_91 30, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0382 - SetVar 0x800F, 231 + FrontierScrCmd_8B VAR_0x8003, VAR_0x8001, VAR_0x8002, VAR_0x8000 + FrontierScrCmd_91 30, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0382 + SetVar FR_VAR_0x800F, 231 FrontierScrCmd_22 _0008 FrontierScrCmd_24 _0038 GoTo _03A6 @@ -568,7 +568,7 @@ _0326: _0382: Call _13E1 IncrementTrainerScore TRAINER_SCORE_EVENT_UNK_43 - SetVar 0x800F, 232 + SetVar FR_VAR_0x800F, 232 FrontierScrCmd_22 _0010 FrontierScrCmd_24 _005C GoTo _03A6 @@ -576,8 +576,8 @@ _0382: _03A6: FadeScreenIn - FrontierScrCmd_91 30, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0404 + FrontierScrCmd_91 30, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0404 FrontierScrCmd_28 3, _0188 FrontierScrCmd_28 10, _0144 FrontierScrCmd_29 @@ -587,7 +587,7 @@ _03A6: FrontierScrCmd_25 0 FrontierScrCmd_25 3 FrontierScrCmd_25 10 - FrontierScrCmd_23 0x800F + FrontierScrCmd_23 FR_VAR_0x800F GoTo _044A End @@ -602,14 +602,14 @@ _0404: FrontierScrCmd_25 1 FrontierScrCmd_25 2 FrontierScrCmd_25 3 - FrontierScrCmd_23 0x800F + FrontierScrCmd_23 FR_VAR_0x800F GoTo _044A End _044A: FrontierScrCmd_03 10 - FrontierScrCmd_91 30, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0476 + FrontierScrCmd_91 30, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0476 FrontierScrCmd_22 _0024 FrontierScrCmd_24 _008C GoTo _048A @@ -622,7 +622,7 @@ _0476: End _048A: - FrontierScrCmd_45 0x8002, 128, 56, 0xC350, 0, 0 + FrontierScrCmd_45 VAR_0x8002, 128, 56, 0xC350, 0, 0 FrontierScrCmd_41 0, 2, 1 FrontierScrCmd_43 0, 18 FrontierScrCmd_43 0, 19 @@ -637,9 +637,9 @@ _04D4: End _04DC: - SetVar 0x8003, 0 - FrontierScrCmd_91 30, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0510 + SetVar VAR_0x8003, 0 + FrontierScrCmd_91 30, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0510 FrontierScrCmd_28 0, _01AC FrontierScrCmd_28 10, _01CC FrontierScrCmd_29 @@ -657,23 +657,23 @@ _0510: _0532: FrontierScrCmd_4E 10, 160, 230, 192, 0, 0 FrontierScrCmd_43 0, 20 - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 FadeScreenOut COLOR_WHITE - FrontierScrCmd_91 31, 0, 0, 0x8008 + FrontierScrCmd_91 31, 0, 0, VAR_0x8008 FrontierScrCmd_42 0 FadeScreenIn COLOR_WHITE FrontierScrCmd_46 0xC350 - FrontierScrCmd_91 23, 0, 0, 0x8008 - GoToIfEq 0x8008, 0, _0595 - SetVar 0x8003, 1 + FrontierScrCmd_91 23, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0595 + SetVar VAR_0x8003, 1 GoTo _0B48 End _0595: Message BattleHallScene_Text_ChooseType - FrontierScrCmd_91 35, 0, 0, 0x8008 - FrontierScrCmd_91 30, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _05BC + FrontierScrCmd_91 35, 0, 0, VAR_0x8008 + FrontierScrCmd_91 30, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _05BC GoTo _0611 End @@ -687,10 +687,10 @@ _05BC: End _05D4: - SetVar 0x8006, 7 - FrontierScrCmd_93 0x8006, 0, 0x8008 - GoToIfEq 0x8008, 0, _05D4 - FrontierScrCmd_94 0x8006 + SetVar VAR_0x8006, 7 + FrontierScrCmd_93 VAR_0x8006, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _05D4 + FrontierScrCmd_94 VAR_0x8006 ClearReceivedTempDataAllPlayers ClearReceivedTempDataAllPlayers FrontierScrCmd_35 221 @@ -705,13 +705,13 @@ _05D4: _0611: FadeScreenOut CloseMessage - FrontierScrCmd_91 30, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _065B + FrontierScrCmd_91 30, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _065B OpenBattleHallApp - FrontierScrCmd_91 31, 0, 0, 0x8008 - FrontierScrCmd_91 36, 0, 0, 0x8008 + FrontierScrCmd_91 31, 0, 0, VAR_0x8008 + FrontierScrCmd_91 36, 0, 0, VAR_0x8008 FadeScreenIn - FrontierScrCmd_8C 0x8003 + FrontierScrCmd_8C VAR_0x8003 GoTo _0665 End @@ -722,22 +722,22 @@ _065B: Return _0665: - FrontierScrCmd_91 30, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0708 - CallIfNe 0x800E, 0, _080D - SetVar 0x800E, 1 - FrontierScrCmd_91 37, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1199 - GoToIfEq 0x8008, 2, _11BE + FrontierScrCmd_91 30, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0708 + CallIfNe FR_VAR_0x800E, 0, _080D + SetVar FR_VAR_0x800E, 1 + FrontierScrCmd_91 37, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1199 + GoToIfEq VAR_0x8008, 2, _11BE Call _13C3 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 Call _083D FrontierScrCmd_28 98, _0240 FrontierScrCmd_29 - WaitTime 15, 0x8008 + WaitTime 15, VAR_0x8008 FrontierScrCmd_28 98, _01A4 FrontierScrCmd_29 - FrontierScrCmd_91 32, 0, 0, 0x8008 + FrontierScrCmd_91 32, 0, 0, VAR_0x8008 FrontierScrCmd_95 0 WaitABPress CloseMessage @@ -752,8 +752,8 @@ _0700: End _0708: - CallIfNe 0x800E, 0, _0821 - SetVar 0x800E, 1 + CallIfNe FR_VAR_0x800E, 0, _0821 + SetVar FR_VAR_0x800E, 1 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 223 ClearReceivedTempDataAllPlayers @@ -762,10 +762,10 @@ _0708: End _0731: - SetVar 0x8006, 1 - FrontierScrCmd_93 0x8006, 0, 0x8008 - GoToIfEq 0x8008, 0, _0731 - FrontierScrCmd_94 0x8006 + SetVar VAR_0x8006, 1 + FrontierScrCmd_93 VAR_0x8006, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0731 + FrontierScrCmd_94 VAR_0x8006 ClearReceivedTempDataAllPlayers ClearReceivedTempDataAllPlayers FrontierScrCmd_35 222 @@ -774,10 +774,10 @@ _0731: End _0762: - SetVar 0x8006, 2 - FrontierScrCmd_93 0x8006, 0, 0x8008 - GoToIfEq 0x8008, 0, _0762 - FrontierScrCmd_94 0x8006 + SetVar VAR_0x8006, 2 + FrontierScrCmd_93 VAR_0x8006, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0762 + FrontierScrCmd_94 VAR_0x8006 ClearReceivedTempDataAllPlayers ClearReceivedTempDataAllPlayers FrontierScrCmd_35 103 @@ -785,18 +785,18 @@ _0762: FrontierScrCmd_28 98, _0254 FrontierScrCmd_28 99, _026C FrontierScrCmd_29 - WaitTime 15, 0x8008 + WaitTime 15, VAR_0x8008 FrontierScrCmd_28 98, _01A4 FrontierScrCmd_29 - FrontierScrCmd_91 32, 0, 0, 0x8008 + FrontierScrCmd_91 32, 0, 0, VAR_0x8008 FrontierScrCmd_95 0 - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 CloseMessage FrontierScrCmd_28 99, _01A4 FrontierScrCmd_29 - FrontierScrCmd_91 32, 0, 0, 0x8008 + FrontierScrCmd_91 32, 0, 0, VAR_0x8008 FrontierScrCmd_95 1 - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 CloseMessage FrontierScrCmd_28 1, _0214 FrontierScrCmd_28 2, _021C @@ -821,35 +821,35 @@ _0821: Return _083D: - FrontierScrCmd_91 20, 0, 0, 0x8008 - SetVar 0x800B, 0x8008 + FrontierScrCmd_91 20, 0, 0, VAR_0x8008 + SetVar VAR_0x800B, VAR_0x8008 FrontierScrCmd_22 _0114 FrontierScrCmd_24 _0124 Return _0858: - FrontierScrCmd_91 20, 0, 0, 0x8008 - SetVar 0x800B, 0x8008 + FrontierScrCmd_91 20, 0, 0, VAR_0x8008 + SetVar VAR_0x800B, VAR_0x8008 FrontierScrCmd_22 _0114 FrontierScrCmd_24 _0124 - FrontierScrCmd_91 20, 1, 0, 0x8008 - SetVar 0x800C, 0x8008 + FrontierScrCmd_91 20, 1, 0, VAR_0x8008 + SetVar VAR_0x800C, VAR_0x8008 FrontierScrCmd_22 _011C FrontierScrCmd_24 _0134 Return _088C: - SetVar 0x800B, 216 + SetVar VAR_0x800B, 216 FrontierScrCmd_22 _0114 FrontierScrCmd_24 _0124 Return _08A0: - FrontierScrCmd_91 30, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _08F1 - FrontierScrCmd_91 37, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _08E1 - GoToIfEq 0x8008, 2, _08E1 + FrontierScrCmd_91 30, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _08F1 + FrontierScrCmd_91 37, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _08E1 + GoToIfEq VAR_0x8008, 2, _08E1 FrontierScrCmd_3F 1 GoTo _0907 End @@ -872,22 +872,22 @@ _08F1: _0907: FrontierScrCmd_90 FrontierScrCmd_8F - FrontierScrCmd_91 27, 0, 0, 0x8008 - FrontierScrCmd_91 31, 0, 0, 0x8008 + FrontierScrCmd_91 27, 0, 0, VAR_0x8008 + FrontierScrCmd_91 31, 0, 0, VAR_0x8008 FadeScreenIn - FrontierScrCmd_92 0x8008 - GoToIfEq 0x8008, 0, _0F5D + FrontierScrCmd_92 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0F5D IncrementRecordValue RECORD_UNK_062 - FrontierScrCmd_91 28, 0, 0, 0x8008 - FrontierScrCmd_91 33, 0, 0, 0x8008 - CallIfEq 0x8008, 10, _09B1 - FrontierScrCmd_91 30, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _09E3 - FrontierScrCmd_91 37, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _1333 - GoToIfEq 0x8008, 2, _137B + FrontierScrCmd_91 28, 0, 0, VAR_0x8008 + FrontierScrCmd_91 33, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 10, _09B1 + FrontierScrCmd_91 30, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _09E3 + FrontierScrCmd_91 37, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _1333 + GoToIfEq VAR_0x8008, 2, _137B Call _13C3 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 FrontierScrCmd_41 0, 2, 1 Call _1125 FrontierScrCmd_44 @@ -903,7 +903,7 @@ _09B7: FrontierScrCmd_28 98, _02C8 FrontierScrCmd_29 FrontierScrCmd_25 98 - FrontierScrCmd_23 0x800B + FrontierScrCmd_23 VAR_0x800B FrontierScrCmd_28 11, _02FC FrontierScrCmd_28 10, _0304 FrontierScrCmd_29 @@ -921,8 +921,8 @@ _09E3: FrontierScrCmd_29 FrontierScrCmd_25 98 FrontierScrCmd_25 99 - FrontierScrCmd_23 0x800B - FrontierScrCmd_23 0x800C + FrontierScrCmd_23 VAR_0x800B + FrontierScrCmd_23 VAR_0x800C FrontierScrCmd_28 11, _02FC FrontierScrCmd_28 1, _0304 FrontierScrCmd_28 2, _0304 @@ -935,21 +935,21 @@ _0A41: End _0A49: - FrontierScrCmd_91 14, 1, 0, 0x8008 - FrontierScrCmd_91 5, 0, 0, 0x8008 - FrontierScrCmd_91 23, 0, 0, 0x8008 - GoToIfNe 0x8008, 10, _0B25 + FrontierScrCmd_91 14, 1, 0, VAR_0x8008 + FrontierScrCmd_91 5, 0, 0, VAR_0x8008 + FrontierScrCmd_91 23, 0, 0, VAR_0x8008 + GoToIfNe VAR_0x8008, 10, _0B25 GoTo _0A73 End _0A73: - FrontierScrCmd_71 0x8008 - GoToIfEq 0x8008, 0, _0ABC - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _0E6F - CallIfEq 0x8008, 1, _0E75 - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _0AD6 + FrontierScrCmd_71 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0ABC + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _0E6F + CallIfEq VAR_0x8008, 1, _0E75 + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _0AD6 GoTo _0AC8 End @@ -964,15 +964,15 @@ _0AC8: End _0AD6: - FrontierScrCmd_91 22, 0, 0, 0x8008 - FrontierScrCmd_3D 0x40BA, 1 - FrontierScrCmd_91 15, 0, 0, 0x8008 - BufferSpeciesName 0, 0x8008 + FrontierScrCmd_91 22, 0, 0, VAR_0x8008 + FrontierScrCmd_3D VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 1 + FrontierScrCmd_91 15, 0, 0, VAR_0x8008 + BufferSpeciesName 0, VAR_0x8008 Message BattleHallScene_Text_BPEarned BufferPlayerName 0 - FrontierScrCmd_91 34, 0, 0, 0x8008 - BufferNumber 1, 0x8008 - GiveBattlePoints 0x8008 + FrontierScrCmd_91 34, 0, 0, VAR_0x8008 + BufferNumber 1, VAR_0x8008 + GiveBattlePoints VAR_0x8008 Message BattleHallScene_Text_ReceiveBP PlayFanfare SEQ_PL_POINTGET3 WaitFanfare @@ -985,8 +985,8 @@ _0B1D: End _0B25: - FrontierScrCmd_91 15, 0, 0, 0x8008 - BufferSpeciesName 0, 0x8008 + FrontierScrCmd_91 15, 0, 0, VAR_0x8008 + BufferSpeciesName 0, VAR_0x8008 Message BattleHallScene_Text_FullRestore PlayFanfare SEQ_ASA WaitFanfare @@ -996,68 +996,68 @@ _0B25: _0B48: Call _13C3 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 GoTo _0B5B End _0B5B: - FrontierScrCmd_91 23, 0, 0, 0x8008 - AddVar 0x8008, 1 - BufferNumber 0, 0x8008 + FrontierScrCmd_91 23, 0, 0, VAR_0x8008 + AddVar VAR_0x8008, 1 + BufferNumber 0, VAR_0x8008 Message BattleHallScene_Text_AreYouReady GoTo _0B79 End _0B79: - FrontierScrCmd_91 30, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0BA2 - GoToIfEq 0x8003, 0, _0BF2 + FrontierScrCmd_91 30, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0BA2 + GoToIfEq VAR_0x8003, 0, _0BF2 GoTo _0BE4 End _0BA2: - FrontierScrCmd_71 0x8008 - GoToIfEq 0x8008, 0, _0BC8 - GoToIfEq 0x8003, 0, _0BD6 + FrontierScrCmd_71 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0BC8 + GoToIfEq VAR_0x8003, 0, _0BD6 GoTo _0BC8 End _0BC8: - SetVar 0x8008, 1 + SetVar VAR_0x8008, 1 GoTo _0C00 End _0BD6: - SetVar 0x8008, 2 + SetVar VAR_0x8008, 2 GoTo _0C00 End _0BE4: - SetVar 0x8008, 3 + SetVar VAR_0x8008, 3 GoTo _0C00 End _0BF2: - SetVar 0x8008, 4 + SetVar VAR_0x8008, 4 GoTo _0C00 End _0C00: - GoToIfEq 0x8008, 1, _0C36 - GoToIfEq 0x8008, 2, _0C51 - GoToIfEq 0x8008, 3, _0C74 - GoToIfEq 0x8008, 4, _0C97 + GoToIfEq VAR_0x8008, 1, _0C36 + GoToIfEq VAR_0x8008, 2, _0C51 + GoToIfEq VAR_0x8008, 3, _0C74 + GoToIfEq VAR_0x8008, 4, _0C97 End _0C36: - InitLocalTextListMenu 31, 13, 0, 0, 0x8009 + InitLocalTextListMenu 31, 13, 0, 0, VAR_0x8009 SetMenuXOriginSide 1 AddListMenuEntry BattleHallScene_Text_ContinueOption, 255, 0 GoTo _0CC2 End _0C51: - InitLocalTextListMenu 31, 11, 0, 0, 0x8009 + InitLocalTextListMenu 31, 11, 0, 0, VAR_0x8009 SetMenuXOriginSide 1 AddListMenuEntry BattleHallScene_Text_ContinueOption, 255, 0 AddListMenuEntry BattleHallScene_Text_RecordOption, 255, 1 @@ -1065,7 +1065,7 @@ _0C51: End _0C74: - InitLocalTextListMenu 31, 11, 0, 0, 0x8009 + InitLocalTextListMenu 31, 11, 0, 0, VAR_0x8009 SetMenuXOriginSide 1 AddListMenuEntry BattleHallScene_Text_ContinueOption, 255, 0 AddListMenuEntry BattleHallScene_Text_RestOption, 255, 2 @@ -1073,7 +1073,7 @@ _0C74: End _0C97: - InitLocalTextListMenu 31, 9, 0, 0, 0x8009 + InitLocalTextListMenu 31, 9, 0, 0, VAR_0x8009 SetMenuXOriginSide 1 AddListMenuEntry BattleHallScene_Text_ContinueOption, 255, 0 AddListMenuEntry BattleHallScene_Text_RecordOption, 255, 1 @@ -1088,16 +1088,16 @@ _0CC2: End _0CD4: - GoToIfEq 0x8009, 0, _0D10 - GoToIfEq 0x8009, 1, _0DAF - GoToIfEq 0x8009, 2, _0E7B - GoToIfEq 0x8009, 3, _0ECF + GoToIfEq VAR_0x8009, 0, _0D10 + GoToIfEq VAR_0x8009, 1, _0DAF + GoToIfEq VAR_0x8009, 2, _0E7B + GoToIfEq VAR_0x8009, 3, _0ECF GoTo _0ECF End _0D10: - FrontierScrCmd_91 30, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0D2C + FrontierScrCmd_91 30, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0D2C GoTo _0D99 End @@ -1108,13 +1108,13 @@ _0D2C: End _0D3B: - SetVar 0x8006, 3 - FrontierScrCmd_93 0x8006, 0, 0x8008 - GoToIfEq 0x8008, 0, _0D3B - FrontierScrCmd_94 0x8006 + SetVar VAR_0x8006, 3 + FrontierScrCmd_93 VAR_0x8006, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0D3B + FrontierScrCmd_94 VAR_0x8006 ClearReceivedTempDataAllPlayers - FrontierScrCmd_91 24, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0D80 + FrontierScrCmd_91 24, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0D80 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 102 ClearReceivedTempDataAllPlayers @@ -1124,13 +1124,13 @@ _0D3B: _0D80: BufferPartnerName 0 MessageNoSkip BattleHallScene_Text_PartnerRetired - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 MessageNoSkip BattleHallScene_Text_PleaseWait GoTo _0F30 End _0D99: - SetVar 0x8003, 0 + SetVar VAR_0x8003, 0 GoTo _0DA7 End @@ -1139,11 +1139,11 @@ _0DA7: End _0DAF: - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _0E6F - CallIfEq 0x8008, 1, _0E75 - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _0DF5 + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _0E6F + CallIfEq VAR_0x8008, 1, _0E75 + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _0DF5 GoTo _0DE7 End @@ -1163,12 +1163,12 @@ _0DFD: _0E0B: Call _0E1F - AddVar 0x8005, 1 + AddVar VAR_0x8005, 1 GoTo _0E28 End _0E1F: - FrontierScrCmd_91 4, 0, 0, 0x8005 + FrontierScrCmd_91 4, 0, 0, VAR_0x8005 Return _0E28: @@ -1176,13 +1176,13 @@ _0E28: End _0E30: - SetVar 0x8003, 1 + SetVar VAR_0x8003, 1 MessageInstant BattleHallScene_Text_Saving - FrontierScrCmd_91 17, 0, 0, 0x8008 + FrontierScrCmd_91 17, 0, 0, VAR_0x8008 ShowSavingIcon - FrontierScrCmd_6D 5, 0x8008, 0x8005, 0x8005 + FrontierScrCmd_6D 5, VAR_0x8008, VAR_0x8005, VAR_0x8005 HideSavingIcon - GoToIfEq 0x8005, 1, _0E62 + GoToIfEq VAR_0x8005, 1, _0E62 Message BattleHallScene_Text_VideoSaveFailed Return @@ -1202,20 +1202,20 @@ _0E75: _0E7B: Message BattleHallScene_Text_BreakQuestion - ShowYesNoMenu 0x8008, MENU_YES - GoToIfEq 0x8008, 1, _0EC7 + ShowYesNoMenu VAR_0x8008, MENU_YES + GoToIfEq VAR_0x8008, 1, _0EC7 GoTo _0E99 End _0E99: - FrontierScrCmd_3D 0x40BA, 2 - FrontierScrCmd_91 10, 0, 0, 0x8008 + FrontierScrCmd_3D VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 2 + FrontierScrCmd_91 10, 0, 0, VAR_0x8008 Call _1087 FrontierScrCmd_6F FrontierScrCmd_8D FadeScreenOut CloseMessage - FrontierScrCmd_91 7, 0, 0, 0x8008 + FrontierScrCmd_91 7, 0, 0, VAR_0x8008 End _0EC7: @@ -1224,10 +1224,10 @@ _0EC7: _0ECF: Message BattleHallScene_Text_RetireQuestion - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _0F55 - FrontierScrCmd_91 30, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0F01 + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _0F55 + FrontierScrCmd_91 30, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0F01 GoTo _0F40 End @@ -1237,9 +1237,9 @@ _0F01: End _0F0D: - SetVar 0x8006, 3 - FrontierScrCmd_93 0x8006, 1, 0x8008 - GoToIfEq 0x8008, 0, _0F0D + SetVar VAR_0x8006, 3 + FrontierScrCmd_93 VAR_0x8006, 1, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0F0D GoTo _0F30 End @@ -1251,8 +1251,8 @@ _0F30: End _0F40: - FrontierScrCmd_91 21, 0, 0, 0x8008 - FrontierScrCmd_3D 0x40BA, 3 + FrontierScrCmd_91 21, 0, 0, VAR_0x8008 + FrontierScrCmd_3D VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 3 GoTo _100D End @@ -1261,13 +1261,13 @@ _0F55: End _0F5D: - FrontierScrCmd_71 0x8008 - GoToIfEq 0x8008, 0, _0FA6 - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _0E6F - CallIfEq 0x8008, 1, _0E75 - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _0FC0 + FrontierScrCmd_71 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0FA6 + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _0E6F + CallIfEq VAR_0x8008, 1, _0E75 + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _0FC0 GoTo _0FB2 End @@ -1286,14 +1286,14 @@ _0FC0: End _0FC8: - FrontierScrCmd_91 21, 0, 0, 0x8008 - FrontierScrCmd_3D 0x40BA, 3 + FrontierScrCmd_91 21, 0, 0, VAR_0x8008 + FrontierScrCmd_3D VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 3 GoTo _0FDD End _0FDD: - FrontierScrCmd_91 30, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0FF9 + FrontierScrCmd_91 30, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0FF9 GoTo _100D End @@ -1312,13 +1312,13 @@ _100D: End _101D: - FrontierScrCmd_91 30, 0, 0, 0x8008 - CallIfEq 0x8008, 1, _1071 + FrontierScrCmd_91 30, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 1, _1071 FadeScreenOut - FrontierScrCmd_91 17, 0, 0, 0x8008 - CallIfEq 0x8008, 2, _106B - FrontierScrCmd_91 17, 0, 0, 0x8008 - GoToIfEq 0x8008, 3, _107B + FrontierScrCmd_91 17, 0, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 2, _106B + FrontierScrCmd_91 17, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 3, _107B FrontierScrCmd_6F FrontierScrCmd_8D FrontierScrCmd_02 @@ -1351,22 +1351,22 @@ _1087: _109F: MessageInstant BattleHallScene_Text_Saving2 ShowSavingIcon - FrontierScrCmd_76 0x8008 - CallIfEq 0x8008, 0, _10C2 + FrontierScrCmd_76 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _10C2 HideSavingIcon PlaySoundEffect SEQ_SE_DP_SAVE WaitSoundEffect SEQ_SE_DP_SAVE Return _10C2: - FrontierScrCmd_73 0x8008 + FrontierScrCmd_73 VAR_0x8008 Return _10C8: PlaySoundEffect SEQ_SE_DP_DENDOU - FrontierScrCmd_91 19, 0, 0, 0x8008 - GoToIfLt 0x8008, 2, _10F5 - GoToIfLt 0x8008, 5, _1109 + FrontierScrCmd_91 19, 0, 0, VAR_0x8008 + GoToIfLt VAR_0x8008, 2, _10F5 + GoToIfLt VAR_0x8008, 5, _1109 GoTo _1117 End @@ -1387,9 +1387,9 @@ _1117: Return _1125: - FrontierScrCmd_91 23, 0, 0, 0x8008 - AddVar 0x8008, 1 - GoToIfEq 0x8008, 10, _1159 + FrontierScrCmd_91 23, 0, 0, VAR_0x8008 + AddVar VAR_0x8008, 1 + GoToIfEq VAR_0x8008, 10, _1159 PlaySoundEffect SEQ_SE_DP_UG_022 FrontierScrCmd_43 0, 2 FrontierScrCmd_43 0, 3 @@ -1417,7 +1417,7 @@ _1173: _1199: Call _13C3 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 Call _1207 Message BattleHallScene_Text_ArgentaIntro CloseMessage @@ -1427,7 +1427,7 @@ _1199: _11BE: Call _13C3 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 Call _1207 Message BattleHallScene_Text_ArgentaIntroGold CloseMessage @@ -1438,7 +1438,7 @@ _11BE: _11E3: FrontierScrCmd_28 98, _0234 FrontierScrCmd_29 - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 FrontierScrCmd_28 10, _0214 FrontierScrCmd_28 98, _0224 FrontierScrCmd_29 @@ -1446,10 +1446,10 @@ _11E3: _1207: Call _088C - FrontierScrCmd_91 31, 1, 0, 0x8008 - FrontierScrCmd_45 0x8002, 128, 56, 0xC350, 0, 0 + FrontierScrCmd_91 31, 1, 0, VAR_0x8008 + FrontierScrCmd_45 VAR_0x8002, 128, 56, 0xC350, 0, 0 FrontierScrCmd_4E 10, 160, 230, 192, 0, 0 - WaitTime 10, 0x8008 + WaitTime 10, VAR_0x8008 FrontierScrCmd_4E 10, 160, 230, 192, 54, 1 FrontierScrCmd_28 98, _0280 FrontierScrCmd_28 0, _0318 @@ -1457,7 +1457,7 @@ _1207: FrontierScrCmd_41 0, 2, 1 FrontierScrCmd_43 0, 16 FrontierScrCmd_43 0, 17 - WaitTime 90, 0x8008 + WaitTime 90, VAR_0x8008 FrontierScrCmd_43 0, 18 FrontierScrCmd_28 98, _02C0 FrontierScrCmd_29 @@ -1483,9 +1483,9 @@ _1207: FrontierScrCmd_29 FrontierScrCmd_46 0xC350 FrontierScrCmd_43 0, 20 - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 FadeScreenOut COLOR_WHITE - FrontierScrCmd_91 31, 0, 0, 0x8008 + FrontierScrCmd_91 31, 0, 0, VAR_0x8008 FrontierScrCmd_42 0 FadeScreenIn COLOR_WHITE FrontierScrCmd_28 98, _022C @@ -1494,71 +1494,71 @@ _1207: _1333: Call _13C3 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 FrontierScrCmd_41 0, 2, 1 Call _1173 FrontierScrCmd_44 FrontierScrCmd_42 0 - FrontierScrCmd_3E 0x4051, 0x8008 - CallIfEq 0x8008, 0, _1373 + FrontierScrCmd_3E VAR_BATTLE_HALL_PRINT_STATE, VAR_0x8008 + CallIfEq VAR_0x8008, 0, _1373 Message BattleHallScene_Text_BeatArgenta CloseMessage GoTo _09B7 End _1373: - FrontierScrCmd_3D 0x4051, 1 + FrontierScrCmd_3D VAR_BATTLE_HALL_PRINT_STATE, 1 Return _137B: Call _13C3 - BufferNumber 0, 0x8008 + BufferNumber 0, VAR_0x8008 FrontierScrCmd_41 0, 2, 1 Call _1173 FrontierScrCmd_44 FrontierScrCmd_42 0 - FrontierScrCmd_3E 0x4051, 0x8008 - CallIfEq 0x8008, 2, _13BB + FrontierScrCmd_3E VAR_BATTLE_HALL_PRINT_STATE, VAR_0x8008 + CallIfEq VAR_0x8008, 2, _13BB Message BattleHallScene_Text_BeatArgentaGold CloseMessage GoTo _09B7 End _13BB: - FrontierScrCmd_3D 0x4051, 3 + FrontierScrCmd_3D VAR_BATTLE_HALL_PRINT_STATE, 3 Return _13C3: - FrontierScrCmd_91 4, 0, 0, 0x8008 - GoToIfGe 0x8008, 9999, _13DF - AddVar 0x8008, 1 + FrontierScrCmd_91 4, 0, 0, VAR_0x8008 + GoToIfGe VAR_0x8008, 9999, _13DF + AddVar VAR_0x8008, 1 Return _13DF: Return _13E1: - WaitTime 1, 0x8008 - FrontierScrCmd_91 29, 0, 0, 0x8008 - WaitTime 1, 0x8008 + WaitTime 1, VAR_0x8008 + FrontierScrCmd_91 29, 0, 0, VAR_0x8008 + WaitTime 1, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 185 ClearReceivedTempDataAllPlayers Return _13FE: - WaitTime 1, 0x8008 - FrontierScrCmd_91 29, 0, 0, 0x8008 - WaitTime 1, 0x8008 + WaitTime 1, VAR_0x8008 + FrontierScrCmd_91 29, 0, 0, VAR_0x8008 + WaitTime 1, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 186 ClearReceivedTempDataAllPlayers Return _141B: - WaitTime 1, 0x8008 - FrontierScrCmd_91 29, 0, 0, 0x8008 - WaitTime 1, 0x8008 + WaitTime 1, VAR_0x8008 + FrontierScrCmd_91 29, 0, 0, VAR_0x8008 + WaitTime 1, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 187 ClearReceivedTempDataAllPlayers diff --git a/res/field/frontier_scripts/frontier_scripts_battle_tower_battle_room.s b/res/field/frontier_scripts/frontier_scripts_battle_tower_battle_room.s index 39c7a5d884..5df79b12de 100644 --- a/res/field/frontier_scripts/frontier_scripts_battle_tower_battle_room.s +++ b/res/field/frontier_scripts/frontier_scripts_battle_tower_battle_room.s @@ -157,63 +157,63 @@ _00D4: _00E2: FrontierScrCmd_6C - FrontierScrCmd_3E 0x40D9, 0x8001 + FrontierScrCmd_3E VAR_UNK_0x40D9, VAR_0x8001 Call _0176 Call _018F - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 - GoToIfEq 0x8008, 4, _015A - GoToIfEq 0x8008, 5, _015A + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 4, _015A + GoToIfEq VAR_0x8008, 5, _015A GoTo _0168 End _0120: FrontierScrCmd_22 _0008 FrontierScrCmd_24 _0018 - SetVar 0x8003, 0 + SetVar VAR_0x8003, 0 FadeScreenIn - GoToIfEq 0x8001, 1, _01A0 - GoToIfEq 0x8001, 2, _0394 + GoToIfEq VAR_0x8001, 1, _01A0 + GoToIfEq VAR_0x8001, 2, _0394 End _015A: - SetVar 0x800F, 235 + SetVar FR_VAR_0x800F, 235 GoTo _0120 End _0168: - SetVar 0x800F, 231 + SetVar FR_VAR_0x800F, 231 GoTo _0120 End _0176: - GoToIfEq 0x8001, 0, _018D - CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 0, 0x8009 + GoToIfEq VAR_0x8001, 0, _018D + CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 0, VAR_0x8009 Return _018D: Return _018F: - GoToIfEq 0x8001, 3, _019E + GoToIfEq VAR_0x8001, 3, _019E Return _019E: Return _01A0: - FrontierScrCmd_3D 0x40D9, 3 - FrontierScrCmd_3E 0x40D9, 0x8001 - CallBattleTowerFunction BT_FUNC_CHECK_IS_NULL, 0, 0x8008 - GoToIfEq 0x8008, 1, _03EF + FrontierScrCmd_3D VAR_UNK_0x40D9, 3 + FrontierScrCmd_3E VAR_UNK_0x40D9, VAR_0x8001 + CallBattleTowerFunction BT_FUNC_CHECK_IS_NULL, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _03EF Call _03CF GoTo _01CF End _01CF: Call _046D - GoToIfEq 0x800C, 0, _020F + GoToIfEq VAR_0x800C, 0, _020F Call _0382 - GoToIfEq 0x8008, 1, _0217 + GoToIfEq VAR_0x8008, 1, _0217 Call _034C Call _0360 Call _0374 @@ -233,12 +233,12 @@ _021F: End _0227: - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _06A7 - CallIfEq 0x8008, 1, _06AD - ShowYesNoMenu 0x8008, MENU_NO - CallIfEq 0x8008, 0, _0328 - CallBattleTowerFunction BT_FUNC_UPDATE_GAME_RECORDS_AND_JOURNAL, 0, 0x8008 + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _06A7 + CallIfEq VAR_0x8008, 1, _06AD + ShowYesNoMenu VAR_0x8008, MENU_NO + CallIfEq VAR_0x8008, 0, _0328 + CallBattleTowerFunction BT_FUNC_UPDATE_GAME_RECORDS_AND_JOURNAL, 0, VAR_0x8008 Message BattleTowerBattleRoom_Text_BPFromTycoon Call _0330 CloseMessage @@ -246,14 +246,14 @@ _0227: End _0273: - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _06A7 - CallIfEq 0x8008, 1, _06AD - ShowYesNoMenu 0x8008, MENU_NO - CallIfEq 0x8008, 0, _0328 - CallBattleTowerFunction BT_FUNC_UPDATE_GAME_RECORDS_AND_JOURNAL, 0, 0x8008 - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 - GoToIfEq 0x8008, 5, _02D4 + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _06A7 + CallIfEq VAR_0x8008, 1, _06AD + ShowYesNoMenu VAR_0x8008, MENU_NO + CallIfEq VAR_0x8008, 0, _0328 + CallBattleTowerFunction BT_FUNC_UPDATE_GAME_RECORDS_AND_JOURNAL, 0, VAR_0x8008 + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 5, _02D4 Message BattleTowerBattleRoom_Text_BPEarned Call _0330 CloseMessage @@ -266,13 +266,13 @@ _02D4: End _02DE: - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _06A7 - CallIfEq 0x8008, 1, _06AD - ShowYesNoMenu 0x8008, MENU_NO - CallIfEq 0x8008, 0, _0320 + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _06A7 + CallIfEq VAR_0x8008, 1, _06AD + ShowYesNoMenu VAR_0x8008, MENU_NO + CallIfEq VAR_0x8008, 0, _0320 CloseMessage - CallBattleTowerFunction BT_FUNC_UPDATE_GAME_RECORDS, 0, 0x8008 + CallBattleTowerFunction BT_FUNC_UPDATE_GAME_RECORDS, 0, VAR_0x8008 GoTo _03EF End @@ -285,8 +285,8 @@ _0328: Return _0330: - CallBattleTowerFunction BT_FUNC_UNK_46, 0, 0x8008 - BufferNumber 1, 0x8008 + CallBattleTowerFunction BT_FUNC_UNK_46, 0, VAR_0x8008 + BufferNumber 1, VAR_0x8008 BufferPlayerName 0 Message BattleTowerBattleRoom_Text_ReceiveBP PlayFanfare SEQ_PL_POINTGET3 @@ -297,7 +297,7 @@ _034C: FrontierScrCmd_28 2, _008C FrontierScrCmd_29 FrontierScrCmd_25 2 - FrontierScrCmd_23 0x800B + FrontierScrCmd_23 VAR_0x800B Return _0360: @@ -314,16 +314,16 @@ _0374: Return _0382: - CallBattleTowerFunction BT_FUNC_UNK_34, 0, 0x8008 - CallBattleTowerFunction BT_FUNC_HAS_DEFEATED_SEVEN_TRAINERS, 0, 0x8008 + CallBattleTowerFunction BT_FUNC_UNK_34, 0, VAR_0x8008 + CallBattleTowerFunction BT_FUNC_HAS_DEFEATED_SEVEN_TRAINERS, 0, VAR_0x8008 Return _0394: - FrontierScrCmd_3D 0x40D9, 3 - FrontierScrCmd_3E 0x40D9, 0x8001 - SetVar 0x8003, 1 - CallBattleTowerFunction BT_FUNC_CHECK_IS_NULL, 0, 0x8008 - GoToIfEq 0x8008, 1, _03EF + FrontierScrCmd_3D VAR_UNK_0x40D9, 3 + FrontierScrCmd_3E VAR_UNK_0x40D9, VAR_0x8001 + SetVar VAR_0x8003, 1 + CallBattleTowerFunction BT_FUNC_CHECK_IS_NULL, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _03EF Call _03CF Call _03DB GoTo _0741 @@ -342,47 +342,47 @@ _03DB: _03EF: FrontierScrCmd_6F - WaitTime 30, 0x8008 - FrontierScrCmd_3D 0x40D8, 1 - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 - SetVar 0x8010, 0x8008 - GoToIfEq 0x8010, 4, _043F - GoToIfEq 0x8010, 5, _043F + WaitTime 30, VAR_0x8008 + FrontierScrCmd_3D VAR_UNK_0x40D8, 1 + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 + SetVar FR_VAR_0x8010, VAR_0x8008 + GoToIfEq FR_VAR_0x8010, 4, _043F + GoToIfEq FR_VAR_0x8010, 5, _043F FadeScreenOut FrontierScrCmd_25 3 FrontierScrCmd_25 1 - FrontierScrCmd_23 0x800F + FrontierScrCmd_23 FR_VAR_0x800F FrontierScrCmd_02 _043F: FadeScreenOut FrontierScrCmd_25 3 FrontierScrCmd_25 1 - FrontierScrCmd_23 0x800F + FrontierScrCmd_23 FR_VAR_0x800F FrontierScrCmd_02 _0459: - FrontierScrCmd_3D 0x40D9, 0 - FrontierScrCmd_3E 0x40D9, 0x8001 + FrontierScrCmd_3D VAR_UNK_0x40D9, 0 + FrontierScrCmd_3E VAR_UNK_0x40D9, VAR_0x8001 Call _046D End _046D: - CallBattleTowerFunction BT_FUNC_SET_OPPONENT_TEAMS, 0, 0x8008 + CallBattleTowerFunction BT_FUNC_SET_OPPONENT_TEAMS, 0, VAR_0x8008 Call _04A8 FrontierScrCmd_85 0 WaitABPress CloseMessage Call _04C8 FrontierScrCmd_3F 0 - CallBattleTowerFunction BT_FUNC_UNK_59, 0, 0x8008 + CallBattleTowerFunction BT_FUNC_UNK_59, 0, VAR_0x8008 FrontierScrCmd_87 - FrontierScrCmd_88 0x800C + FrontierScrCmd_88 VAR_0x800C FadeScreenIn Return _04A8: - CallBattleTowerFunction BT_FUNC_GET_OPPONENT_OBJECT_ID, 0, 0x800B + CallBattleTowerFunction BT_FUNC_GET_OPPONENT_OBJECT_ID, 0, VAR_0x800B FrontierScrCmd_22 _0010 FrontierScrCmd_24 _003C FrontierScrCmd_28 2, _006C @@ -396,27 +396,27 @@ _04C8: Return _04DC: - CallBattleTowerFunction BT_FUNC_GET_NEXT_OPPONENT_NUM, 0, 0x800C - BufferNumber 0, 0x800C + CallBattleTowerFunction BT_FUNC_GET_NEXT_OPPONENT_NUM, 0, VAR_0x800C + BufferNumber 0, VAR_0x800C Message BattleTowerBattleRoom_Text_AreYouReady - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 - GoToIfNe 0x8008, 0, _052C - CallBattleTowerFunction BT_FUNC_UNK_36, 0, 0x8008 - GoToIfEq 0x8008, 20, _078C - GoToIfEq 0x8008, 48, _078C + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 + GoToIfNe VAR_0x8008, 0, _052C + CallBattleTowerFunction BT_FUNC_UNK_36, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 20, _078C + GoToIfEq VAR_0x8008, 48, _078C GoTo _052C End _052C: - GoToIfEq 0x8003, 0, _0554 - InitGlobalTextListMenu 31, 11, 0, 0, 0x8008 + GoToIfEq VAR_0x8003, 0, _0554 + InitGlobalTextListMenu 31, 11, 0, 0, VAR_0x8008 SetMenuXOriginSide 1 AddListMenuEntry MenuEntries_Text_BattleTowerBattleRoom_KeepGoing, 255, 0 GoTo _0577 End _0554: - InitGlobalTextListMenu 31, 9, 0, 0, 0x8008 + InitGlobalTextListMenu 31, 9, 0, 0, VAR_0x8008 SetMenuXOriginSide 1 AddListMenuEntry MenuEntries_Text_BattleTowerBattleRoom_KeepGoing, 255, 0 AddListMenuEntry MenuEntries_Text_Record, 255, 1 @@ -428,17 +428,17 @@ _0577: AddListMenuEntry MenuEntries_Text_BattleTowerBattleRoom_Retire, 255, 3 ShowListMenu CloseMessage - SetVar 0x8010, 0x8008 - GoToIfEq 0x8010, 0, _05CD - GoToIfEq 0x8010, 1, _05F5 - GoToIfEq 0x8010, 2, _06B3 - GoToIfEq 0x8010, 3, _0711 + SetVar FR_VAR_0x8010, VAR_0x8008 + GoToIfEq FR_VAR_0x8010, 0, _05CD + GoToIfEq FR_VAR_0x8010, 1, _05F5 + GoToIfEq FR_VAR_0x8010, 2, _06B3 + GoToIfEq FR_VAR_0x8010, 3, _0711 GoTo _05CD End _05CD: Call _05E1 - SetVar 0x8003, 0 + SetVar VAR_0x8003, 0 GoTo _01CF End @@ -449,11 +449,11 @@ _05E1: Return _05F5: - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _06A7 - CallIfEq 0x8008, 1, _06AD - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _04DC + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _06A7 + CallIfEq VAR_0x8008, 1, _06AD + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _04DC Call _0633 GoTo _04DC End @@ -465,12 +465,12 @@ _0633: _0641: Call _0655 - AddVar 0x8005, 1 + AddVar VAR_0x8005, 1 GoTo _065F End _0655: - CallBattleTowerFunction BT_FUNC_UNK_36, 0, 0x8005 + CallBattleTowerFunction BT_FUNC_UNK_36, 0, VAR_0x8005 Return _065F: @@ -478,13 +478,13 @@ _065F: End _0667: - SetVar 0x8003, 1 + SetVar VAR_0x8003, 1 MessageInstant BattleTowerBattleRoom_Text_Saving2 - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 ShowSavingIcon - FrontierScrCmd_6D 1, 0x8008, 0x8005, 0x8005 + FrontierScrCmd_6D 1, VAR_0x8008, VAR_0x8005, VAR_0x8005 HideSavingIcon - GoToIfEq 0x8005, 1, _069A + GoToIfEq VAR_0x8005, 1, _069A Message BattleTowerBattleRoom_Text_VideoSaveFailed Return @@ -504,47 +504,47 @@ _06AD: _06B3: Message BattleTowerBattleRoom_Text_SaveAndQuit - ShowYesNoMenu 0x8008, MENU_YES + ShowYesNoMenu VAR_0x8008, MENU_YES CloseMessage - GoToIfEq 0x8008, 0, _06D3 + GoToIfEq VAR_0x8008, 0, _06D3 GoTo _04DC End _06D3: - FrontierScrCmd_3D 0x40D8, 2 - CallBattleTowerFunction BT_FUNC_UNK_39, 0, 0x8008 + FrontierScrCmd_3D VAR_UNK_0x40D8, 2 + CallBattleTowerFunction BT_FUNC_UNK_39, 0, VAR_0x8008 FrontierScrCmd_86 Message BattleTowerBattleRoom_Text_Saving ShowSavingIcon - FrontierScrCmd_72 0x8008 + FrontierScrCmd_72 VAR_0x8008 HideSavingIcon PlaySoundEffect SEQ_SE_DP_SAVE WaitSoundEffect SEQ_SE_DP_SAVE FadeScreenOut CloseMessage FrontierScrCmd_6F - CallBattleTowerFunction BT_FUNC_RESET_SYSTEM, 0, 0x8008 + CallBattleTowerFunction BT_FUNC_RESET_SYSTEM, 0, VAR_0x8008 End _0711: Message BattleTowerBattleRoom_Text_CancelQuestion - ShowYesNoMenu 0x8008, MENU_NO + ShowYesNoMenu VAR_0x8008, MENU_NO CloseMessage - GoToIfEq 0x8008, 0, _0731 + GoToIfEq VAR_0x8008, 0, _0731 GoTo _04DC End _0731: - CallBattleTowerFunction BT_FUNC_UPDATE_GAME_RECORDS, 0, 0x8008 + CallBattleTowerFunction BT_FUNC_UPDATE_GAME_RECORDS, 0, VAR_0x8008 GoTo _03EF End _0741: - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 - GoToIfNe 0x8008, 0, _04DC - CallBattleTowerFunction BT_FUNC_UNK_36, 0, 0x8008 - GoToIfEq 0x8008, 20, _0780 - GoToIfEq 0x8008, 48, _0780 + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 + GoToIfNe VAR_0x8008, 0, _04DC + CallBattleTowerFunction BT_FUNC_UNK_36, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 20, _0780 + GoToIfEq VAR_0x8008, 48, _0780 GoTo _04DC End @@ -554,15 +554,15 @@ _0780: End _078C: - GoToIfEq 0x8003, 0, _07B4 - InitGlobalTextListMenu 31, 11, 0, 0, 0x8008 + GoToIfEq VAR_0x8003, 0, _07B4 + InitGlobalTextListMenu 31, 11, 0, 0, VAR_0x8008 SetMenuXOriginSide 1 AddListMenuEntry MenuEntries_Text_BattleTowerBattleRoom_KeepGoing, 255, 0 GoTo _07D7 End _07B4: - InitGlobalTextListMenu 31, 9, 0, 0, 0x8008 + InitGlobalTextListMenu 31, 9, 0, 0, VAR_0x8008 SetMenuXOriginSide 1 AddListMenuEntry MenuEntries_Text_BattleTowerBattleRoom_KeepGoing, 255, 0 AddListMenuEntry MenuEntries_Text_Record, 255, 1 @@ -574,21 +574,21 @@ _07D7: AddListMenuEntry MenuEntries_Text_BattleTowerBattleRoom_Retire, 255, 3 ShowListMenu CloseMessage - SetVar 0x8010, 0x8008 - GoToIfEq 0x8010, 0, _082D - GoToIfEq 0x8010, 1, _05F5 - GoToIfEq 0x8010, 2, _06B3 - GoToIfEq 0x8010, 3, _0711 + SetVar FR_VAR_0x8010, VAR_0x8008 + GoToIfEq FR_VAR_0x8010, 0, _082D + GoToIfEq FR_VAR_0x8010, 1, _05F5 + GoToIfEq FR_VAR_0x8010, 2, _06B3 + GoToIfEq FR_VAR_0x8010, 3, _0711 GoTo _082D End _082D: Call _05E1 - SetVar 0x8003, 0 - CallBattleTowerFunction BT_FUNC_SET_OPPONENT_TEAMS, 0, 0x8008 + SetVar VAR_0x8003, 0 + CallBattleTowerFunction BT_FUNC_SET_OPPONENT_TEAMS, 0, VAR_0x8008 Call _092C - CallBattleTowerFunction BT_FUNC_UNK_36, 0, 0x8008 - GoToIfEq 0x8008, 48, _08F1 + CallBattleTowerFunction BT_FUNC_UNK_36, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 48, _08F1 BufferPlayerName 0 BufferRivalName 1 Message BattleTowerBattleRoom_Text_PalmerIntro @@ -601,20 +601,20 @@ _086E: IncrementRecordValue RECORD_UNK_059 FrontierScrCmd_47 1 FrontierScrCmd_87 - FrontierScrCmd_88 0x800C + FrontierScrCmd_88 VAR_0x800C FadeScreenIn - GoToIfEq 0x800C, 0, _020F - CallBattleTowerFunction BT_FUNC_UNK_36, 0, 0x8008 - GoToIfEq 0x8008, 48, _08FD - FrontierScrCmd_3E 0x404F, 0x8008 - CallIfEq 0x8008, 0, _08D9 + GoToIfEq VAR_0x800C, 0, _020F + CallBattleTowerFunction BT_FUNC_UNK_36, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 48, _08FD + FrontierScrCmd_3E VAR_BATTLE_TOWER_PRINT_STATE, VAR_0x8008 + CallIfEq VAR_0x8008, 0, _08D9 Message BattleTowerBattleRoom_Text_BeatPalmer - CallBattleTowerFunction BT_FUNC_SET_BEAT_PALMER, 1, 0x8008 + CallBattleTowerFunction BT_FUNC_SET_BEAT_PALMER, 1, VAR_0x8008 GoTo _08E1 End _08D9: - FrontierScrCmd_3D 0x404F, 1 + FrontierScrCmd_3D VAR_BATTLE_TOWER_PRINT_STATE, 1 Return _08E1: @@ -629,19 +629,19 @@ _08F1: End _08FD: - FrontierScrCmd_3E 0x404F, 0x8008 - CallIfEq 0x8008, 2, _0924 + FrontierScrCmd_3E VAR_BATTLE_TOWER_PRINT_STATE, VAR_0x8008 + CallIfEq VAR_0x8008, 2, _0924 Message BattleTowerBattleRoom_Text_BeatPalmerGold - CallBattleTowerFunction BT_FUNC_SET_BEAT_PALMER, 2, 0x8008 + CallBattleTowerFunction BT_FUNC_SET_BEAT_PALMER, 2, VAR_0x8008 GoTo _08E1 End _0924: - FrontierScrCmd_3D 0x404F, 3 + FrontierScrCmd_3D VAR_BATTLE_TOWER_PRINT_STATE, 3 Return _092C: - SetVar 0x800B, 169 + SetVar VAR_0x800B, 169 FrontierScrCmd_22 _0010 FrontierScrCmd_24 _003C FrontierScrCmd_28 2, _00D4 diff --git a/res/field/frontier_scripts/frontier_scripts_battle_tower_corridor.s b/res/field/frontier_scripts/frontier_scripts_battle_tower_corridor.s index ddf9f5bb5f..695f89ee1a 100644 --- a/res/field/frontier_scripts/frontier_scripts_battle_tower_corridor.s +++ b/res/field/frontier_scripts/frontier_scripts_battle_tower_corridor.s @@ -153,9 +153,9 @@ _00D0: .short 0xFD13 _00E2: - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 - GoToIfEq 0x8008, 4, _0145 - GoToIfEq 0x8008, 5, _0145 + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 4, _0145 + GoToIfEq VAR_0x8008, 5, _0145 GoTo _0153 End @@ -165,27 +165,27 @@ _010C: FrontierScrCmd_2A _0028 FrontierScrCmd_2C _002C FadeScreenIn - FrontierScrCmd_3E 0x40DC, 0x8001 - GoToIfEq 0x8001, 1, _0161 + FrontierScrCmd_3E VAR_UNK_0x40DC, VAR_0x8001 + GoToIfEq VAR_0x8001, 1, _0161 End _0145: - SetVar 0x800F, 235 + SetVar FR_VAR_0x800F, 235 GoTo _010C End _0153: - SetVar 0x800F, 231 + SetVar FR_VAR_0x800F, 231 GoTo _010C End _0161: Call _01A2 - GetRandom 0x8008, 4 - SetVar 0x8010, 0x8008 - GoToIfEq 0x8010, 1, _01E4 - GoToIfEq 0x8010, 2, _01FE - GoToIfEq 0x8010, 3, _0218 + GetRandom VAR_0x8008, 4 + SetVar FR_VAR_0x8010, VAR_0x8008 + GoToIfEq FR_VAR_0x8010, 1, _01E4 + GoToIfEq FR_VAR_0x8010, 2, _01FE + GoToIfEq FR_VAR_0x8010, 3, _0218 GoTo _01CA End @@ -234,7 +234,7 @@ _0232: FrontierScrCmd_2B 1 FrontierScrCmd_25 0 FrontierScrCmd_25 1 - FrontierScrCmd_23 0x800F + FrontierScrCmd_23 FR_VAR_0x800F FrontierScrCmd_04 7, 0 End diff --git a/res/field/frontier_scripts/frontier_scripts_battle_tower_corridor_multi.s b/res/field/frontier_scripts/frontier_scripts_battle_tower_corridor_multi.s index 578bd05bbb..6832f60ba6 100644 --- a/res/field/frontier_scripts/frontier_scripts_battle_tower_corridor_multi.s +++ b/res/field/frontier_scripts/frontier_scripts_battle_tower_corridor_multi.s @@ -215,27 +215,27 @@ _0138: .short 0xFD13 _0142: - FrontierScrCmd_3E 0x40DD, 0x8001 + FrontierScrCmd_3E VAR_UNK_0x40DD, VAR_0x8001 Call _0278 Call _0344 - SetVar 0x800F, 232 + SetVar FR_VAR_0x800F, 232 PlaySoundEffect SEQ_SE_DP_DOOR10 FrontierScrCmd_2A _009C FrontierScrCmd_2C _00A0 FrontierScrCmd_2F 1 - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 - GoToIfEq 0x8008, 3, _01B0 - GoToIfEq 0x8008, 6, _01B0 - SetVar 0x8002, 3 - SetVar 0x8003, 4 + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 3, _01B0 + GoToIfEq VAR_0x8008, 6, _01B0 + SetVar VAR_0x8002, 3 + SetVar VAR_0x8003, 4 FrontierScrCmd_22 _0008 FrontierScrCmd_24 _0024 GoTo _01D0 End _01B0: - SetVar 0x8002, 5 - SetVar 0x8003, 6 + SetVar VAR_0x8002, 5 + SetVar VAR_0x8003, 6 FrontierScrCmd_22 _0018 FrontierScrCmd_24 _0060 GoTo _01D0 @@ -250,17 +250,17 @@ _01D0: FrontierScrCmd_2D 0 FrontierScrCmd_2D 1 FrontierScrCmd_2B 1 - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 - GoToIfEq 0x8008, 3, _0250 - GoToIfEq 0x8008, 6, _0250 + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 3, _0250 + GoToIfEq VAR_0x8008, 6, _0250 FrontierScrCmd_25 0 FrontierScrCmd_25 1 FrontierScrCmd_25 2 FrontierScrCmd_25 3 FrontierScrCmd_25 4 - FrontierScrCmd_23 0x800F - FrontierScrCmd_23 0x800B - FrontierScrCmd_23 0x800C + FrontierScrCmd_23 FR_VAR_0x800F + FrontierScrCmd_23 VAR_0x800B + FrontierScrCmd_23 VAR_0x800C GoTo _0270 End @@ -270,7 +270,7 @@ _0250: FrontierScrCmd_25 2 FrontierScrCmd_25 5 FrontierScrCmd_25 6 - FrontierScrCmd_23 0x800F + FrontierScrCmd_23 FR_VAR_0x800F GoTo _0270 End @@ -279,10 +279,10 @@ _0270: End _0278: - GoToIfEq 0x8001, 0, _02AA - GoToIfEq 0x8000, 1, _02AC - CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 0, 0x800B - CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 1, 0x800C + GoToIfEq VAR_0x8001, 0, _02AA + GoToIfEq VAR_0x8000, 1, _02AC + CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 0, VAR_0x800B + CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 1, VAR_0x800C GoTo _02AA End @@ -290,8 +290,8 @@ _02AA: Return _02AC: - CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 0, 0x800B - CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 1, 0x800C + CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 0, VAR_0x800B + CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 1, VAR_0x800C Return _02BE: @@ -303,29 +303,29 @@ _02BE: FrontierScrCmd_28 1, _00B8 FrontierScrCmd_28 2, _00B8 FrontierScrCmd_29 - FrontierScrCmd_28 0x8002, _00C8 - FrontierScrCmd_28 0x8003, _00C8 + FrontierScrCmd_28 VAR_0x8002, _00C8 + FrontierScrCmd_28 VAR_0x8003, _00C8 FrontierScrCmd_29 Return _02FC: FrontierScrCmd_28 1, _00F8 - FrontierScrCmd_28 0x8002, _00D4 + FrontierScrCmd_28 VAR_0x8002, _00D4 FrontierScrCmd_28 2, _0118 - FrontierScrCmd_28 0x8003, _00E0 + FrontierScrCmd_28 VAR_0x8003, _00E0 FrontierScrCmd_29 Return _0320: FrontierScrCmd_28 1, _0138 FrontierScrCmd_28 2, _0138 - FrontierScrCmd_28 0x8002, _00EC - FrontierScrCmd_28 0x8003, _00EC + FrontierScrCmd_28 VAR_0x8002, _00EC + FrontierScrCmd_28 VAR_0x8003, _00EC FrontierScrCmd_29 Return _0344: - CallIfNe 0x8001, 0, _0353 + CallIfNe VAR_0x8001, 0, _0353 Return _0353: diff --git a/res/field/frontier_scripts/frontier_scripts_battle_tower_multi_battle_room.s b/res/field/frontier_scripts/frontier_scripts_battle_tower_multi_battle_room.s index cf8e7f1d78..7804af2cb5 100644 --- a/res/field/frontier_scripts/frontier_scripts_battle_tower_multi_battle_room.s +++ b/res/field/frontier_scripts/frontier_scripts_battle_tower_multi_battle_room.s @@ -259,13 +259,13 @@ _0172: FrontierScrCmd_6C Call _0BCF Call _0C15 - SetVar 0x8006, 0 - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 - GoToIfEq 0x8008, 3, _01CE - GoToIfEq 0x8008, 6, _01CE - SetVar 0x8001, 5 - SetVar 0x8002, 6 - SetVar 0x800F, 232 + SetVar VAR_0x8006, 0 + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 3, _01CE + GoToIfEq VAR_0x8008, 6, _01CE + SetVar VAR_0x8001, 5 + SetVar VAR_0x8002, 6 + SetVar FR_VAR_0x800F, 232 FrontierScrCmd_22 _0008 FrontierScrCmd_24 _0028 GoTo _01F8 @@ -273,9 +273,9 @@ _0172: _01CE: IncrementTrainerScore TRAINER_SCORE_EVENT_UNK_43 - SetVar 0x8001, 7 - SetVar 0x8002, 8 - SetVar 0x800F, 232 + SetVar VAR_0x8001, 7 + SetVar VAR_0x8002, 8 + SetVar FR_VAR_0x800F, 232 FrontierScrCmd_22 _0014 FrontierScrCmd_24 _0064 GoTo _01F8 @@ -283,31 +283,31 @@ _01CE: _01F8: FadeScreenIn - FrontierScrCmd_3E 0x40DE, 0x8008 - GoToIfEq 0x8008, 1, _0226 - GoToIfEq 0x8008, 2, _04FB + FrontierScrCmd_3E VAR_UNK_0x40DE, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0226 + GoToIfEq VAR_0x8008, 2, _04FB End _0226: - FrontierScrCmd_3D 0x40DE, 3 + FrontierScrCmd_3D VAR_UNK_0x40DE, 3 Call _025C - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 - GoToIfEq 0x8008, 3, _0270 - GoToIfEq 0x8008, 6, _0270 + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 3, _0270 + GoToIfEq VAR_0x8008, 6, _0270 GoTo _0965 End _025C: - FrontierScrCmd_28 0x8001, _00B8 - FrontierScrCmd_28 0x8002, _00CC + FrontierScrCmd_28 VAR_0x8001, _00B8 + FrontierScrCmd_28 VAR_0x8002, _00CC FrontierScrCmd_29 Return _0270: Call _0ACD - GoToIfEq 0x8003, 0, _077B + GoToIfEq VAR_0x8003, 0, _077B Call _09A5 - GoToIfEq 0x8008, 1, _09B7 + GoToIfEq VAR_0x8008, 1, _09B7 Call _09C5 Call _09E9 Call _0A0D @@ -315,11 +315,11 @@ _0270: End _02B0: - CallBattleTowerFunction BT_FUNC_GET_NEXT_OPPONENT_NUM, 0, 0x8008 - BufferNumber 0, 0x8008 + CallBattleTowerFunction BT_FUNC_GET_NEXT_OPPONENT_NUM, 0, VAR_0x8008 + BufferNumber 0, VAR_0x8008 Message BattleTowerMultiBattleRoom_Text_AskReadyForNextPair - GoToIfEq 0x8006, 0, _02E9 - InitGlobalTextListMenu 31, 13, 0, 0, 0x8008 + GoToIfEq VAR_0x8006, 0, _02E9 + InitGlobalTextListMenu 31, 13, 0, 0, VAR_0x8008 SetMenuXOriginSide 1 AddListMenuEntry MenuEntries_Text_BattleTowerBattleRoom_KeepGoing, 255, 0 GoTo _034B @@ -327,10 +327,10 @@ _02B0: _02E9: Call _0C57 - GoToIfEq 0x8008, 1, _0330 - FrontierScrCmd_71 0x8008 - GoToIfEq 0x8008, 0, _0330 - InitGlobalTextListMenu 31, 11, 0, 0, 0x8008 + GoToIfEq VAR_0x8008, 1, _0330 + FrontierScrCmd_71 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0330 + InitGlobalTextListMenu 31, 11, 0, 0, VAR_0x8008 SetMenuXOriginSide 1 AddListMenuEntry MenuEntries_Text_BattleTowerBattleRoom_KeepGoing, 255, 0 AddListMenuEntry MenuEntries_Text_Record, 255, 1 @@ -338,7 +338,7 @@ _02E9: End _0330: - InitGlobalTextListMenu 31, 13, 0, 0, 0x8008 + InitGlobalTextListMenu 31, 13, 0, 0, VAR_0x8008 SetMenuXOriginSide 1 AddListMenuEntry MenuEntries_Text_BattleTowerBattleRoom_KeepGoing, 255, 0 GoTo _034B @@ -348,47 +348,47 @@ _034B: AddListMenuEntry MenuEntries_Text_BattleTowerBattleRoom_Retire, 255, 2 ShowListMenu CloseMessage - SetVar 0x8000, 0 - GoToIfEq 0x8008, 2, _0B27 - GoToIfEq 0x8008, 1, _0B65 + SetVar VAR_0x8000, 0 + GoToIfEq VAR_0x8008, 2, _0B27 + GoToIfEq VAR_0x8008, 1, _0B65 GoTo _037F End _037F: - SetVar 0x8006, 0 + SetVar VAR_0x8006, 0 Message BattleTowerMultiBattleRoom_Text_AwaitingResponseFromFriend ClearReceivedTempDataAllPlayers FrontierScrCmd_35 5 - CallBattleTowerFunction BT_FUNC_UNK_58, 0, 0x8008 + CallBattleTowerFunction BT_FUNC_UNK_58, 0, VAR_0x8008 GoTo _039F End _039F: - FrontierScrCmd_89 2, 0x8000, 0x8008 - GoToIfEq 0x8008, 0, _039F - FrontierScrCmd_8A 2, 0x8000 + FrontierScrCmd_89 2, VAR_0x8000, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _039F + FrontierScrCmd_8A 2, VAR_0x8000 CloseMessage - SetVar 0x8010, 0x8000 - GoToIfEq 0x8010, 1, _0B4B + SetVar FR_VAR_0x8010, VAR_0x8000 + GoToIfEq FR_VAR_0x8010, 1, _0B4B Call _0605 GoTo _0270 End _03DD: FrontierScrCmd_6F - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 - GoToIfEq 0x8008, 3, _0437 - GoToIfEq 0x8008, 6, _0443 - WaitTime 30, 0x8008 - FrontierScrCmd_3D 0x40D8, 1 + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 3, _0437 + GoToIfEq VAR_0x8008, 6, _0443 + WaitTime 30, VAR_0x8008 + FrontierScrCmd_3D VAR_UNK_0x40D8, 1 FadeScreenOut FrontierScrCmd_25 0 FrontierScrCmd_25 1 FrontierScrCmd_25 2 FrontierScrCmd_25 5 FrontierScrCmd_25 6 - FrontierScrCmd_23 0x800F - FrontierScrCmd_23 0x800A + FrontierScrCmd_23 FR_VAR_0x800F + FrontierScrCmd_23 VAR_0x800A FrontierScrCmd_02 _0437: @@ -397,27 +397,27 @@ _0437: End _0443: - WaitTime 30, 0x8008 - FrontierScrCmd_3D 0x40D8, 1 + WaitTime 30, VAR_0x8008 + FrontierScrCmd_3D VAR_UNK_0x40D8, 1 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 6 - CallIfEq 0x8004, 100, _04D1 - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 - CallIfEq 0x8008, 6, _04DF + CallIfEq VAR_0x8004, 100, _04D1 + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 6, _04DF FadeScreenOut ClearReceivedTempDataAllPlayers FrontierScrCmd_35 8 - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 - CallIfEq 0x8008, 3, _04F7 + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 + CallIfEq VAR_0x8008, 3, _04F7 FrontierScrCmd_25 0 FrontierScrCmd_25 1 FrontierScrCmd_25 2 FrontierScrCmd_25 7 FrontierScrCmd_25 8 - FrontierScrCmd_23 0x800F - FrontierScrCmd_23 0x800A - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 - GoToIfEq 0x8008, 6, _04D5 + FrontierScrCmd_23 FR_VAR_0x800F + FrontierScrCmd_23 VAR_0x800A + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 6, _04D5 FrontierScrCmd_02 _04D1: @@ -432,7 +432,7 @@ _04D5: _04DF: MessageInstant BattleTowerMultiBattleRoom_Text_SavingDontTurnOffPower2 ShowSavingIcon - FrontierScrCmd_73 0x8008 + FrontierScrCmd_73 VAR_0x8008 HideSavingIcon PlaySoundEffect SEQ_SE_DP_SAVE WaitSoundEffect SEQ_SE_DP_SAVE @@ -444,8 +444,8 @@ _04F7: Return _04FB: - FrontierScrCmd_3D 0x40DE, 3 - SetVar 0x8006, 1 + FrontierScrCmd_3D VAR_UNK_0x40DE, 3 + SetVar VAR_0x8006, 1 Call _025C Call _051B GoTo _053F @@ -454,24 +454,24 @@ _04FB: _051B: FrontierScrCmd_28 1, _014C FrontierScrCmd_28 2, _014C - FrontierScrCmd_28 0x8001, _016C - FrontierScrCmd_28 0x8002, _016C + FrontierScrCmd_28 VAR_0x8001, _016C + FrontierScrCmd_28 VAR_0x8002, _016C FrontierScrCmd_29 Return _053F: - CallBattleTowerFunction BT_FUNC_GET_NEXT_OPPONENT_NUM, 0, 0x8008 - BufferNumber 0, 0x8008 + CallBattleTowerFunction BT_FUNC_GET_NEXT_OPPONENT_NUM, 0, VAR_0x8008 + BufferNumber 0, VAR_0x8008 Message BattleTowerMultiBattleRoom_Text_AskReadyForNextPair - GoToIfEq 0x8006, 0, _0578 - InitGlobalTextListMenu 31, 11, 0, 0, 0x8008 + GoToIfEq VAR_0x8006, 0, _0578 + InitGlobalTextListMenu 31, 11, 0, 0, VAR_0x8008 SetMenuXOriginSide 1 AddListMenuEntry MenuEntries_Text_BattleTowerBattleRoom_KeepGoing, 255, 0 GoTo _059B End _0578: - InitGlobalTextListMenu 31, 9, 0, 0, 0x8008 + InitGlobalTextListMenu 31, 9, 0, 0, VAR_0x8008 SetMenuXOriginSide 1 AddListMenuEntry MenuEntries_Text_BattleTowerBattleRoom_KeepGoing, 255, 0 AddListMenuEntry MenuEntries_Text_Record, 255, 1 @@ -483,34 +483,34 @@ _059B: AddListMenuEntry MenuEntries_Text_BattleTowerBattleRoom_Retire, 255, 3 ShowListMenu CloseMessage - SetVar 0x8010, 0x8008 - GoToIfEq 0x8010, 0, _05F1 - GoToIfEq 0x8010, 1, _0629 - GoToIfEq 0x8010, 2, _06E7 - GoToIfEq 0x8010, 3, _0745 + SetVar FR_VAR_0x8010, VAR_0x8008 + GoToIfEq FR_VAR_0x8010, 0, _05F1 + GoToIfEq FR_VAR_0x8010, 1, _0629 + GoToIfEq FR_VAR_0x8010, 2, _06E7 + GoToIfEq FR_VAR_0x8010, 3, _0745 GoTo _05F1 End _05F1: Call _0605 - SetVar 0x8006, 0 + SetVar VAR_0x8006, 0 GoTo _0965 End _0605: - FrontierScrCmd_28 0x8001, _0154 - FrontierScrCmd_28 0x8002, _0154 + FrontierScrCmd_28 VAR_0x8001, _0154 + FrontierScrCmd_28 VAR_0x8002, _0154 FrontierScrCmd_28 1, _015C FrontierScrCmd_28 2, _015C FrontierScrCmd_29 Return _0629: - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _06DB - CallIfEq 0x8008, 1, _06E1 - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _053F + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _06DB + CallIfEq VAR_0x8008, 1, _06E1 + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _053F Call _0667 GoTo _053F End @@ -522,12 +522,12 @@ _0667: _0675: Call _0689 - AddVar 0x8005, 1 + AddVar VAR_0x8005, 1 GoTo _0693 End _0689: - CallBattleTowerFunction BT_FUNC_UNK_36, 0, 0x8005 + CallBattleTowerFunction BT_FUNC_UNK_36, 0, VAR_0x8005 Return _0693: @@ -535,13 +535,13 @@ _0693: End _069B: - SetVar 0x8006, 1 + SetVar VAR_0x8006, 1 MessageInstant BattleTowerMultiBattleRoom_Text_SavingDontTurnOffPower - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 ShowSavingIcon - FrontierScrCmd_6D 1, 0x8008, 0x8005, 0x8005 + FrontierScrCmd_6D 1, VAR_0x8008, VAR_0x8005, VAR_0x8005 HideSavingIcon - GoToIfEq 0x8005, 1, _06CE + GoToIfEq VAR_0x8005, 1, _06CE Message BattleTowerMultiBattleRoom_Text_BattleVideoCouldntBeSaved Return @@ -561,130 +561,130 @@ _06E1: _06E7: Message BattleTowerMultiBattleRoom_Text_AskSaveAndQuit - ShowYesNoMenu 0x8008, MENU_YES + ShowYesNoMenu VAR_0x8008, MENU_YES CloseMessage - GoToIfEq 0x8008, 0, _0707 + GoToIfEq VAR_0x8008, 0, _0707 GoTo _053F End _0707: - FrontierScrCmd_3D 0x40D8, 2 - CallBattleTowerFunction BT_FUNC_UNK_39, 0, 0x8008 + FrontierScrCmd_3D VAR_UNK_0x40D8, 2 + CallBattleTowerFunction BT_FUNC_UNK_39, 0, VAR_0x8008 FrontierScrCmd_86 Message BattleTowerMultiBattleRoom_Text_ThanksForParticipating ShowSavingIcon - FrontierScrCmd_72 0x8008 + FrontierScrCmd_72 VAR_0x8008 HideSavingIcon PlaySoundEffect SEQ_SE_DP_SAVE WaitSoundEffect SEQ_SE_DP_SAVE FadeScreenOut CloseMessage FrontierScrCmd_6F - CallBattleTowerFunction BT_FUNC_RESET_SYSTEM, 0, 0x8008 + CallBattleTowerFunction BT_FUNC_RESET_SYSTEM, 0, VAR_0x8008 End _0745: Message BattleTowerMultiBattleRoom_Text_AskCancelChallenge - ShowYesNoMenu 0x8008, MENU_NO + ShowYesNoMenu VAR_0x8008, MENU_NO CloseMessage - GoToIfEq 0x8008, 0, _0765 + GoToIfEq VAR_0x8008, 0, _0765 GoTo _053F End _0765: - CallBattleTowerFunction BT_FUNC_UPDATE_GAME_RECORDS, 0, 0x8008 - SetVar 0x8000, 0 + CallBattleTowerFunction BT_FUNC_UPDATE_GAME_RECORDS, 0, VAR_0x8008 + SetVar VAR_0x8000, 0 GoTo _03DD End _077B: - SetVar 0x8000, 0 + SetVar VAR_0x8000, 0 GoTo _087B End _0789: - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 - GoToIfEq 0x8008, 3, _07B3 - GoToIfEq 0x8008, 6, _07B3 + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 3, _07B3 + GoToIfEq VAR_0x8008, 6, _07B3 GoTo _07DF End _07B3: - FrontierScrCmd_71 0x8008 - GoToIfEq 0x8008, 0, _0817 + FrontierScrCmd_71 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0817 Call _0C57 - GoToIfEq 0x8008, 1, _0817 + GoToIfEq VAR_0x8008, 1, _0817 GoTo _07DF End _07DF: - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _06DB - CallIfEq 0x8008, 1, _06E1 - ShowYesNoMenu 0x8008, MENU_NO - CallIfEq 0x8008, 0, _095D + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _06DB + CallIfEq VAR_0x8008, 1, _06E1 + ShowYesNoMenu VAR_0x8008, MENU_NO + CallIfEq VAR_0x8008, 0, _095D GoTo _0817 End _0817: - CallBattleTowerFunction BT_FUNC_UPDATE_GAME_RECORDS_AND_JOURNAL, 0, 0x8008 + CallBattleTowerFunction BT_FUNC_UPDATE_GAME_RECORDS_AND_JOURNAL, 0, VAR_0x8008 Message BattleTowerMultiBattleRoom_Text_YouHaveClearedYourSeventhMatch - CallBattleTowerFunction BT_FUNC_UNK_46, 0, 0x8008 - BufferNumber 1, 0x8008 + CallBattleTowerFunction BT_FUNC_UNK_46, 0, VAR_0x8008 + BufferNumber 1, VAR_0x8008 BufferPlayerName 0 Message BattleTowerMultiBattleRoom_Text_PlayerReceivedBP PlayFanfare SEQ_PL_POINTGET3 WaitFanfare - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 - GoToIfEq 0x8008, 3, _0869 - GoToIfEq 0x8008, 6, _0869 + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 3, _0869 + GoToIfEq VAR_0x8008, 6, _0869 CloseMessage GoTo _03DD End _0869: - SetVar 0x8004, 100 + SetVar VAR_0x8004, 100 MessageNoSkip BattleTowerMultiBattleRoom_Text_PleaseWait GoTo _03DD End _087B: - SetVar 0x8004, 0 - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 - GoToIfEq 0x8008, 3, _08AB - GoToIfEq 0x8008, 6, _08AB + SetVar VAR_0x8004, 0 + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 3, _08AB + GoToIfEq VAR_0x8008, 6, _08AB GoTo _08E9 End _08AB: - FrontierScrCmd_71 0x8008 - GoToIfEq 0x8008, 0, _08D7 + FrontierScrCmd_71 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _08D7 Call _0C57 - GoToIfEq 0x8008, 1, _0945 + GoToIfEq VAR_0x8008, 1, _0945 GoTo _08E9 End _08D7: - SetVar 0x8004, 100 + SetVar VAR_0x8004, 100 MessageNoSkip BattleTowerMultiBattleRoom_Text_PleaseWait GoTo _0945 End _08E9: - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _06DB - CallIfEq 0x8008, 1, _06E1 - ShowYesNoMenu 0x8008, MENU_NO - CallIfEq 0x8008, 0, _0955 - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 - GoToIfEq 0x8008, 3, _08D7 - GoToIfEq 0x8008, 6, _08D7 + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _06DB + CallIfEq VAR_0x8008, 1, _06E1 + ShowYesNoMenu VAR_0x8008, MENU_NO + CallIfEq VAR_0x8008, 0, _0955 + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 3, _08D7 + GoToIfEq VAR_0x8008, 6, _08D7 CloseMessage GoTo _0945 End _0945: - CallBattleTowerFunction BT_FUNC_UPDATE_GAME_RECORDS, 0, 0x8008 + CallBattleTowerFunction BT_FUNC_UPDATE_GAME_RECORDS, 0, VAR_0x8008 GoTo _03DD End @@ -698,9 +698,9 @@ _095D: _0965: Call _0A1B - GoToIfEq 0x8003, 0, _077B + GoToIfEq VAR_0x8003, 0, _077B Call _09A5 - GoToIfEq 0x8008, 1, _09B7 + GoToIfEq VAR_0x8008, 1, _09B7 Call _09C5 Call _09E9 Call _0A0D @@ -708,12 +708,12 @@ _0965: End _09A5: - CallBattleTowerFunction BT_FUNC_UNK_34, 0, 0x8008 - CallBattleTowerFunction BT_FUNC_HAS_DEFEATED_SEVEN_TRAINERS, 0, 0x8008 + CallBattleTowerFunction BT_FUNC_UNK_34, 0, VAR_0x8008 + CallBattleTowerFunction BT_FUNC_HAS_DEFEATED_SEVEN_TRAINERS, 0, VAR_0x8008 Return _09B7: - SetVar 0x8000, 1 + SetVar VAR_0x8000, 1 GoTo _0789 End @@ -723,13 +723,13 @@ _09C5: FrontierScrCmd_29 FrontierScrCmd_25 3 FrontierScrCmd_25 4 - FrontierScrCmd_23 0x800B - FrontierScrCmd_23 0x800C + FrontierScrCmd_23 VAR_0x800B + FrontierScrCmd_23 VAR_0x800C Return _09E9: - FrontierScrCmd_28 0x8001, _0140 - FrontierScrCmd_28 0x8002, _0140 + FrontierScrCmd_28 VAR_0x8001, _0140 + FrontierScrCmd_28 VAR_0x8002, _0140 FrontierScrCmd_28 1, _014C FrontierScrCmd_28 2, _014C FrontierScrCmd_29 @@ -743,7 +743,7 @@ _0A0D: Return _0A1B: - CallBattleTowerFunction BT_FUNC_SET_OPPONENT_TEAMS, 0, 0x8008 + CallBattleTowerFunction BT_FUNC_SET_OPPONENT_TEAMS, 0, VAR_0x8008 Call _0A61 Call _0AB5 FrontierScrCmd_85 0 @@ -756,13 +756,13 @@ _0A1B: Call _0A91 FrontierScrCmd_3F 0 FrontierScrCmd_87 - FrontierScrCmd_88 0x8003 + FrontierScrCmd_88 VAR_0x8003 FadeScreenIn Return _0A61: - CallBattleTowerFunction BT_FUNC_GET_OPPONENT_OBJECT_ID, 0, 0x800B - CallBattleTowerFunction BT_FUNC_GET_OPPONENT_OBJECT_ID, 1, 0x800C + CallBattleTowerFunction BT_FUNC_GET_OPPONENT_OBJECT_ID, 0, VAR_0x800B + CallBattleTowerFunction BT_FUNC_GET_OPPONENT_OBJECT_ID, 1, VAR_0x800C FrontierScrCmd_22 _0020 FrontierScrCmd_24 _00A0 FrontierScrCmd_28 3, _00E0 @@ -771,8 +771,8 @@ _0A61: Return _0A91: - FrontierScrCmd_28 0x8001, _0108 - FrontierScrCmd_28 0x8002, _0108 + FrontierScrCmd_28 VAR_0x8001, _0108 + FrontierScrCmd_28 VAR_0x8002, _0108 FrontierScrCmd_28 3, _0110 FrontierScrCmd_28 4, _0110 FrontierScrCmd_29 @@ -789,15 +789,15 @@ _0AC1: Return _0ACD: - CallBattleTowerFunction BT_FUNC_SET_OPPONENT_TEAMS, 0, 0x8008 + CallBattleTowerFunction BT_FUNC_SET_OPPONENT_TEAMS, 0, VAR_0x8008 Call _0A61 Call _0AB5 FrontierScrCmd_85 0 - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 CloseMessage Call _0AC1 FrontierScrCmd_85 1 - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 CloseMessage Call _0A91 MessageNoSkip BattleTowerMultiBattleRoom_Text_PleaseWait @@ -806,21 +806,21 @@ _0ACD: CloseMessage FrontierScrCmd_3F 0 FrontierScrCmd_87 - FrontierScrCmd_88 0x8003 + FrontierScrCmd_88 VAR_0x8003 FadeScreenIn Return _0B27: Message BattleTowerMultiBattleRoom_Text_AskCancelChallenge - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _02B0 - SetVar 0x8000, 1 + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _02B0 + SetVar VAR_0x8000, 1 GoTo _037F End _0B4B: Message BattleTowerMultiBattleRoom_Text_YouHaveChosenToRetire - WaitTime 30, 0x8008 + WaitTime 30, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 7 CloseMessage @@ -829,47 +829,47 @@ _0B4B: _0B65: Call _0C57 - GoToIfEq 0x8008, 1, _02B0 - FrontierScrCmd_71 0x8008 - GoToIfEq 0x8008, 0, _02B0 + GoToIfEq VAR_0x8008, 1, _02B0 + FrontierScrCmd_71 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _02B0 GoTo _0B91 End _0B91: - FrontierScrCmd_70 0x8008 - CallIfEq 0x8008, 0, _06DB - CallIfEq 0x8008, 1, _06E1 - ShowYesNoMenu 0x8008, MENU_NO - GoToIfEq 0x8008, 1, _02B0 + FrontierScrCmd_70 VAR_0x8008 + CallIfEq VAR_0x8008, 0, _06DB + CallIfEq VAR_0x8008, 1, _06E1 + ShowYesNoMenu VAR_0x8008, MENU_NO + GoToIfEq VAR_0x8008, 1, _02B0 Call _0667 GoTo _02B0 End _0BCF: - FrontierScrCmd_3E 0x40DE, 0x8008 - GoToIfEq 0x8008, 0, _0C01 - GoToIfEq 0x8000, 1, _0C03 - CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 0, 0x8009 - CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 1, 0x800A + FrontierScrCmd_3E VAR_UNK_0x40DE, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0C01 + GoToIfEq VAR_0x8000, 1, _0C03 + CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 0, VAR_0x8009 + CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 1, VAR_0x800A Return _0C01: Return _0C03: - CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 0, 0x8009 - CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 1, 0x800A + CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 0, VAR_0x8009 + CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 1, VAR_0x800A Return _0C15: - FrontierScrCmd_3E 0x40DE, 0x8008 - CallIfNe 0x8008, 0, _0C4B + FrontierScrCmd_3E VAR_UNK_0x40DE, VAR_0x8008 + CallIfNe VAR_0x8008, 0, _0C4B GoTo _0C30 End _0C30: - FrontierScrCmd_3E 0x40DE, 0x8008 - GoToIfEq 0x8008, 3, _0C4D + FrontierScrCmd_3E VAR_UNK_0x40DE, VAR_0x8008 + GoToIfEq VAR_0x8008, 3, _0C4D GoTo _0C55 End @@ -884,19 +884,19 @@ _0C55: Return _0C57: - CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008 - GoToIfEq 0x8008, 3, _0C74 - SetVar 0x8008, 0 + CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 3, _0C74 + SetVar VAR_0x8008, 0 Return _0C74: - FrontierScrCmd_4B 0x8008 - GoToIfEq 0x8008, 1, _0C8D - SetVar 0x8008, 0 + FrontierScrCmd_4B VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0C8D + SetVar VAR_0x8008, 0 Return _0C8D: - SetVar 0x8008, 1 + SetVar VAR_0x8008, 1 Return .balign 4, 0 diff --git a/res/field/frontier_scripts/frontier_scripts_unknown_10.s b/res/field/frontier_scripts/frontier_scripts_unknown_10.s index 7455d7e906..859a33a229 100644 --- a/res/field/frontier_scripts/frontier_scripts_unknown_10.s +++ b/res/field/frontier_scripts/frontier_scripts_unknown_10.s @@ -47,9 +47,9 @@ _0039: HealParty PlayBGM SEQ_BF_TOWWER FrontierScrCmd_AA - WaitTime 1, 0x8008 - FrontierScrCmd_B2 0, 0, 0, 0x8008 - WaitTime 1, 0x8008 + WaitTime 1, VAR_0x8008 + FrontierScrCmd_B2 0, 0, 0, VAR_0x8008 + WaitTime 1, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 176 ClearReceivedTempDataAllPlayers @@ -65,7 +65,7 @@ _0070: _0084: Message pl_msg_00000015_00000 - InitLocalTextListMenu 31, 5, 0, 1, 0x8008 + InitLocalTextListMenu 31, 5, 0, 1, VAR_0x8008 SetMenuXOriginSide 1 AddListMenuEntry pl_msg_00000015_00026, 255, 1 AddListMenuEntry pl_msg_00000015_00027, 255, 2 @@ -74,87 +74,87 @@ _0084: AddListMenuEntry pl_msg_00000015_00030, 255, 6 AddListMenuEntry pl_msg_00000015_00031, 255, 7 ShowListMenu - GoToIfEq 0x8008, 1, _010E - GoToIfEq 0x8008, 2, _012F - GoToIfEq 0x8008, 4, _01CA - GoToIfEq 0x8008, 5, _01F1 - GoToIfEq 0x8008, 6, _0218 + GoToIfEq VAR_0x8008, 1, _010E + GoToIfEq VAR_0x8008, 2, _012F + GoToIfEq VAR_0x8008, 4, _01CA + GoToIfEq VAR_0x8008, 5, _01F1 + GoToIfEq VAR_0x8008, 6, _0218 GoTo _023F End _010E: - FrontierScrCmd_B2 7, 1, 0, 0x8008 - SetVar 0x8004, 0 - SetVar 0x8009, 1 - FrontierScrCmd_3D 0x4003, 0 + FrontierScrCmd_B2 7, 1, 0, VAR_0x8008 + SetVar VAR_0x8004, 0 + SetVar VAR_0x8009, 1 + FrontierScrCmd_3D VAR_MAP_LOCAL_3, 0 GoTo _0254 End _012F: FrontierScrCmd_3D VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI_WFC - FrontierScrCmd_3D 0x4003, 0 + FrontierScrCmd_3D VAR_MAP_LOCAL_3, 0 GoTo _0143 End _0143: Message pl_msg_00000015_00014 - InitLocalTextMenu 31, 11, 0, TRUE, 0x8008 + InitLocalTextMenu 31, 11, 0, TRUE, VAR_0x8008 SetMenuXOriginSide 1 AddMenuEntry pl_msg_00000015_00032, 0 AddMenuEntry pl_msg_00000015_00033, 1 AddMenuEntry pl_msg_00000015_00031, 2 ShowMenu - GoToIfEq 0x8008, 0, _0188 - GoToIfEq 0x8008, 1, _01A9 + GoToIfEq VAR_0x8008, 0, _0188 + GoToIfEq VAR_0x8008, 1, _01A9 GoTo _0084 End _0188: - FrontierScrCmd_B2 7, 2, 0, 0x8008 - SetVar 0x8004, 0 - SetVar 0x8009, 2 - FrontierScrCmd_3D 0x40B9, 0 + FrontierScrCmd_B2 7, 2, 0, VAR_0x8008 + SetVar VAR_0x8004, 0 + SetVar VAR_0x8009, 2 + FrontierScrCmd_3D VAR_UNK_0x40B9, 0 GoTo _0254 End _01A9: - FrontierScrCmd_B2 7, 3, 0, 0x8008 - SetVar 0x8004, 0 - SetVar 0x8009, 3 - FrontierScrCmd_3D 0x40B9, 1 + FrontierScrCmd_B2 7, 3, 0, VAR_0x8008 + SetVar VAR_0x8004, 0 + SetVar VAR_0x8009, 3 + FrontierScrCmd_3D VAR_UNK_0x40B9, 1 GoTo _0254 End _01CA: - FrontierScrCmd_B2 7, 4, 0, 0x8008 - SetVar 0x8004, 0 - SetVar 0x8009, 4 + FrontierScrCmd_B2 7, 4, 0, VAR_0x8008 + SetVar VAR_0x8004, 0 + SetVar VAR_0x8009, 4 FrontierScrCmd_3D VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI_WFC - FrontierScrCmd_3D 0x4003, 0 + FrontierScrCmd_3D VAR_MAP_LOCAL_3, 0 GoTo _0254 End _01F1: - FrontierScrCmd_B2 7, 5, 0, 0x8008 - SetVar 0x8004, 0 - SetVar 0x8009, 5 + FrontierScrCmd_B2 7, 5, 0, VAR_0x8008 + SetVar VAR_0x8004, 0 + SetVar VAR_0x8009, 5 FrontierScrCmd_3D VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI_WFC - FrontierScrCmd_3D 0x4003, 0 + FrontierScrCmd_3D VAR_MAP_LOCAL_3, 0 GoTo _0254 End _0218: - FrontierScrCmd_B2 7, 6, 0, 0x8008 - SetVar 0x8004, 0 - SetVar 0x8009, 6 + FrontierScrCmd_B2 7, 6, 0, VAR_0x8008 + SetVar VAR_0x8004, 0 + SetVar VAR_0x8009, 6 FrontierScrCmd_3D VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI_WFC - FrontierScrCmd_3D 0x4003, 0 + FrontierScrCmd_3D VAR_MAP_LOCAL_3, 0 GoTo _0254 End _023F: - FrontierScrCmd_B2 7, 7, 0, 0x8008 - SetVar 0x8004, 1 + FrontierScrCmd_B2 7, 7, 0, VAR_0x8008 + SetVar VAR_0x8004, 1 GoTo _0254 End @@ -164,15 +164,15 @@ _0254: End _0260: - SetVar 0x800A, 1 - FrontierScrCmd_AC 0x800A, 0x8004, 0, 0x8008 - GoToIfEq 0x8008, 0, _0260 - FrontierScrCmd_AD 0x800A + SetVar VAR_0x800A, 1 + FrontierScrCmd_AC VAR_0x800A, VAR_0x8004, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0260 + FrontierScrCmd_AD VAR_0x800A ClearReceivedTempDataAllPlayers - FrontierScrCmd_B2 9, 0, 0, 0x8008 - GoToIfEq 0x8008, 7, _09C0 - FrontierScrCmd_B1 0x8008 - GoToIfEq 0x8008, 1, _02B8 + FrontierScrCmd_B2 9, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 7, _09C0 + FrontierScrCmd_B1 VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _02B8 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 170 ClearReceivedTempDataAllPlayers @@ -184,23 +184,23 @@ _02B8: End _02C0: - SetVar 0x800A, 0 - FrontierScrCmd_AC 0x800A, 0, 0, 0x8008 - GoToIfEq 0x8008, 0, _02C0 - FrontierScrCmd_AD 0x800A + SetVar VAR_0x800A, 0 + FrontierScrCmd_AC VAR_0x800A, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _02C0 + FrontierScrCmd_AD VAR_0x800A ClearReceivedTempDataAllPlayers - FrontierScrCmd_AE 0x8009, 0x8008 - GoToIfEq 0x8008, 1, _0302 + FrontierScrCmd_AE VAR_0x8009, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0302 Message pl_msg_00000015_00003 GoTo _0084 End _0302: - FrontierScrCmd_B2 9, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _0345 - GoToIfEq 0x8008, 5, _0345 - GoToIfEq 0x8008, 4, _0345 - GoToIfEq 0x8008, 6, _0345 + FrontierScrCmd_B2 9, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0345 + GoToIfEq VAR_0x8008, 5, _0345 + GoToIfEq VAR_0x8008, 4, _0345 + GoToIfEq VAR_0x8008, 6, _0345 GoTo _0758 End @@ -208,23 +208,23 @@ _0345: Message pl_msg_00000015_00002 FadeScreenOut CloseMessage - FrontierScrCmd_B2 13, 0, 0, 0x8008 + FrontierScrCmd_B2 13, 0, 0, VAR_0x8008 GoTo _037E End _0366: - FrontierScrCmd_AF 0x8009, 2, 0x8008 - FrontierScrCmd_AF 0x8009, 3, 0x8008 + FrontierScrCmd_AF VAR_0x8009, 2, VAR_0x8008 + FrontierScrCmd_AF VAR_0x8009, 3, VAR_0x8008 GoTo _037E End _037E: - FrontierScrCmd_AF 0x8009, 0, 0x8008 - FrontierScrCmd_AF 0x8009, 1, 0x8008 - GoToIfEq 0x8008, 2, _0366 - FrontierScrCmd_B0 0x8002, 0x8005 - FrontierScrCmd_3D 0x4002, 0x8002 - FrontierScrCmd_3D 0x4005, 0x8005 + FrontierScrCmd_AF VAR_0x8009, 0, VAR_0x8008 + FrontierScrCmd_AF VAR_0x8009, 1, VAR_0x8008 + GoToIfEq VAR_0x8008, 2, _0366 + FrontierScrCmd_B0 VAR_0x8002, VAR_0x8005 + FrontierScrCmd_3D VAR_MAP_LOCAL_2, VAR_0x8002 + FrontierScrCmd_3D VAR_MAP_LOCAL_5, VAR_0x8005 FadeScreenIn GoTo _03C1 End @@ -235,19 +235,19 @@ _03C1: End _03CD: - SetVar 0x800A, 2 - FrontierScrCmd_AC 0x800A, 0x8002, 0x8005, 0x8008 - GoToIfEq 0x8008, 0, _03CD - FrontierScrCmd_AD 0x800A + SetVar VAR_0x800A, 2 + FrontierScrCmd_AC VAR_0x800A, VAR_0x8002, VAR_0x8005, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _03CD + FrontierScrCmd_AD VAR_0x800A ClearReceivedTempDataAllPlayers - GoToIfEq 0x8002, 255, _0084 - FrontierScrCmd_B2 1, 0, 0, 0x8008 - GoToIfEq 0x8008, 0, _044E - FrontierScrCmd_B2 9, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _045D - GoToIfEq 0x8008, 5, _04F9 - GoToIfEq 0x8008, 4, _0620 - GoToIfEq 0x8008, 6, _06BC + GoToIfEq VAR_0x8002, 255, _0084 + FrontierScrCmd_B2 1, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _044E + FrontierScrCmd_B2 9, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _045D + GoToIfEq VAR_0x8008, 5, _04F9 + GoToIfEq VAR_0x8008, 4, _0620 + GoToIfEq VAR_0x8008, 6, _06BC End _044E: @@ -257,74 +257,74 @@ _044E: End _045D: - FrontierScrCmd_B2 2, 1, 0, 0x8008 - SetVar 0x8010, 0x8008 - GoToIfEq 0x8010, 1, _0499 - GoToIfEq 0x8010, 2, _04B4 - GoToIfEq 0x8010, 3, _04CF + FrontierScrCmd_B2 2, 1, 0, VAR_0x8008 + SetVar FR_VAR_0x8010, VAR_0x8008 + GoToIfEq FR_VAR_0x8010, 1, _0499 + GoToIfEq FR_VAR_0x8010, 2, _04B4 + GoToIfEq FR_VAR_0x8010, 3, _04CF GoTo _0758 End _0499: - FrontierScrCmd_B2 5, 0, 0, 0x8008 - BufferSpeciesName 0, 0x8008 + FrontierScrCmd_B2 5, 0, 0, VAR_0x8008 + BufferSpeciesName 0, VAR_0x8008 Message pl_msg_00000015_00006 GoTo _0084 End _04B4: - FrontierScrCmd_B2 5, 1, 0, 0x8008 - BufferSpeciesName 0, 0x8008 + FrontierScrCmd_B2 5, 1, 0, VAR_0x8008 + BufferSpeciesName 0, VAR_0x8008 Message pl_msg_00000015_00006 GoTo _0084 End _04CF: - FrontierScrCmd_B2 5, 0, 0, 0x8008 - BufferSpeciesName 0, 0x8008 - FrontierScrCmd_B2 5, 1, 0, 0x8008 - BufferSpeciesName 1, 0x8008 + FrontierScrCmd_B2 5, 0, 0, VAR_0x8008 + BufferSpeciesName 0, VAR_0x8008 + FrontierScrCmd_B2 5, 1, 0, VAR_0x8008 + BufferSpeciesName 1, VAR_0x8008 Message pl_msg_00000015_00007 GoTo _0084 End _04F9: - FrontierScrCmd_B2 2, 5, 0, 0x8008 - GoToIfEq 0x8008, 1, _0614 + FrontierScrCmd_B2 2, 5, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _0614 Call _081C - GoToIfEq 0x800F, 0, _0766 - FrontierScrCmd_B2 3, 0, 0, 0x8008 - GoToIfEq 0x8008, 0, _0758 - FrontierScrCmd_B2 4, 0, 0, 0x800B - BufferSpeciesName 0, 0x800B - FrontierScrCmd_B2 5, 0, 0, 0x8008 - BufferSpeciesName 1, 0x8008 - GoToIfEq 0x8008, 0x800B, _0758 + GoToIfEq FR_VAR_0x800F, 0, _0766 + FrontierScrCmd_B2 3, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0758 + FrontierScrCmd_B2 4, 0, 0, VAR_0x800B + BufferSpeciesName 0, VAR_0x800B + FrontierScrCmd_B2 5, 0, 0, VAR_0x8008 + BufferSpeciesName 1, VAR_0x8008 + GoToIfEq VAR_0x8008, VAR_0x800B, _0758 GoTo _0567 End _0567: Message pl_msg_00000015_00015 - InitLocalTextMenu 25, 13, 1, TRUE, 0x8008 + InitLocalTextMenu 25, 13, 1, TRUE, VAR_0x8008 AddMenuEntry pl_msg_00000015_00016, 0 AddMenuEntry pl_msg_00000015_00017, 1 ShowMenu MessageNoSkip pl_msg_00000015_00024 - SetVar 0x800B, 0x8008 + SetVar VAR_0x800B, VAR_0x8008 GoTo _0593 End _0593: - SetVar 0x800A, 4 - FrontierScrCmd_AC 0x800A, 0x800B, 0, 0x8008 - GoToIfEq 0x8008, 0, _0593 - FrontierScrCmd_AD 0x800A + SetVar VAR_0x800A, 4 + FrontierScrCmd_AC VAR_0x800A, VAR_0x800B, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0593 + FrontierScrCmd_AD VAR_0x800A ClearReceivedTempDataAllPlayers - FrontierScrCmd_B2 8, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _05F9 - GoToIfEq 0x8008, -2, _05F9 - GoToIfEq 0x800B, 1, _05F9 - GoToIfEq 0x800B, -2, _05F9 + FrontierScrCmd_B2 8, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _05F9 + GoToIfEq VAR_0x8008, -2, _05F9 + GoToIfEq VAR_0x800B, 1, _05F9 + GoToIfEq VAR_0x800B, -2, _05F9 GoTo _0605 End @@ -334,7 +334,7 @@ _05F9: End _0605: - FrontierScrCmd_B2 6, 0, 0, 0x8008 + FrontierScrCmd_B2 6, 0, 0, VAR_0x8008 GoTo _0758 End @@ -344,65 +344,65 @@ _0614: End _0620: - FrontierScrCmd_B2 2, 4, 0, 0x8008 - SetVar 0x8010, 0x8008 - GoToIfEq 0x8010, 1, _065C - GoToIfEq 0x8010, 2, _0677 - GoToIfEq 0x8010, 3, _0692 + FrontierScrCmd_B2 2, 4, 0, VAR_0x8008 + SetVar FR_VAR_0x8010, VAR_0x8008 + GoToIfEq FR_VAR_0x8010, 1, _065C + GoToIfEq FR_VAR_0x8010, 2, _0677 + GoToIfEq FR_VAR_0x8010, 3, _0692 GoTo _0758 End _065C: - FrontierScrCmd_B2 5, 0, 0, 0x8008 - BufferSpeciesName 0, 0x8008 + FrontierScrCmd_B2 5, 0, 0, VAR_0x8008 + BufferSpeciesName 0, VAR_0x8008 Message pl_msg_00000015_00009 GoTo _0084 End _0677: - FrontierScrCmd_B2 5, 1, 0, 0x8008 - BufferSpeciesName 0, 0x8008 + FrontierScrCmd_B2 5, 1, 0, VAR_0x8008 + BufferSpeciesName 0, VAR_0x8008 Message pl_msg_00000015_00009 GoTo _0084 End _0692: - FrontierScrCmd_B2 5, 0, 0, 0x8008 - BufferSpeciesName 0, 0x8008 - FrontierScrCmd_B2 5, 1, 0, 0x8008 - BufferSpeciesName 1, 0x8008 + FrontierScrCmd_B2 5, 0, 0, VAR_0x8008 + BufferSpeciesName 0, VAR_0x8008 + FrontierScrCmd_B2 5, 1, 0, VAR_0x8008 + BufferSpeciesName 1, VAR_0x8008 Message pl_msg_00000015_00010 GoTo _0084 End _06BC: - FrontierScrCmd_B2 2, 6, 0, 0x8008 - SetVar 0x8010, 0x8008 - GoToIfEq 0x8010, 1, _06F8 - GoToIfEq 0x8010, 2, _0713 - GoToIfEq 0x8010, 3, _072E + FrontierScrCmd_B2 2, 6, 0, VAR_0x8008 + SetVar FR_VAR_0x8010, VAR_0x8008 + GoToIfEq FR_VAR_0x8010, 1, _06F8 + GoToIfEq FR_VAR_0x8010, 2, _0713 + GoToIfEq FR_VAR_0x8010, 3, _072E GoTo _0758 End _06F8: - FrontierScrCmd_B2 5, 0, 0, 0x8008 - BufferSpeciesName 0, 0x8008 + FrontierScrCmd_B2 5, 0, 0, VAR_0x8008 + BufferSpeciesName 0, VAR_0x8008 Message pl_msg_00000015_00009 GoTo _0084 End _0713: - FrontierScrCmd_B2 5, 1, 0, 0x8008 - BufferSpeciesName 0, 0x8008 + FrontierScrCmd_B2 5, 1, 0, VAR_0x8008 + BufferSpeciesName 0, VAR_0x8008 Message pl_msg_00000015_00009 GoTo _0084 End _072E: - FrontierScrCmd_B2 5, 0, 0, 0x8008 - BufferSpeciesName 0, 0x8008 - FrontierScrCmd_B2 5, 1, 0, 0x8008 - BufferSpeciesName 1, 0x8008 + FrontierScrCmd_B2 5, 0, 0, VAR_0x8008 + BufferSpeciesName 0, VAR_0x8008 + FrontierScrCmd_B2 5, 1, 0, VAR_0x8008 + BufferSpeciesName 1, VAR_0x8008 Message pl_msg_00000015_00010 GoTo _0084 End @@ -413,19 +413,19 @@ _0758: End _0766: - FrontierScrCmd_B2 12, 0, 0, 0x8008 - FrontierScrCmd_3D 0x4064, 0x8008 + FrontierScrCmd_B2 12, 0, 0, VAR_0x8008 + FrontierScrCmd_3D VAR_WIFI_FRONTIER_CLEARED, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 175 ClearReceivedTempDataAllPlayers MessageInstant pl_msg_00000015_00019 ShowSavingIcon - FrontierScrCmd_73 0x8008 + FrontierScrCmd_73 VAR_0x8008 HideSavingIcon PlaySoundEffect SEQ_SE_DP_SAVE WaitSoundEffect SEQ_SE_DP_SAVE MessageNoSkip pl_msg_00000015_00020 - WaitTime 10, 0x8008 + WaitTime 10, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 171 ClearReceivedTempDataAllPlayers @@ -435,20 +435,20 @@ _0766: FrontierScrCmd_25 2 FrontierScrCmd_25 3 IncrementRecordValue RECORD_UNK_058 - FrontierScrCmd_B2 9, 0, 0, 0x8008 - SetVar 0x8010, 0x8008 - GoToIfEq 0x8010, 1, _0842 - GoToIfEq 0x8010, 2, _0879 - GoToIfEq 0x8010, 3, _0879 - GoToIfEq 0x8010, 5, _088D - GoToIfEq 0x8010, 4, _08A1 - GoToIfEq 0x8010, 6, _08B5 + FrontierScrCmd_B2 9, 0, 0, VAR_0x8008 + SetVar FR_VAR_0x8010, VAR_0x8008 + GoToIfEq FR_VAR_0x8010, 1, _0842 + GoToIfEq FR_VAR_0x8010, 2, _0879 + GoToIfEq FR_VAR_0x8010, 3, _0879 + GoToIfEq FR_VAR_0x8010, 5, _088D + GoToIfEq FR_VAR_0x8010, 4, _08A1 + GoToIfEq FR_VAR_0x8010, 6, _08B5 End _081C: - FrontierScrCmd_B2 11, 0, 0, 0x8008 - SetVar 0x800F, 0x8008 - CallIfEq 0x8008, 0, _0838 + FrontierScrCmd_B2 11, 0, 0, VAR_0x8008 + SetVar FR_VAR_0x800F, VAR_0x8008 + CallIfEq VAR_0x8008, 0, _0838 Return _0838: @@ -458,14 +458,14 @@ _0838: _0842: FrontierScrCmd_B3 - FrontierScrCmd_3D 0x40DE, 1 + FrontierScrCmd_3D VAR_UNK_0x40DE, 1 Call _08D3 GoTo _0858 End _0858: - FrontierScrCmd_B4 0x8008 - GoToIfEq 0x8008, 0, _0858 + FrontierScrCmd_B4 VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _0858 FrontierScrCmd_B5 Call _08C9 FrontierScrCmd_04 6, 0 @@ -516,9 +516,9 @@ _08D9: _08DD: SetWiFiListHostFriendCurrentDate FrontierScrCmd_AA - WaitTime 1, 0x8008 - FrontierScrCmd_B2 0, 0, 0, 0x8008 - WaitTime 1, 0x8008 + WaitTime 1, VAR_0x8008 + FrontierScrCmd_B2 0, 0, 0, VAR_0x8008 + WaitTime 1, VAR_0x8008 ClearReceivedTempDataAllPlayers FrontierScrCmd_35 177 ClearReceivedTempDataAllPlayers @@ -528,33 +528,33 @@ _08DD: FadeScreenIn BufferPartnerName 0 Message pl_msg_00000015_00021 - ShowYesNoMenu 0x8008, MENU_YES - GoToIfEq 0x8008, 0, _0939 + ShowYesNoMenu VAR_0x8008, MENU_YES + GoToIfEq VAR_0x8008, 0, _0939 GoTo _094B End _0939: MessageNoSkip pl_msg_00000015_00024 - SetVar 0x800B, 0 + SetVar VAR_0x800B, 0 GoTo _095D End _094B: MessageNoSkip pl_msg_00000015_00024 - SetVar 0x800B, 1 + SetVar VAR_0x800B, 1 GoTo _095D End _095D: - SetVar 0x800A, 5 - FrontierScrCmd_AC 0x800A, 0x800B, 0, 0x8008 - GoToIfEq 0x8008, 0, _095D - FrontierScrCmd_AD 0x800A + SetVar VAR_0x800A, 5 + FrontierScrCmd_AC VAR_0x800A, VAR_0x800B, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 0, _095D + FrontierScrCmd_AD VAR_0x800A ClearReceivedTempDataAllPlayers - FrontierScrCmd_B1 0x8008 - FrontierScrCmd_B2 10, 0, 0, 0x8008 - GoToIfEq 0x8008, 1, _09AD - GoToIfEq 0x800B, 1, _09C0 + FrontierScrCmd_B1 VAR_0x8008 + FrontierScrCmd_B2 10, 0, 0, VAR_0x8008 + GoToIfEq VAR_0x8008, 1, _09AD + GoToIfEq VAR_0x800B, 1, _09C0 GoTo _0084 End