summaryrefslogtreecommitdiff
path: root/data/scripts/maps/BattleTower_Lobby.inc
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-09-24 17:10:51 -0500
committercamthesaxman <cameronghall@cox.net>2017-09-24 17:10:51 -0500
commit1e2601a0287fdacfb8f0d680fbe82a274414ea65 (patch)
tree75243530e4250a4ff2caf75368cd53d34f4e0a99 /data/scripts/maps/BattleTower_Lobby.inc
parent86e7bf1fd61b151011038cdb281db3de0a1d9e6a (diff)
more script command renaming
Diffstat (limited to 'data/scripts/maps/BattleTower_Lobby.inc')
-rw-r--r--data/scripts/maps/BattleTower_Lobby.inc30
1 files changed, 15 insertions, 15 deletions
diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc
index fc5cee29a..4caffb405 100644
--- a/data/scripts/maps/BattleTower_Lobby.inc
+++ b/data/scripts/maps/BattleTower_Lobby.inc
@@ -18,7 +18,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C
checkflag 237
goto_if_eq BattleTower_Lobby_EventScript_1602CD
specialval 0x8007, sub_810F404
- compare 0x8007, 50
+ compare_var_to_imm 0x8007, 50
goto_if 0, BattleTower_Lobby_EventScript_1602E4
clearflag 941
special sub_810F8FC
@@ -26,7 +26,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C
BattleTower_Lobby_EventScript_1602CD:: @ 81602CD
specialval 0x8007, sub_810F404
- compare 0x8007, 100
+ compare_var_to_imm 0x8007, 100
goto_if 0, BattleTower_Lobby_EventScript_1602E4
clearflag 941
special sub_810F8FC
@@ -77,10 +77,10 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342
waittext
setvar 0x8004, 0
special sub_81358A4
- compare RESULT, 6
+ compare_var_to_imm RESULT, 6
goto_if_eq BattleTower_Lobby_EventScript_16037D
special sub_8135E50
- compare RESULT, 0
+ compare_var_to_imm RESULT, 0
goto_if_eq BattleTower_Lobby_EventScript_16037D
message BattleTower_Lobby_Text_19A6BE
waittext
@@ -91,7 +91,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342
BattleTower_Lobby_EventScript_16037D:: @ 816037D
setvar 0x8004, 8
special sub_81358A4
- compare RESULT, 1
+ compare_var_to_imm RESULT, 1
goto_if_eq BattleTower_Lobby_EventScript_1603AD
message BattleTower_Lobby_Text_19A589
waittext
@@ -118,7 +118,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD
waitfanfare
setvar 0x8004, 9
special sub_81358A4
- compare RESULT, 49
+ compare_var_to_imm RESULT, 49
goto_if 5, BattleTower_Lobby_EventScript_1603F8
msgbox BattleTower_Lobby_Text_19A617, 4
@@ -186,7 +186,7 @@ BattleTower_Lobby_EventScript_16049E:: @ 816049E
faceplayer
setvar 0x8004, 0
special sub_81358A4
- compare RESULT, 6
+ compare_var_to_imm RESULT, 6
goto_if_eq BattleTower_Lobby_EventScript_160342
special SavePlayerParty
msgbox BattleTower_Lobby_Text_199F2C, 4
@@ -209,7 +209,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA
case 2, BattleTower_Lobby_EventScript_160652
case 127, BattleTower_Lobby_EventScript_160652
special CheckPartyBattleTowerBanlist
- compare 0x8004, 1
+ compare_var_to_imm 0x8004, 1
goto_if_eq BattleTower_Lobby_EventScript_16060D
setvar 0x8004, 1
copyvar 0x8005, RESULT
@@ -219,7 +219,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA
fadescreen 1
special ChooseBattleTowerPlayerParty
waitstate
- compare RESULT, 0
+ compare_var_to_imm RESULT, 0
goto_if_eq BattleTower_Lobby_EventScript_16064F
msgbox BattleTower_Lobby_Text_199FDA, 5
switch RESULT
@@ -245,7 +245,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587
call S_DoSaveDialog
setvar 0x4000, 5
hidebox 0, 0, 15, 10
- compare RESULT, 0
+ compare_var_to_imm RESULT, 0
goto_if_eq BattleTower_Lobby_EventScript_160642
inccounter GAME_STAT_ENTERED_BATTLE_TOWER
special SavePlayerParty
@@ -347,9 +347,9 @@ BattleTower_Lobby_EventScript_1606CC:: @ 81606CC
call BattleTower_Lobby_EventScript_1A00F3
lock
faceplayer
- compare RESULT, 0
+ compare_var_to_imm RESULT, 0
goto_if_eq BattleTower_Lobby_EventScript_160701
- compare RESULT, 1
+ compare_var_to_imm RESULT, 1
goto_if_eq BattleTower_Lobby_EventScript_16070B
end
@@ -394,7 +394,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733
msgbox BattleTower_Lobby_Text_19A9EE, 4
setvar 0x8008, 42
givedecoration 42
- compare RESULT, 0
+ compare_var_to_imm RESULT, 0
goto_if_eq BattleTower_Lobby_EventScript_1607AF
setflag 237
msgbox BattleTower_Lobby_Text_19ABAA, 4
@@ -403,12 +403,12 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733
BattleTower_Lobby_EventScript_160773:: @ 8160773
specialval RESULT, sub_810F404
- compare RESULT, 100
+ compare_var_to_imm RESULT, 100
goto_if 0, BattleTower_Lobby_EventScript_1607C5
msgbox BattleTower_Lobby_Text_19AAC4, 4
setvar 0x8008, 43
givedecoration 43
- compare RESULT, 0
+ compare_var_to_imm RESULT, 0
goto_if_eq BattleTower_Lobby_EventScript_1607AF
setflag 238
msgbox BattleTower_Lobby_Text_19ABAA, 4