Use var constants in frontier scripts (#1017)

2026-03-21 17:55:13 -05:00 · 2026-03-21 04:57:36 +01:00 · 2026-03-21 04:57:36 +01:00 · a4cf901961
commit a4cf901961
parent 92019f8afc
10 changed files with 2098 additions and 2093 deletions
--- 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_0x800C
-VAR_LAST_TALKED
+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
--- a/res/field/frontier_scripts/frontier_scripts_battle_arcade.s
+++ b/res/field/frontier_scripts/frontier_scripts_battle_arcade.s
--- a/res/field/frontier_scripts/frontier_scripts_battle_castle.s
+++ b/res/field/frontier_scripts/frontier_scripts_battle_castle.s
--- a/res/field/frontier_scripts/frontier_scripts_battle_factory.s
+++ b/res/field/frontier_scripts/frontier_scripts_battle_factory.s
--- 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 VAR_BATTLE_HALL_CHALLENGE_TYPE, VAR_0x8001
-    FrontierScrCmd_3E 0x4003, 0x8003
+    FrontierScrCmd_3E VAR_MAP_LOCAL_3, VAR_0x8003
-    FrontierScrCmd_3E 0x4002, 0x8002
+    FrontierScrCmd_3E VAR_MAP_LOCAL_2, VAR_0x8002
-    FrontierScrCmd_3E 0x4005, 0x8000
+    FrontierScrCmd_3E VAR_MAP_LOCAL_5, VAR_0x8000
-    GetPlayerObjEventGfx 0x800A
+    GetPlayerObjEventGfx VAR_0x800A
-    SetVar 0x800E, 0
+    SetVar FR_VAR_0x800E, 0
    FrontierScrCmd_6C
-    FrontierScrCmd_8B 0x8003, 0x8001, 0x8002, 0x8000
+    FrontierScrCmd_8B VAR_0x8003, VAR_0x8001, VAR_0x8002, VAR_0x8000
-    FrontierScrCmd_91 30, 0, 0, 0x8008
+    FrontierScrCmd_91 30, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _0382
+    GoToIfEq VAR_0x8008, 1, _0382
-    SetVar 0x800F, 231
+    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
+    FrontierScrCmd_91 30, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _0404
+    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
+    FrontierScrCmd_91 30, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _0476
+    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
+    SetVar VAR_0x8003, 0
-    FrontierScrCmd_91 30, 0, 0, 0x8008
+    FrontierScrCmd_91 30, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _0510
+    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
+    FrontierScrCmd_91 23, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 0, _0595
+    GoToIfEq VAR_0x8008, 0, _0595
-    SetVar 0x8003, 1
+    SetVar VAR_0x8003, 1
    GoTo _0B48
    End
 _0595:
    Message BattleHallScene_Text_ChooseType
-    FrontierScrCmd_91 35, 0, 0, 0x8008
+    FrontierScrCmd_91 35, 0, 0, VAR_0x8008
-    FrontierScrCmd_91 30, 0, 0, 0x8008
+    FrontierScrCmd_91 30, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _05BC
+    GoToIfEq VAR_0x8008, 1, _05BC
    GoTo _0611
    End
@ -687,10 +687,10 @@ _05BC:
    End
 _05D4:
-    SetVar 0x8006, 7
+    SetVar VAR_0x8006, 7
-    FrontierScrCmd_93 0x8006, 0, 0x8008
+    FrontierScrCmd_93 VAR_0x8006, 0, VAR_0x8008
-    GoToIfEq 0x8008, 0, _05D4
+    GoToIfEq VAR_0x8008, 0, _05D4
-    FrontierScrCmd_94 0x8006
+    FrontierScrCmd_94 VAR_0x8006
    ClearReceivedTempDataAllPlayers
    ClearReceivedTempDataAllPlayers
    FrontierScrCmd_35 221
@ -705,13 +705,13 @@ _05D4:
 _0611:
    FadeScreenOut
    CloseMessage
-    FrontierScrCmd_91 30, 0, 0, 0x8008
+    FrontierScrCmd_91 30, 0, 0, VAR_0x8008
-    CallIfEq 0x8008, 1, _065B
+    CallIfEq VAR_0x8008, 1, _065B
    OpenBattleHallApp
-    FrontierScrCmd_91 31, 0, 0, 0x8008
+    FrontierScrCmd_91 31, 0, 0, VAR_0x8008
-    FrontierScrCmd_91 36, 0, 0, 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
+    FrontierScrCmd_91 30, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _0708
+    GoToIfEq VAR_0x8008, 1, _0708
-    CallIfNe 0x800E, 0, _080D
+    CallIfNe FR_VAR_0x800E, 0, _080D
-    SetVar 0x800E, 1
+    SetVar FR_VAR_0x800E, 1
-    FrontierScrCmd_91 37, 0, 0, 0x8008
+    FrontierScrCmd_91 37, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _1199
+    GoToIfEq VAR_0x8008, 1, _1199
-    GoToIfEq 0x8008, 2, _11BE
+    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
+    CallIfNe FR_VAR_0x800E, 0, _0821
-    SetVar 0x800E, 1
+    SetVar FR_VAR_0x800E, 1
    ClearReceivedTempDataAllPlayers
    FrontierScrCmd_35 223
    ClearReceivedTempDataAllPlayers
@ -762,10 +762,10 @@ _0708:
    End
 _0731:
-    SetVar 0x8006, 1
+    SetVar VAR_0x8006, 1
-    FrontierScrCmd_93 0x8006, 0, 0x8008
+    FrontierScrCmd_93 VAR_0x8006, 0, VAR_0x8008
-    GoToIfEq 0x8008, 0, _0731
+    GoToIfEq VAR_0x8008, 0, _0731
-    FrontierScrCmd_94 0x8006
+    FrontierScrCmd_94 VAR_0x8006
    ClearReceivedTempDataAllPlayers
    ClearReceivedTempDataAllPlayers
    FrontierScrCmd_35 222
@ -774,10 +774,10 @@ _0731:
    End
 _0762:
-    SetVar 0x8006, 2
+    SetVar VAR_0x8006, 2
-    FrontierScrCmd_93 0x8006, 0, 0x8008
+    FrontierScrCmd_93 VAR_0x8006, 0, VAR_0x8008
-    GoToIfEq 0x8008, 0, _0762
+    GoToIfEq VAR_0x8008, 0, _0762
-    FrontierScrCmd_94 0x8006
+    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
+    FrontierScrCmd_91 20, 0, 0, VAR_0x8008
-    SetVar 0x800B, 0x8008
+    SetVar VAR_0x800B, VAR_0x8008
    FrontierScrCmd_22 _0114
    FrontierScrCmd_24 _0124
    Return
 _0858:
-    FrontierScrCmd_91 20, 0, 0, 0x8008
+    FrontierScrCmd_91 20, 0, 0, VAR_0x8008
-    SetVar 0x800B, 0x8008
+    SetVar VAR_0x800B, VAR_0x8008
    FrontierScrCmd_22 _0114
    FrontierScrCmd_24 _0124
-    FrontierScrCmd_91 20, 1, 0, 0x8008
+    FrontierScrCmd_91 20, 1, 0, VAR_0x8008
-    SetVar 0x800C, 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
+    FrontierScrCmd_91 30, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _08F1
+    GoToIfEq VAR_0x8008, 1, _08F1
-    FrontierScrCmd_91 37, 0, 0, 0x8008
+    FrontierScrCmd_91 37, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _08E1
+    GoToIfEq VAR_0x8008, 1, _08E1
-    GoToIfEq 0x8008, 2, _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 27, 0, 0, VAR_0x8008
-    FrontierScrCmd_91 31, 0, 0, 0x8008
+    FrontierScrCmd_91 31, 0, 0, VAR_0x8008
    FadeScreenIn
-    FrontierScrCmd_92 0x8008
+    FrontierScrCmd_92 VAR_0x8008
-    GoToIfEq 0x8008, 0, _0F5D
+    GoToIfEq VAR_0x8008, 0, _0F5D
    IncrementRecordValue RECORD_UNK_062
-    FrontierScrCmd_91 28, 0, 0, 0x8008
+    FrontierScrCmd_91 28, 0, 0, VAR_0x8008
-    FrontierScrCmd_91 33, 0, 0, 0x8008
+    FrontierScrCmd_91 33, 0, 0, VAR_0x8008
-    CallIfEq 0x8008, 10, _09B1
+    CallIfEq VAR_0x8008, 10, _09B1
-    FrontierScrCmd_91 30, 0, 0, 0x8008
+    FrontierScrCmd_91 30, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _09E3
+    GoToIfEq VAR_0x8008, 1, _09E3
-    FrontierScrCmd_91 37, 0, 0, 0x8008
+    FrontierScrCmd_91 37, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _1333
+    GoToIfEq VAR_0x8008, 1, _1333
-    GoToIfEq 0x8008, 2, _137B
+    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 VAR_0x800B
-    FrontierScrCmd_23 0x800C
+    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 14, 1, 0, VAR_0x8008
-    FrontierScrCmd_91 5, 0, 0, 0x8008
+    FrontierScrCmd_91 5, 0, 0, VAR_0x8008
-    FrontierScrCmd_91 23, 0, 0, 0x8008
+    FrontierScrCmd_91 23, 0, 0, VAR_0x8008
-    GoToIfNe 0x8008, 10, _0B25
+    GoToIfNe VAR_0x8008, 10, _0B25
    GoTo _0A73
    End
 _0A73:
-    FrontierScrCmd_71 0x8008
+    FrontierScrCmd_71 VAR_0x8008
-    GoToIfEq 0x8008, 0, _0ABC
+    GoToIfEq VAR_0x8008, 0, _0ABC
-    FrontierScrCmd_70 0x8008
+    FrontierScrCmd_70 VAR_0x8008
-    CallIfEq 0x8008, 0, _0E6F
+    CallIfEq VAR_0x8008, 0, _0E6F
-    CallIfEq 0x8008, 1, _0E75
+    CallIfEq VAR_0x8008, 1, _0E75
-    ShowYesNoMenu 0x8008, MENU_NO
+    ShowYesNoMenu VAR_0x8008, MENU_NO
-    GoToIfEq 0x8008, 1, _0AD6
+    GoToIfEq VAR_0x8008, 1, _0AD6
    GoTo _0AC8
    End
@ -964,15 +964,15 @@ _0AC8:
    End
 _0AD6:
-    FrontierScrCmd_91 22, 0, 0, 0x8008
+    FrontierScrCmd_91 22, 0, 0, VAR_0x8008
-    FrontierScrCmd_3D 0x40BA, 1
+    FrontierScrCmd_3D VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 1
-    FrontierScrCmd_91 15, 0, 0, 0x8008
+    FrontierScrCmd_91 15, 0, 0, VAR_0x8008
-    BufferSpeciesName 0, 0x8008
+    BufferSpeciesName 0, VAR_0x8008
    Message BattleHallScene_Text_BPEarned
    BufferPlayerName 0
-    FrontierScrCmd_91 34, 0, 0, 0x8008
+    FrontierScrCmd_91 34, 0, 0, VAR_0x8008
-    BufferNumber 1, 0x8008
+    BufferNumber 1, VAR_0x8008
-    GiveBattlePoints 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
+    FrontierScrCmd_91 15, 0, 0, VAR_0x8008
-    BufferSpeciesName 0, 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
+    FrontierScrCmd_91 23, 0, 0, VAR_0x8008
-    AddVar 0x8008, 1
+    AddVar VAR_0x8008, 1
-    BufferNumber 0, 0x8008
+    BufferNumber 0, VAR_0x8008
    Message BattleHallScene_Text_AreYouReady
    GoTo _0B79
    End
 _0B79:
-    FrontierScrCmd_91 30, 0, 0, 0x8008
+    FrontierScrCmd_91 30, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _0BA2
+    GoToIfEq VAR_0x8008, 1, _0BA2
-    GoToIfEq 0x8003, 0, _0BF2
+    GoToIfEq VAR_0x8003, 0, _0BF2
    GoTo _0BE4
    End
 _0BA2:
-    FrontierScrCmd_71 0x8008
+    FrontierScrCmd_71 VAR_0x8008
-    GoToIfEq 0x8008, 0, _0BC8
+    GoToIfEq VAR_0x8008, 0, _0BC8
-    GoToIfEq 0x8003, 0, _0BD6
+    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 VAR_0x8008, 1, _0C36
-    GoToIfEq 0x8008, 2, _0C51
+    GoToIfEq VAR_0x8008, 2, _0C51
-    GoToIfEq 0x8008, 3, _0C74
+    GoToIfEq VAR_0x8008, 3, _0C74
-    GoToIfEq 0x8008, 4, _0C97
+    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 VAR_0x8009, 0, _0D10
-    GoToIfEq 0x8009, 1, _0DAF
+    GoToIfEq VAR_0x8009, 1, _0DAF
-    GoToIfEq 0x8009, 2, _0E7B
+    GoToIfEq VAR_0x8009, 2, _0E7B
-    GoToIfEq 0x8009, 3, _0ECF
+    GoToIfEq VAR_0x8009, 3, _0ECF
    GoTo _0ECF
    End
 _0D10:
-    FrontierScrCmd_91 30, 0, 0, 0x8008
+    FrontierScrCmd_91 30, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _0D2C
+    GoToIfEq VAR_0x8008, 1, _0D2C
    GoTo _0D99
    End
@ -1108,13 +1108,13 @@ _0D2C:
    End
 _0D3B:
-    SetVar 0x8006, 3
+    SetVar VAR_0x8006, 3
-    FrontierScrCmd_93 0x8006, 0, 0x8008
+    FrontierScrCmd_93 VAR_0x8006, 0, VAR_0x8008
-    GoToIfEq 0x8008, 0, _0D3B
+    GoToIfEq VAR_0x8008, 0, _0D3B
-    FrontierScrCmd_94 0x8006
+    FrontierScrCmd_94 VAR_0x8006
    ClearReceivedTempDataAllPlayers
-    FrontierScrCmd_91 24, 0, 0, 0x8008
+    FrontierScrCmd_91 24, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _0D80
+    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
+    FrontierScrCmd_70 VAR_0x8008
-    CallIfEq 0x8008, 0, _0E6F
+    CallIfEq VAR_0x8008, 0, _0E6F
-    CallIfEq 0x8008, 1, _0E75
+    CallIfEq VAR_0x8008, 1, _0E75
-    ShowYesNoMenu 0x8008, MENU_NO
+    ShowYesNoMenu VAR_0x8008, MENU_NO
-    GoToIfEq 0x8008, 1, _0DF5
+    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
+    ShowYesNoMenu VAR_0x8008, MENU_YES
-    GoToIfEq 0x8008, 1, _0EC7
+    GoToIfEq VAR_0x8008, 1, _0EC7
    GoTo _0E99
    End
 _0E99:
-    FrontierScrCmd_3D 0x40BA, 2
+    FrontierScrCmd_3D VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 2
-    FrontierScrCmd_91 10, 0, 0, 0x8008
+    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
+    ShowYesNoMenu VAR_0x8008, MENU_NO
-    GoToIfEq 0x8008, 1, _0F55
+    GoToIfEq VAR_0x8008, 1, _0F55
-    FrontierScrCmd_91 30, 0, 0, 0x8008
+    FrontierScrCmd_91 30, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _0F01
+    GoToIfEq VAR_0x8008, 1, _0F01
    GoTo _0F40
    End
@ -1237,9 +1237,9 @@ _0F01:
    End
 _0F0D:
-    SetVar 0x8006, 3
+    SetVar VAR_0x8006, 3
-    FrontierScrCmd_93 0x8006, 1, 0x8008
+    FrontierScrCmd_93 VAR_0x8006, 1, VAR_0x8008
-    GoToIfEq 0x8008, 0, _0F0D
+    GoToIfEq VAR_0x8008, 0, _0F0D
    GoTo _0F30
    End
@ -1251,8 +1251,8 @@ _0F30:
    End
 _0F40:
-    FrontierScrCmd_91 21, 0, 0, 0x8008
+    FrontierScrCmd_91 21, 0, 0, VAR_0x8008
-    FrontierScrCmd_3D 0x40BA, 3
+    FrontierScrCmd_3D VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 3
    GoTo _100D
    End
@ -1261,13 +1261,13 @@ _0F55:
    End
 _0F5D:
-    FrontierScrCmd_71 0x8008
+    FrontierScrCmd_71 VAR_0x8008
-    GoToIfEq 0x8008, 0, _0FA6
+    GoToIfEq VAR_0x8008, 0, _0FA6
-    FrontierScrCmd_70 0x8008
+    FrontierScrCmd_70 VAR_0x8008
-    CallIfEq 0x8008, 0, _0E6F
+    CallIfEq VAR_0x8008, 0, _0E6F
-    CallIfEq 0x8008, 1, _0E75
+    CallIfEq VAR_0x8008, 1, _0E75
-    ShowYesNoMenu 0x8008, MENU_NO
+    ShowYesNoMenu VAR_0x8008, MENU_NO
-    GoToIfEq 0x8008, 1, _0FC0
+    GoToIfEq VAR_0x8008, 1, _0FC0
    GoTo _0FB2
    End
@ -1286,14 +1286,14 @@ _0FC0:
    End
 _0FC8:
-    FrontierScrCmd_91 21, 0, 0, 0x8008
+    FrontierScrCmd_91 21, 0, 0, VAR_0x8008
-    FrontierScrCmd_3D 0x40BA, 3
+    FrontierScrCmd_3D VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 3
    GoTo _0FDD
    End
 _0FDD:
-    FrontierScrCmd_91 30, 0, 0, 0x8008
+    FrontierScrCmd_91 30, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _0FF9
+    GoToIfEq VAR_0x8008, 1, _0FF9
    GoTo _100D
    End
@ -1312,13 +1312,13 @@ _100D:
    End
 _101D:
-    FrontierScrCmd_91 30, 0, 0, 0x8008
+    FrontierScrCmd_91 30, 0, 0, VAR_0x8008
-    CallIfEq 0x8008, 1, _1071
+    CallIfEq VAR_0x8008, 1, _1071
    FadeScreenOut
-    FrontierScrCmd_91 17, 0, 0, 0x8008
+    FrontierScrCmd_91 17, 0, 0, VAR_0x8008
-    CallIfEq 0x8008, 2, _106B
+    CallIfEq VAR_0x8008, 2, _106B
-    FrontierScrCmd_91 17, 0, 0, 0x8008
+    FrontierScrCmd_91 17, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 3, _107B
+    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
+    FrontierScrCmd_76 VAR_0x8008
-    CallIfEq 0x8008, 0, _10C2
+    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
+    FrontierScrCmd_91 19, 0, 0, VAR_0x8008
-    GoToIfLt 0x8008, 2, _10F5
+    GoToIfLt VAR_0x8008, 2, _10F5
-    GoToIfLt 0x8008, 5, _1109
+    GoToIfLt VAR_0x8008, 5, _1109
    GoTo _1117
    End
@ -1387,9 +1387,9 @@ _1117:
    Return
 _1125:
-    FrontierScrCmd_91 23, 0, 0, 0x8008
+    FrontierScrCmd_91 23, 0, 0, VAR_0x8008
-    AddVar 0x8008, 1
+    AddVar VAR_0x8008, 1
-    GoToIfEq 0x8008, 10, _1159
+    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_91 31, 1, 0, VAR_0x8008
-    FrontierScrCmd_45 0x8002, 128, 56, 0xC350, 0, 0
+    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
+    FrontierScrCmd_3E VAR_BATTLE_HALL_PRINT_STATE, VAR_0x8008
-    CallIfEq 0x8008, 0, _1373
+    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
+    FrontierScrCmd_3E VAR_BATTLE_HALL_PRINT_STATE, VAR_0x8008
-    CallIfEq 0x8008, 2, _13BB
+    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
+    FrontierScrCmd_91 4, 0, 0, VAR_0x8008
-    GoToIfGe 0x8008, 9999, _13DF
+    GoToIfGe VAR_0x8008, 9999, _13DF
-    AddVar 0x8008, 1
+    AddVar VAR_0x8008, 1
    Return
 _13DF:
    Return
 _13E1:
-    WaitTime 1, 0x8008
+    WaitTime 1, VAR_0x8008
-    FrontierScrCmd_91 29, 0, 0, 0x8008
+    FrontierScrCmd_91 29, 0, 0, VAR_0x8008
-    WaitTime 1, 0x8008
+    WaitTime 1, VAR_0x8008
    ClearReceivedTempDataAllPlayers
    FrontierScrCmd_35 185
    ClearReceivedTempDataAllPlayers
    Return
 _13FE:
-    WaitTime 1, 0x8008
+    WaitTime 1, VAR_0x8008
-    FrontierScrCmd_91 29, 0, 0, 0x8008
+    FrontierScrCmd_91 29, 0, 0, VAR_0x8008
-    WaitTime 1, 0x8008
+    WaitTime 1, VAR_0x8008
    ClearReceivedTempDataAllPlayers
    FrontierScrCmd_35 186
    ClearReceivedTempDataAllPlayers
    Return
 _141B:
-    WaitTime 1, 0x8008
+    WaitTime 1, VAR_0x8008
-    FrontierScrCmd_91 29, 0, 0, 0x8008
+    FrontierScrCmd_91 29, 0, 0, VAR_0x8008
-    WaitTime 1, 0x8008
+    WaitTime 1, VAR_0x8008
    ClearReceivedTempDataAllPlayers
    FrontierScrCmd_35 187
    ClearReceivedTempDataAllPlayers
--- 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
+    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
-    GoToIfEq 0x8008, 4, _015A
+    GoToIfEq VAR_0x8008, 4, _015A
-    GoToIfEq 0x8008, 5, _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 VAR_0x8001, 1, _01A0
-    GoToIfEq 0x8001, 2, _0394
+    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
+    GoToIfEq VAR_0x8001, 0, _018D
-    CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 0, 0x8009
+    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_3D VAR_UNK_0x40D9, 3
-    FrontierScrCmd_3E 0x40D9, 0x8001
+    FrontierScrCmd_3E VAR_UNK_0x40D9, VAR_0x8001
-    CallBattleTowerFunction BT_FUNC_CHECK_IS_NULL, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_CHECK_IS_NULL, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _03EF
+    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
+    FrontierScrCmd_70 VAR_0x8008
-    CallIfEq 0x8008, 0, _06A7
+    CallIfEq VAR_0x8008, 0, _06A7
-    CallIfEq 0x8008, 1, _06AD
+    CallIfEq VAR_0x8008, 1, _06AD
-    ShowYesNoMenu 0x8008, MENU_NO
+    ShowYesNoMenu VAR_0x8008, MENU_NO
-    CallIfEq 0x8008, 0, _0328
+    CallIfEq VAR_0x8008, 0, _0328
-    CallBattleTowerFunction BT_FUNC_UPDATE_GAME_RECORDS_AND_JOURNAL, 0, 0x8008
+    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
+    FrontierScrCmd_70 VAR_0x8008
-    CallIfEq 0x8008, 0, _06A7
+    CallIfEq VAR_0x8008, 0, _06A7
-    CallIfEq 0x8008, 1, _06AD
+    CallIfEq VAR_0x8008, 1, _06AD
-    ShowYesNoMenu 0x8008, MENU_NO
+    ShowYesNoMenu VAR_0x8008, MENU_NO
-    CallIfEq 0x8008, 0, _0328
+    CallIfEq VAR_0x8008, 0, _0328
-    CallBattleTowerFunction BT_FUNC_UPDATE_GAME_RECORDS_AND_JOURNAL, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_UPDATE_GAME_RECORDS_AND_JOURNAL, 0, VAR_0x8008
-    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
-    GoToIfEq 0x8008, 5, _02D4
+    GoToIfEq VAR_0x8008, 5, _02D4
    Message BattleTowerBattleRoom_Text_BPEarned
    Call _0330
    CloseMessage
@ -266,13 +266,13 @@ _02D4:
    End
 _02DE:
-    FrontierScrCmd_70 0x8008
+    FrontierScrCmd_70 VAR_0x8008
-    CallIfEq 0x8008, 0, _06A7
+    CallIfEq VAR_0x8008, 0, _06A7
-    CallIfEq 0x8008, 1, _06AD
+    CallIfEq VAR_0x8008, 1, _06AD
-    ShowYesNoMenu 0x8008, MENU_NO
+    ShowYesNoMenu VAR_0x8008, MENU_NO
-    CallIfEq 0x8008, 0, _0320
+    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
+    CallBattleTowerFunction BT_FUNC_UNK_46, 0, VAR_0x8008
-    BufferNumber 1, 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_UNK_34, 0, VAR_0x8008
-    CallBattleTowerFunction BT_FUNC_HAS_DEFEATED_SEVEN_TRAINERS, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_HAS_DEFEATED_SEVEN_TRAINERS, 0, VAR_0x8008
    Return
 _0394:
-    FrontierScrCmd_3D 0x40D9, 3
+    FrontierScrCmd_3D VAR_UNK_0x40D9, 3
-    FrontierScrCmd_3E 0x40D9, 0x8001
+    FrontierScrCmd_3E VAR_UNK_0x40D9, VAR_0x8001
-    SetVar 0x8003, 1
+    SetVar VAR_0x8003, 1
-    CallBattleTowerFunction BT_FUNC_CHECK_IS_NULL, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_CHECK_IS_NULL, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _03EF
+    GoToIfEq VAR_0x8008, 1, _03EF
    Call _03CF
    Call _03DB
    GoTo _0741
@ -342,47 +342,47 @@ _03DB:
 _03EF:
    FrontierScrCmd_6F
-    WaitTime 30, 0x8008
+    WaitTime 30, VAR_0x8008
-    FrontierScrCmd_3D 0x40D8, 1
+    FrontierScrCmd_3D VAR_UNK_0x40D8, 1
-    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
-    SetVar 0x8010, 0x8008
+    SetVar FR_VAR_0x8010, VAR_0x8008
-    GoToIfEq 0x8010, 4, _043F
+    GoToIfEq FR_VAR_0x8010, 4, _043F
-    GoToIfEq 0x8010, 5, _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_3D VAR_UNK_0x40D9, 0
-    FrontierScrCmd_3E 0x40D9, 0x8001
+    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
+    CallBattleTowerFunction BT_FUNC_GET_NEXT_OPPONENT_NUM, 0, VAR_0x800C
-    BufferNumber 0, 0x800C
+    BufferNumber 0, VAR_0x800C
    Message BattleTowerBattleRoom_Text_AreYouReady
-    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
-    GoToIfNe 0x8008, 0, _052C
+    GoToIfNe VAR_0x8008, 0, _052C
-    CallBattleTowerFunction BT_FUNC_UNK_36, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_UNK_36, 0, VAR_0x8008
-    GoToIfEq 0x8008, 20, _078C
+    GoToIfEq VAR_0x8008, 20, _078C
-    GoToIfEq 0x8008, 48, _078C
+    GoToIfEq VAR_0x8008, 48, _078C
    GoTo _052C
    End
 _052C:
-    GoToIfEq 0x8003, 0, _0554
+    GoToIfEq VAR_0x8003, 0, _0554
-    InitGlobalTextListMenu 31, 11, 0, 0, 0x8008
+    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
+    SetVar FR_VAR_0x8010, VAR_0x8008
-    GoToIfEq 0x8010, 0, _05CD
+    GoToIfEq FR_VAR_0x8010, 0, _05CD
-    GoToIfEq 0x8010, 1, _05F5
+    GoToIfEq FR_VAR_0x8010, 1, _05F5
-    GoToIfEq 0x8010, 2, _06B3
+    GoToIfEq FR_VAR_0x8010, 2, _06B3
-    GoToIfEq 0x8010, 3, _0711
+    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
+    FrontierScrCmd_70 VAR_0x8008
-    CallIfEq 0x8008, 0, _06A7
+    CallIfEq VAR_0x8008, 0, _06A7
-    CallIfEq 0x8008, 1, _06AD
+    CallIfEq VAR_0x8008, 1, _06AD
-    ShowYesNoMenu 0x8008, MENU_NO
+    ShowYesNoMenu VAR_0x8008, MENU_NO
-    GoToIfEq 0x8008, 1, _04DC
+    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
+    FrontierScrCmd_3D VAR_UNK_0x40D8, 2
-    CallBattleTowerFunction BT_FUNC_UNK_39, 0, 0x8008
+    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
+    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
-    GoToIfNe 0x8008, 0, _04DC
+    GoToIfNe VAR_0x8008, 0, _04DC
-    CallBattleTowerFunction BT_FUNC_UNK_36, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_UNK_36, 0, VAR_0x8008
-    GoToIfEq 0x8008, 20, _0780
+    GoToIfEq VAR_0x8008, 20, _0780
-    GoToIfEq 0x8008, 48, _0780
+    GoToIfEq VAR_0x8008, 48, _0780
    GoTo _04DC
    End
@ -554,15 +554,15 @@ _0780:
    End
 _078C:
-    GoToIfEq 0x8003, 0, _07B4
+    GoToIfEq VAR_0x8003, 0, _07B4
-    InitGlobalTextListMenu 31, 11, 0, 0, 0x8008
+    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
+    SetVar FR_VAR_0x8010, VAR_0x8008
-    GoToIfEq 0x8010, 0, _082D
+    GoToIfEq FR_VAR_0x8010, 0, _082D
-    GoToIfEq 0x8010, 1, _05F5
+    GoToIfEq FR_VAR_0x8010, 1, _05F5
-    GoToIfEq 0x8010, 2, _06B3
+    GoToIfEq FR_VAR_0x8010, 2, _06B3
-    GoToIfEq 0x8010, 3, _0711
+    GoToIfEq FR_VAR_0x8010, 3, _0711
    GoTo _082D
    End
 _082D:
    Call _05E1
-    SetVar 0x8003, 0
+    SetVar VAR_0x8003, 0
-    CallBattleTowerFunction BT_FUNC_SET_OPPONENT_TEAMS, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_SET_OPPONENT_TEAMS, 0, VAR_0x8008
    Call _092C
-    CallBattleTowerFunction BT_FUNC_UNK_36, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_UNK_36, 0, VAR_0x8008
-    GoToIfEq 0x8008, 48, _08F1
+    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
+    GoToIfEq VAR_0x800C, 0, _020F
-    CallBattleTowerFunction BT_FUNC_UNK_36, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_UNK_36, 0, VAR_0x8008
-    GoToIfEq 0x8008, 48, _08FD
+    GoToIfEq VAR_0x8008, 48, _08FD
-    FrontierScrCmd_3E 0x404F, 0x8008
+    FrontierScrCmd_3E VAR_BATTLE_TOWER_PRINT_STATE, VAR_0x8008
-    CallIfEq 0x8008, 0, _08D9
+    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
+    FrontierScrCmd_3E VAR_BATTLE_TOWER_PRINT_STATE, VAR_0x8008
-    CallIfEq 0x8008, 2, _0924
+    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
--- 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
+    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
-    GoToIfEq 0x8008, 4, _0145
+    GoToIfEq VAR_0x8008, 4, _0145
-    GoToIfEq 0x8008, 5, _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
+    FrontierScrCmd_3E VAR_UNK_0x40DC, VAR_0x8001
-    GoToIfEq 0x8001, 1, _0161
+    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
+    GetRandom VAR_0x8008, 4
-    SetVar 0x8010, 0x8008
+    SetVar FR_VAR_0x8010, VAR_0x8008
-    GoToIfEq 0x8010, 1, _01E4
+    GoToIfEq FR_VAR_0x8010, 1, _01E4
-    GoToIfEq 0x8010, 2, _01FE
+    GoToIfEq FR_VAR_0x8010, 2, _01FE
-    GoToIfEq 0x8010, 3, _0218
+    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
--- 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
+    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
-    GoToIfEq 0x8008, 3, _01B0
+    GoToIfEq VAR_0x8008, 3, _01B0
-    GoToIfEq 0x8008, 6, _01B0
+    GoToIfEq VAR_0x8008, 6, _01B0
-    SetVar 0x8002, 3
+    SetVar VAR_0x8002, 3
-    SetVar 0x8003, 4
+    SetVar VAR_0x8003, 4
    FrontierScrCmd_22 _0008
    FrontierScrCmd_24 _0024
    GoTo _01D0
    End
 _01B0:
-    SetVar 0x8002, 5
+    SetVar VAR_0x8002, 5
-    SetVar 0x8003, 6
+    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
+    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
-    GoToIfEq 0x8008, 3, _0250
+    GoToIfEq VAR_0x8008, 3, _0250
-    GoToIfEq 0x8008, 6, _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 FR_VAR_0x800F
-    FrontierScrCmd_23 0x800B
+    FrontierScrCmd_23 VAR_0x800B
-    FrontierScrCmd_23 0x800C
+    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 VAR_0x8001, 0, _02AA
-    GoToIfEq 0x8000, 1, _02AC
+    GoToIfEq VAR_0x8000, 1, _02AC
-    CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 0, 0x800B
+    CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 0, VAR_0x800B
-    CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 1, 0x800C
+    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, 0, VAR_0x800B
-    CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 1, 0x800C
+    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 VAR_0x8002, _00C8
-    FrontierScrCmd_28 0x8003, _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 VAR_0x8002, _00EC
-    FrontierScrCmd_28 0x8003, _00EC
+    FrontierScrCmd_28 VAR_0x8003, _00EC
    FrontierScrCmd_29
    Return
 _0344:
-    CallIfNe 0x8001, 0, _0353
+    CallIfNe VAR_0x8001, 0, _0353
    Return
 _0353:
--- 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
+    SetVar VAR_0x8006, 0
-    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
-    GoToIfEq 0x8008, 3, _01CE
+    GoToIfEq VAR_0x8008, 3, _01CE
-    GoToIfEq 0x8008, 6, _01CE
+    GoToIfEq VAR_0x8008, 6, _01CE
-    SetVar 0x8001, 5
+    SetVar VAR_0x8001, 5
-    SetVar 0x8002, 6
+    SetVar VAR_0x8002, 6
-    SetVar 0x800F, 232
+    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 VAR_0x8001, 7
-    SetVar 0x8002, 8
+    SetVar VAR_0x8002, 8
-    SetVar 0x800F, 232
+    SetVar FR_VAR_0x800F, 232
    FrontierScrCmd_22 _0014
    FrontierScrCmd_24 _0064
    GoTo _01F8
@ -283,31 +283,31 @@ _01CE:
 _01F8:
    FadeScreenIn
-    FrontierScrCmd_3E 0x40DE, 0x8008
+    FrontierScrCmd_3E VAR_UNK_0x40DE, VAR_0x8008
-    GoToIfEq 0x8008, 1, _0226
+    GoToIfEq VAR_0x8008, 1, _0226
-    GoToIfEq 0x8008, 2, _04FB
+    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
+    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
-    GoToIfEq 0x8008, 3, _0270
+    GoToIfEq VAR_0x8008, 3, _0270
-    GoToIfEq 0x8008, 6, _0270
+    GoToIfEq VAR_0x8008, 6, _0270
    GoTo _0965
    End
 _025C:
-    FrontierScrCmd_28 0x8001, _00B8
+    FrontierScrCmd_28 VAR_0x8001, _00B8
-    FrontierScrCmd_28 0x8002, _00CC
+    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
+    CallBattleTowerFunction BT_FUNC_GET_NEXT_OPPONENT_NUM, 0, VAR_0x8008
-    BufferNumber 0, 0x8008
+    BufferNumber 0, VAR_0x8008
    Message BattleTowerMultiBattleRoom_Text_AskReadyForNextPair
-    GoToIfEq 0x8006, 0, _02E9
+    GoToIfEq VAR_0x8006, 0, _02E9
-    InitGlobalTextListMenu 31, 13, 0, 0, 0x8008
+    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
+    GoToIfEq VAR_0x8008, 1, _0330
-    FrontierScrCmd_71 0x8008
+    FrontierScrCmd_71 VAR_0x8008
-    GoToIfEq 0x8008, 0, _0330
+    GoToIfEq VAR_0x8008, 0, _0330
-    InitGlobalTextListMenu 31, 11, 0, 0, 0x8008
+    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
+    SetVar VAR_0x8000, 0
-    GoToIfEq 0x8008, 2, _0B27
+    GoToIfEq VAR_0x8008, 2, _0B27
-    GoToIfEq 0x8008, 1, _0B65
+    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
+    FrontierScrCmd_89 2, VAR_0x8000, VAR_0x8008
-    GoToIfEq 0x8008, 0, _039F
+    GoToIfEq VAR_0x8008, 0, _039F
-    FrontierScrCmd_8A 2, 0x8000
+    FrontierScrCmd_8A 2, VAR_0x8000
    CloseMessage
-    SetVar 0x8010, 0x8000
+    SetVar FR_VAR_0x8010, VAR_0x8000
-    GoToIfEq 0x8010, 1, _0B4B
+    GoToIfEq FR_VAR_0x8010, 1, _0B4B
    Call _0605
    GoTo _0270
    End
 _03DD:
    FrontierScrCmd_6F
-    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
-    GoToIfEq 0x8008, 3, _0437
+    GoToIfEq VAR_0x8008, 3, _0437
-    GoToIfEq 0x8008, 6, _0443
+    GoToIfEq VAR_0x8008, 6, _0443
-    WaitTime 30, 0x8008
+    WaitTime 30, VAR_0x8008
-    FrontierScrCmd_3D 0x40D8, 1
+    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 FR_VAR_0x800F
-    FrontierScrCmd_23 0x800A
+    FrontierScrCmd_23 VAR_0x800A
    FrontierScrCmd_02
 _0437:
@ -397,27 +397,27 @@ _0437:
    End
 _0443:
-    WaitTime 30, 0x8008
+    WaitTime 30, VAR_0x8008
-    FrontierScrCmd_3D 0x40D8, 1
+    FrontierScrCmd_3D VAR_UNK_0x40D8, 1
    ClearReceivedTempDataAllPlayers
    FrontierScrCmd_35 6
-    CallIfEq 0x8004, 100, _04D1
+    CallIfEq VAR_0x8004, 100, _04D1
-    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
-    CallIfEq 0x8008, 6, _04DF
+    CallIfEq VAR_0x8008, 6, _04DF
    FadeScreenOut
    ClearReceivedTempDataAllPlayers
    FrontierScrCmd_35 8
-    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
-    CallIfEq 0x8008, 3, _04F7
+    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 FR_VAR_0x800F
-    FrontierScrCmd_23 0x800A
+    FrontierScrCmd_23 VAR_0x800A
-    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
-    GoToIfEq 0x8008, 6, _04D5
+    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
+    FrontierScrCmd_3D VAR_UNK_0x40DE, 3
-    SetVar 0x8006, 1
+    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 VAR_0x8001, _016C
-    FrontierScrCmd_28 0x8002, _016C
+    FrontierScrCmd_28 VAR_0x8002, _016C
    FrontierScrCmd_29
    Return
 _053F:
-    CallBattleTowerFunction BT_FUNC_GET_NEXT_OPPONENT_NUM, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_GET_NEXT_OPPONENT_NUM, 0, VAR_0x8008
-    BufferNumber 0, 0x8008
+    BufferNumber 0, VAR_0x8008
    Message BattleTowerMultiBattleRoom_Text_AskReadyForNextPair
-    GoToIfEq 0x8006, 0, _0578
+    GoToIfEq VAR_0x8006, 0, _0578
-    InitGlobalTextListMenu 31, 11, 0, 0, 0x8008
+    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
+    SetVar FR_VAR_0x8010, VAR_0x8008
-    GoToIfEq 0x8010, 0, _05F1
+    GoToIfEq FR_VAR_0x8010, 0, _05F1
-    GoToIfEq 0x8010, 1, _0629
+    GoToIfEq FR_VAR_0x8010, 1, _0629
-    GoToIfEq 0x8010, 2, _06E7
+    GoToIfEq FR_VAR_0x8010, 2, _06E7
-    GoToIfEq 0x8010, 3, _0745
+    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 VAR_0x8001, _0154
-    FrontierScrCmd_28 0x8002, _0154
+    FrontierScrCmd_28 VAR_0x8002, _0154
    FrontierScrCmd_28 1, _015C
    FrontierScrCmd_28 2, _015C
    FrontierScrCmd_29
    Return
 _0629:
-    FrontierScrCmd_70 0x8008
+    FrontierScrCmd_70 VAR_0x8008
-    CallIfEq 0x8008, 0, _06DB
+    CallIfEq VAR_0x8008, 0, _06DB
-    CallIfEq 0x8008, 1, _06E1
+    CallIfEq VAR_0x8008, 1, _06E1
-    ShowYesNoMenu 0x8008, MENU_NO
+    ShowYesNoMenu VAR_0x8008, MENU_NO
-    GoToIfEq 0x8008, 1, _053F
+    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
+    FrontierScrCmd_3D VAR_UNK_0x40D8, 2
-    CallBattleTowerFunction BT_FUNC_UNK_39, 0, 0x8008
+    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
+    CallBattleTowerFunction BT_FUNC_UPDATE_GAME_RECORDS, 0, VAR_0x8008
-    SetVar 0x8000, 0
+    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
+    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
-    GoToIfEq 0x8008, 3, _07B3
+    GoToIfEq VAR_0x8008, 3, _07B3
-    GoToIfEq 0x8008, 6, _07B3
+    GoToIfEq VAR_0x8008, 6, _07B3
    GoTo _07DF
    End
 _07B3:
-    FrontierScrCmd_71 0x8008
+    FrontierScrCmd_71 VAR_0x8008
-    GoToIfEq 0x8008, 0, _0817
+    GoToIfEq VAR_0x8008, 0, _0817
    Call _0C57
-    GoToIfEq 0x8008, 1, _0817
+    GoToIfEq VAR_0x8008, 1, _0817
    GoTo _07DF
    End
 _07DF:
-    FrontierScrCmd_70 0x8008
+    FrontierScrCmd_70 VAR_0x8008
-    CallIfEq 0x8008, 0, _06DB
+    CallIfEq VAR_0x8008, 0, _06DB
-    CallIfEq 0x8008, 1, _06E1
+    CallIfEq VAR_0x8008, 1, _06E1
-    ShowYesNoMenu 0x8008, MENU_NO
+    ShowYesNoMenu VAR_0x8008, MENU_NO
-    CallIfEq 0x8008, 0, _095D
+    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
+    CallBattleTowerFunction BT_FUNC_UNK_46, 0, VAR_0x8008
-    BufferNumber 1, 0x8008
+    BufferNumber 1, VAR_0x8008
    BufferPlayerName 0
    Message BattleTowerMultiBattleRoom_Text_PlayerReceivedBP
    PlayFanfare SEQ_PL_POINTGET3
    WaitFanfare
-    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
-    GoToIfEq 0x8008, 3, _0869
+    GoToIfEq VAR_0x8008, 3, _0869
-    GoToIfEq 0x8008, 6, _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
+    SetVar VAR_0x8004, 0
-    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
-    GoToIfEq 0x8008, 3, _08AB
+    GoToIfEq VAR_0x8008, 3, _08AB
-    GoToIfEq 0x8008, 6, _08AB
+    GoToIfEq VAR_0x8008, 6, _08AB
    GoTo _08E9
    End
 _08AB:
-    FrontierScrCmd_71 0x8008
+    FrontierScrCmd_71 VAR_0x8008
-    GoToIfEq 0x8008, 0, _08D7
+    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
+    FrontierScrCmd_70 VAR_0x8008
-    CallIfEq 0x8008, 0, _06DB
+    CallIfEq VAR_0x8008, 0, _06DB
-    CallIfEq 0x8008, 1, _06E1
+    CallIfEq VAR_0x8008, 1, _06E1
-    ShowYesNoMenu 0x8008, MENU_NO
+    ShowYesNoMenu VAR_0x8008, MENU_NO
-    CallIfEq 0x8008, 0, _0955
+    CallIfEq VAR_0x8008, 0, _0955
-    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
-    GoToIfEq 0x8008, 3, _08D7
+    GoToIfEq VAR_0x8008, 3, _08D7
-    GoToIfEq 0x8008, 6, _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_UNK_34, 0, VAR_0x8008
-    CallBattleTowerFunction BT_FUNC_HAS_DEFEATED_SEVEN_TRAINERS, 0, 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 VAR_0x800B
-    FrontierScrCmd_23 0x800C
+    FrontierScrCmd_23 VAR_0x800C
    Return
 _09E9:
-    FrontierScrCmd_28 0x8001, _0140
+    FrontierScrCmd_28 VAR_0x8001, _0140
-    FrontierScrCmd_28 0x8002, _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, 0, VAR_0x800B
-    CallBattleTowerFunction BT_FUNC_GET_OPPONENT_OBJECT_ID, 1, 0x800C
+    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 VAR_0x8001, _0108
-    FrontierScrCmd_28 0x8002, _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
+    ShowYesNoMenu VAR_0x8008, MENU_NO
-    GoToIfEq 0x8008, 1, _02B0
+    GoToIfEq VAR_0x8008, 1, _02B0
-    SetVar 0x8000, 1
+    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
+    GoToIfEq VAR_0x8008, 1, _02B0
-    FrontierScrCmd_71 0x8008
+    FrontierScrCmd_71 VAR_0x8008
-    GoToIfEq 0x8008, 0, _02B0
+    GoToIfEq VAR_0x8008, 0, _02B0
    GoTo _0B91
    End
 _0B91:
-    FrontierScrCmd_70 0x8008
+    FrontierScrCmd_70 VAR_0x8008
-    CallIfEq 0x8008, 0, _06DB
+    CallIfEq VAR_0x8008, 0, _06DB
-    CallIfEq 0x8008, 1, _06E1
+    CallIfEq VAR_0x8008, 1, _06E1
-    ShowYesNoMenu 0x8008, MENU_NO
+    ShowYesNoMenu VAR_0x8008, MENU_NO
-    GoToIfEq 0x8008, 1, _02B0
+    GoToIfEq VAR_0x8008, 1, _02B0
    Call _0667
    GoTo _02B0
    End
 _0BCF:
-    FrontierScrCmd_3E 0x40DE, 0x8008
+    FrontierScrCmd_3E VAR_UNK_0x40DE, VAR_0x8008
-    GoToIfEq 0x8008, 0, _0C01
+    GoToIfEq VAR_0x8008, 0, _0C01
-    GoToIfEq 0x8000, 1, _0C03
+    GoToIfEq VAR_0x8000, 1, _0C03
-    CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 0, 0x8009
+    CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 0, VAR_0x8009
-    CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 1, 0x800A
+    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, 0, VAR_0x8009
-    CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 1, 0x800A
+    CallBattleTowerFunction BT_FUNC_GET_PARTNER_PARAM, 1, VAR_0x800A
    Return
 _0C15:
-    FrontierScrCmd_3E 0x40DE, 0x8008
+    FrontierScrCmd_3E VAR_UNK_0x40DE, VAR_0x8008
-    CallIfNe 0x8008, 0, _0C4B
+    CallIfNe VAR_0x8008, 0, _0C4B
    GoTo _0C30
    End
 _0C30:
-    FrontierScrCmd_3E 0x40DE, 0x8008
+    FrontierScrCmd_3E VAR_UNK_0x40DE, VAR_0x8008
-    GoToIfEq 0x8008, 3, _0C4D
+    GoToIfEq VAR_0x8008, 3, _0C4D
    GoTo _0C55
    End
@ -884,19 +884,19 @@ _0C55:
    Return
 _0C57:
-    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, 0x8008
+    CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008
-    GoToIfEq 0x8008, 3, _0C74
+    GoToIfEq VAR_0x8008, 3, _0C74
-    SetVar 0x8008, 0
+    SetVar VAR_0x8008, 0
    Return
 _0C74:
-    FrontierScrCmd_4B 0x8008
+    FrontierScrCmd_4B VAR_0x8008
-    GoToIfEq 0x8008, 1, _0C8D
+    GoToIfEq VAR_0x8008, 1, _0C8D
-    SetVar 0x8008, 0
+    SetVar VAR_0x8008, 0
    Return
 _0C8D:
-    SetVar 0x8008, 1
+    SetVar VAR_0x8008, 1
    Return
    .balign 4, 0
--- 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
+    WaitTime 1, VAR_0x8008
-    FrontierScrCmd_B2 0, 0, 0, 0x8008
+    FrontierScrCmd_B2 0, 0, 0, VAR_0x8008
-    WaitTime 1, 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 VAR_0x8008, 1, _010E
-    GoToIfEq 0x8008, 2, _012F
+    GoToIfEq VAR_0x8008, 2, _012F
-    GoToIfEq 0x8008, 4, _01CA
+    GoToIfEq VAR_0x8008, 4, _01CA
-    GoToIfEq 0x8008, 5, _01F1
+    GoToIfEq VAR_0x8008, 5, _01F1
-    GoToIfEq 0x8008, 6, _0218
+    GoToIfEq VAR_0x8008, 6, _0218
    GoTo _023F
    End
 _010E:
-    FrontierScrCmd_B2 7, 1, 0, 0x8008
+    FrontierScrCmd_B2 7, 1, 0, VAR_0x8008
-    SetVar 0x8004, 0
+    SetVar VAR_0x8004, 0
-    SetVar 0x8009, 1
+    SetVar VAR_0x8009, 1
-    FrontierScrCmd_3D 0x4003, 0
+    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 VAR_0x8008, 0, _0188
-    GoToIfEq 0x8008, 1, _01A9
+    GoToIfEq VAR_0x8008, 1, _01A9
    GoTo _0084
    End
 _0188:
-    FrontierScrCmd_B2 7, 2, 0, 0x8008
+    FrontierScrCmd_B2 7, 2, 0, VAR_0x8008
-    SetVar 0x8004, 0
+    SetVar VAR_0x8004, 0
-    SetVar 0x8009, 2
+    SetVar VAR_0x8009, 2
-    FrontierScrCmd_3D 0x40B9, 0
+    FrontierScrCmd_3D VAR_UNK_0x40B9, 0
    GoTo _0254
    End
 _01A9:
-    FrontierScrCmd_B2 7, 3, 0, 0x8008
+    FrontierScrCmd_B2 7, 3, 0, VAR_0x8008
-    SetVar 0x8004, 0
+    SetVar VAR_0x8004, 0
-    SetVar 0x8009, 3
+    SetVar VAR_0x8009, 3
-    FrontierScrCmd_3D 0x40B9, 1
+    FrontierScrCmd_3D VAR_UNK_0x40B9, 1
    GoTo _0254
    End
 _01CA:
-    FrontierScrCmd_B2 7, 4, 0, 0x8008
+    FrontierScrCmd_B2 7, 4, 0, VAR_0x8008
-    SetVar 0x8004, 0
+    SetVar VAR_0x8004, 0
-    SetVar 0x8009, 4
+    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
+    FrontierScrCmd_B2 7, 5, 0, VAR_0x8008
-    SetVar 0x8004, 0
+    SetVar VAR_0x8004, 0
-    SetVar 0x8009, 5
+    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
+    FrontierScrCmd_B2 7, 6, 0, VAR_0x8008
-    SetVar 0x8004, 0
+    SetVar VAR_0x8004, 0
-    SetVar 0x8009, 6
+    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
+    FrontierScrCmd_B2 7, 7, 0, VAR_0x8008
-    SetVar 0x8004, 1
+    SetVar VAR_0x8004, 1
    GoTo _0254
    End
@ -164,15 +164,15 @@ _0254:
    End
 _0260:
-    SetVar 0x800A, 1
+    SetVar VAR_0x800A, 1
-    FrontierScrCmd_AC 0x800A, 0x8004, 0, 0x8008
+    FrontierScrCmd_AC VAR_0x800A, VAR_0x8004, 0, VAR_0x8008
-    GoToIfEq 0x8008, 0, _0260
+    GoToIfEq VAR_0x8008, 0, _0260
-    FrontierScrCmd_AD 0x800A
+    FrontierScrCmd_AD VAR_0x800A
    ClearReceivedTempDataAllPlayers
-    FrontierScrCmd_B2 9, 0, 0, 0x8008
+    FrontierScrCmd_B2 9, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 7, _09C0
+    GoToIfEq VAR_0x8008, 7, _09C0
-    FrontierScrCmd_B1 0x8008
+    FrontierScrCmd_B1 VAR_0x8008
-    GoToIfEq 0x8008, 1, _02B8
+    GoToIfEq VAR_0x8008, 1, _02B8
    ClearReceivedTempDataAllPlayers
    FrontierScrCmd_35 170
    ClearReceivedTempDataAllPlayers
@ -184,23 +184,23 @@ _02B8:
    End
 _02C0:
-    SetVar 0x800A, 0
+    SetVar VAR_0x800A, 0
-    FrontierScrCmd_AC 0x800A, 0, 0, 0x8008
+    FrontierScrCmd_AC VAR_0x800A, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 0, _02C0
+    GoToIfEq VAR_0x8008, 0, _02C0
-    FrontierScrCmd_AD 0x800A
+    FrontierScrCmd_AD VAR_0x800A
    ClearReceivedTempDataAllPlayers
-    FrontierScrCmd_AE 0x8009, 0x8008
+    FrontierScrCmd_AE VAR_0x8009, VAR_0x8008
-    GoToIfEq 0x8008, 1, _0302
+    GoToIfEq VAR_0x8008, 1, _0302
    Message pl_msg_00000015_00003
    GoTo _0084
    End
 _0302:
-    FrontierScrCmd_B2 9, 0, 0, 0x8008
+    FrontierScrCmd_B2 9, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _0345
+    GoToIfEq VAR_0x8008, 1, _0345
-    GoToIfEq 0x8008, 5, _0345
+    GoToIfEq VAR_0x8008, 5, _0345
-    GoToIfEq 0x8008, 4, _0345
+    GoToIfEq VAR_0x8008, 4, _0345
-    GoToIfEq 0x8008, 6, _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 VAR_0x8009, 2, VAR_0x8008
-    FrontierScrCmd_AF 0x8009, 3, 0x8008
+    FrontierScrCmd_AF VAR_0x8009, 3, VAR_0x8008
    GoTo _037E
    End
 _037E:
-    FrontierScrCmd_AF 0x8009, 0, 0x8008
+    FrontierScrCmd_AF VAR_0x8009, 0, VAR_0x8008
-    FrontierScrCmd_AF 0x8009, 1, 0x8008
+    FrontierScrCmd_AF VAR_0x8009, 1, VAR_0x8008
-    GoToIfEq 0x8008, 2, _0366
+    GoToIfEq VAR_0x8008, 2, _0366
-    FrontierScrCmd_B0 0x8002, 0x8005
+    FrontierScrCmd_B0 VAR_0x8002, VAR_0x8005
-    FrontierScrCmd_3D 0x4002, 0x8002
+    FrontierScrCmd_3D VAR_MAP_LOCAL_2, VAR_0x8002
-    FrontierScrCmd_3D 0x4005, 0x8005
+    FrontierScrCmd_3D VAR_MAP_LOCAL_5, VAR_0x8005
    FadeScreenIn
    GoTo _03C1
    End
@ -235,19 +235,19 @@ _03C1:
    End
 _03CD:
-    SetVar 0x800A, 2
+    SetVar VAR_0x800A, 2
-    FrontierScrCmd_AC 0x800A, 0x8002, 0x8005, 0x8008
+    FrontierScrCmd_AC VAR_0x800A, VAR_0x8002, VAR_0x8005, VAR_0x8008
-    GoToIfEq 0x8008, 0, _03CD
+    GoToIfEq VAR_0x8008, 0, _03CD
-    FrontierScrCmd_AD 0x800A
+    FrontierScrCmd_AD VAR_0x800A
    ClearReceivedTempDataAllPlayers
-    GoToIfEq 0x8002, 255, _0084
+    GoToIfEq VAR_0x8002, 255, _0084
-    FrontierScrCmd_B2 1, 0, 0, 0x8008
+    FrontierScrCmd_B2 1, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 0, _044E
+    GoToIfEq VAR_0x8008, 0, _044E
-    FrontierScrCmd_B2 9, 0, 0, 0x8008
+    FrontierScrCmd_B2 9, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _045D
+    GoToIfEq VAR_0x8008, 1, _045D
-    GoToIfEq 0x8008, 5, _04F9
+    GoToIfEq VAR_0x8008, 5, _04F9
-    GoToIfEq 0x8008, 4, _0620
+    GoToIfEq VAR_0x8008, 4, _0620
-    GoToIfEq 0x8008, 6, _06BC
+    GoToIfEq VAR_0x8008, 6, _06BC
    End
 _044E:
@ -257,74 +257,74 @@ _044E:
    End
 _045D:
-    FrontierScrCmd_B2 2, 1, 0, 0x8008
+    FrontierScrCmd_B2 2, 1, 0, VAR_0x8008
-    SetVar 0x8010, 0x8008
+    SetVar FR_VAR_0x8010, VAR_0x8008
-    GoToIfEq 0x8010, 1, _0499
+    GoToIfEq FR_VAR_0x8010, 1, _0499
-    GoToIfEq 0x8010, 2, _04B4
+    GoToIfEq FR_VAR_0x8010, 2, _04B4
-    GoToIfEq 0x8010, 3, _04CF
+    GoToIfEq FR_VAR_0x8010, 3, _04CF
    GoTo _0758
    End
 _0499:
-    FrontierScrCmd_B2 5, 0, 0, 0x8008
+    FrontierScrCmd_B2 5, 0, 0, VAR_0x8008
-    BufferSpeciesName 0, 0x8008
+    BufferSpeciesName 0, VAR_0x8008
    Message pl_msg_00000015_00006
    GoTo _0084
    End
 _04B4:
-    FrontierScrCmd_B2 5, 1, 0, 0x8008
+    FrontierScrCmd_B2 5, 1, 0, VAR_0x8008
-    BufferSpeciesName 0, 0x8008
+    BufferSpeciesName 0, VAR_0x8008
    Message pl_msg_00000015_00006
    GoTo _0084
    End
 _04CF:
-    FrontierScrCmd_B2 5, 0, 0, 0x8008
+    FrontierScrCmd_B2 5, 0, 0, VAR_0x8008
-    BufferSpeciesName 0, 0x8008
+    BufferSpeciesName 0, VAR_0x8008
-    FrontierScrCmd_B2 5, 1, 0, 0x8008
+    FrontierScrCmd_B2 5, 1, 0, VAR_0x8008
-    BufferSpeciesName 1, 0x8008
+    BufferSpeciesName 1, VAR_0x8008
    Message pl_msg_00000015_00007
    GoTo _0084
    End
 _04F9:
-    FrontierScrCmd_B2 2, 5, 0, 0x8008
+    FrontierScrCmd_B2 2, 5, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _0614
+    GoToIfEq VAR_0x8008, 1, _0614
    Call _081C
-    GoToIfEq 0x800F, 0, _0766
+    GoToIfEq FR_VAR_0x800F, 0, _0766
-    FrontierScrCmd_B2 3, 0, 0, 0x8008
+    FrontierScrCmd_B2 3, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 0, _0758
+    GoToIfEq VAR_0x8008, 0, _0758
-    FrontierScrCmd_B2 4, 0, 0, 0x800B
+    FrontierScrCmd_B2 4, 0, 0, VAR_0x800B
-    BufferSpeciesName 0, 0x800B
+    BufferSpeciesName 0, VAR_0x800B
-    FrontierScrCmd_B2 5, 0, 0, 0x8008
+    FrontierScrCmd_B2 5, 0, 0, VAR_0x8008
-    BufferSpeciesName 1, 0x8008
+    BufferSpeciesName 1, VAR_0x8008
-    GoToIfEq 0x8008, 0x800B, _0758
+    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
+    SetVar VAR_0x800A, 4
-    FrontierScrCmd_AC 0x800A, 0x800B, 0, 0x8008
+    FrontierScrCmd_AC VAR_0x800A, VAR_0x800B, 0, VAR_0x8008
-    GoToIfEq 0x8008, 0, _0593
+    GoToIfEq VAR_0x8008, 0, _0593
-    FrontierScrCmd_AD 0x800A
+    FrontierScrCmd_AD VAR_0x800A
    ClearReceivedTempDataAllPlayers
-    FrontierScrCmd_B2 8, 0, 0, 0x8008
+    FrontierScrCmd_B2 8, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _05F9
+    GoToIfEq VAR_0x8008, 1, _05F9
-    GoToIfEq 0x8008, -2, _05F9
+    GoToIfEq VAR_0x8008, -2, _05F9
-    GoToIfEq 0x800B, 1, _05F9
+    GoToIfEq VAR_0x800B, 1, _05F9
-    GoToIfEq 0x800B, -2, _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
+    FrontierScrCmd_B2 2, 4, 0, VAR_0x8008
-    SetVar 0x8010, 0x8008
+    SetVar FR_VAR_0x8010, VAR_0x8008
-    GoToIfEq 0x8010, 1, _065C
+    GoToIfEq FR_VAR_0x8010, 1, _065C
-    GoToIfEq 0x8010, 2, _0677
+    GoToIfEq FR_VAR_0x8010, 2, _0677
-    GoToIfEq 0x8010, 3, _0692
+    GoToIfEq FR_VAR_0x8010, 3, _0692
    GoTo _0758
    End
 _065C:
-    FrontierScrCmd_B2 5, 0, 0, 0x8008
+    FrontierScrCmd_B2 5, 0, 0, VAR_0x8008
-    BufferSpeciesName 0, 0x8008
+    BufferSpeciesName 0, VAR_0x8008
    Message pl_msg_00000015_00009
    GoTo _0084
    End
 _0677:
-    FrontierScrCmd_B2 5, 1, 0, 0x8008
+    FrontierScrCmd_B2 5, 1, 0, VAR_0x8008
-    BufferSpeciesName 0, 0x8008
+    BufferSpeciesName 0, VAR_0x8008
    Message pl_msg_00000015_00009
    GoTo _0084
    End
 _0692:
-    FrontierScrCmd_B2 5, 0, 0, 0x8008
+    FrontierScrCmd_B2 5, 0, 0, VAR_0x8008
-    BufferSpeciesName 0, 0x8008
+    BufferSpeciesName 0, VAR_0x8008
-    FrontierScrCmd_B2 5, 1, 0, 0x8008
+    FrontierScrCmd_B2 5, 1, 0, VAR_0x8008
-    BufferSpeciesName 1, 0x8008
+    BufferSpeciesName 1, VAR_0x8008
    Message pl_msg_00000015_00010
    GoTo _0084
    End
 _06BC:
-    FrontierScrCmd_B2 2, 6, 0, 0x8008
+    FrontierScrCmd_B2 2, 6, 0, VAR_0x8008
-    SetVar 0x8010, 0x8008
+    SetVar FR_VAR_0x8010, VAR_0x8008
-    GoToIfEq 0x8010, 1, _06F8
+    GoToIfEq FR_VAR_0x8010, 1, _06F8
-    GoToIfEq 0x8010, 2, _0713
+    GoToIfEq FR_VAR_0x8010, 2, _0713
-    GoToIfEq 0x8010, 3, _072E
+    GoToIfEq FR_VAR_0x8010, 3, _072E
    GoTo _0758
    End
 _06F8:
-    FrontierScrCmd_B2 5, 0, 0, 0x8008
+    FrontierScrCmd_B2 5, 0, 0, VAR_0x8008
-    BufferSpeciesName 0, 0x8008
+    BufferSpeciesName 0, VAR_0x8008
    Message pl_msg_00000015_00009
    GoTo _0084
    End
 _0713:
-    FrontierScrCmd_B2 5, 1, 0, 0x8008
+    FrontierScrCmd_B2 5, 1, 0, VAR_0x8008
-    BufferSpeciesName 0, 0x8008
+    BufferSpeciesName 0, VAR_0x8008
    Message pl_msg_00000015_00009
    GoTo _0084
    End
 _072E:
-    FrontierScrCmd_B2 5, 0, 0, 0x8008
+    FrontierScrCmd_B2 5, 0, 0, VAR_0x8008
-    BufferSpeciesName 0, 0x8008
+    BufferSpeciesName 0, VAR_0x8008
-    FrontierScrCmd_B2 5, 1, 0, 0x8008
+    FrontierScrCmd_B2 5, 1, 0, VAR_0x8008
-    BufferSpeciesName 1, 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_B2 12, 0, 0, VAR_0x8008
-    FrontierScrCmd_3D 0x4064, 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
+    FrontierScrCmd_B2 9, 0, 0, VAR_0x8008
-    SetVar 0x8010, 0x8008
+    SetVar FR_VAR_0x8010, VAR_0x8008
-    GoToIfEq 0x8010, 1, _0842
+    GoToIfEq FR_VAR_0x8010, 1, _0842
-    GoToIfEq 0x8010, 2, _0879
+    GoToIfEq FR_VAR_0x8010, 2, _0879
-    GoToIfEq 0x8010, 3, _0879
+    GoToIfEq FR_VAR_0x8010, 3, _0879
-    GoToIfEq 0x8010, 5, _088D
+    GoToIfEq FR_VAR_0x8010, 5, _088D
-    GoToIfEq 0x8010, 4, _08A1
+    GoToIfEq FR_VAR_0x8010, 4, _08A1
-    GoToIfEq 0x8010, 6, _08B5
+    GoToIfEq FR_VAR_0x8010, 6, _08B5
    End
 _081C:
-    FrontierScrCmd_B2 11, 0, 0, 0x8008
+    FrontierScrCmd_B2 11, 0, 0, VAR_0x8008
-    SetVar 0x800F, 0x8008
+    SetVar FR_VAR_0x800F, VAR_0x8008
-    CallIfEq 0x8008, 0, _0838
+    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
+    FrontierScrCmd_B4 VAR_0x8008
-    GoToIfEq 0x8008, 0, _0858
+    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
+    WaitTime 1, VAR_0x8008
-    FrontierScrCmd_B2 0, 0, 0, 0x8008
+    FrontierScrCmd_B2 0, 0, 0, VAR_0x8008
-    WaitTime 1, 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
+    ShowYesNoMenu VAR_0x8008, MENU_YES
-    GoToIfEq 0x8008, 0, _0939
+    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
+    SetVar VAR_0x800A, 5
-    FrontierScrCmd_AC 0x800A, 0x800B, 0, 0x8008
+    FrontierScrCmd_AC VAR_0x800A, VAR_0x800B, 0, VAR_0x8008
-    GoToIfEq 0x8008, 0, _095D
+    GoToIfEq VAR_0x8008, 0, _095D
-    FrontierScrCmd_AD 0x800A
+    FrontierScrCmd_AD VAR_0x800A
    ClearReceivedTempDataAllPlayers
-    FrontierScrCmd_B1 0x8008
+    FrontierScrCmd_B1 VAR_0x8008
-    FrontierScrCmd_B2 10, 0, 0, 0x8008
+    FrontierScrCmd_B2 10, 0, 0, VAR_0x8008
-    GoToIfEq 0x8008, 1, _09AD
+    GoToIfEq VAR_0x8008, 1, _09AD
-    GoToIfEq 0x800B, 1, _09C0
+    GoToIfEq VAR_0x800B, 1, _09C0
    GoTo _0084
    End