summaryrefslogtreecommitdiff
path: root/data/scripts/players_house.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/players_house.inc
parent86e7bf1fd61b151011038cdb281db3de0a1d9e6a (diff)
more script command renaming
Diffstat (limited to 'data/scripts/players_house.inc')
-rw-r--r--data/scripts/players_house.inc38
1 files changed, 19 insertions, 19 deletions
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index bbbc0952d..868873eec 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -8,9 +8,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956
msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4
move 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0839
waitmove 0
- compare 0x8005, 0
+ compare_var_to_imm 0x8005, 0
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B699F
- compare 0x8005, 1
+ compare_var_to_imm 0x8005, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B69AA
msgbox LittlerootTown_BrendansHouse_1F_Text_172453, 4
closebutton
@@ -69,9 +69,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB
setflag 754
setflag 755
checkgender
- compare RESULT, 0
+ compare_var_to_imm RESULT, 0
call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A31
- compare RESULT, 1
+ compare_var_to_imm RESULT, 1
call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A61
playsfx 9
disappear 0x8008
@@ -252,17 +252,17 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9:: @ 81B6BE9
LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9
lock
faceplayer
- compare 0x4082, 4
+ compare_var_to_imm 0x4082, 4
goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33
- compare 0x408c, 4
+ compare_var_to_imm 0x408c, 4
goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33
checkflag 2059
goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D
checkflag 82
goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72
- compare 0x4001, 1
+ compare_var_to_imm 0x4001, 1
goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80
- compare 0x4092, 7
+ compare_var_to_imm 0x4092, 7
goto_if 4, LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C
msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4
release
@@ -278,7 +278,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D
goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72
msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4
giveitem ITEM_AMULET_COIN
- compare RESULT, 0
+ compare_var_to_imm RESULT, 0
goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1A029B
msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, 4
setflag 133
@@ -362,13 +362,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
lockall
checkgender
- compare RESULT, 0
+ compare_var_to_imm RESULT, 0
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD
- compare RESULT, 1
+ compare_var_to_imm RESULT, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD
- compare 0x8008, 0
+ compare_var_to_imm 0x8008, 0
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D
- compare 0x8008, 1
+ compare_var_to_imm 0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E28
move 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0839
waitmove 0
@@ -378,23 +378,23 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
move 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0835
waitmove 0
pause 20
- compare 0x8008, 0
+ compare_var_to_imm 0x8008, 0
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD
- compare 0x8008, 1
+ compare_var_to_imm 0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8
msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4
giveitem ITEM_SS_TICKET
msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4
closebutton
- compare 0x8008, 0
+ compare_var_to_imm 0x8008, 0
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3
- compare 0x8008, 1
+ compare_var_to_imm 0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE
msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, 4
closebutton
- compare 0x8008, 0
+ compare_var_to_imm 0x8008, 0
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9
- compare 0x8008, 1
+ compare_var_to_imm 0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B
playsfx 8
disappear 0x8009