summaryrefslogtreecommitdiff
path: root/data/maps/TwoIsland_House
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-08 18:09:24 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-01-08 18:09:24 -0500
commit31d31d326034fde26dedaf2dadb1c608e00fb92f (patch)
treebe13ed87df14390256c9a3e582fb11adbe4090b8 /data/maps/TwoIsland_House
parent26f7ba482384ad4f63063797a527b7fb33572aa1 (diff)
Sync compare macros, some event_scripts.s doc, begin map_scripts constants
Diffstat (limited to 'data/maps/TwoIsland_House')
-rw-r--r--data/maps/TwoIsland_House/scripts.inc16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc
index 40c68cb7e..f2761d7e2 100644
--- a/data/maps/TwoIsland_House/scripts.inc
+++ b/data/maps/TwoIsland_House/scripts.inc
@@ -3,7 +3,7 @@ TwoIsland_House_MapScripts:: @ 8171618
TwoIsland_House_EventScript_171619:: @ 8171619
special sub_8110AB4
- compare_var_to_value VAR_RESULT, 2
+ compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
lock
@@ -20,10 +20,10 @@ TwoIsland_House_EventScript_171619:: @ 8171619
EventScript_17164F:: @ 817164F
checkitem ITEM_BIG_MUSHROOM, 1
- compare_var_to_value VAR_RESULT, 1
+ compare VAR_RESULT, 1
call_if eq, EventScript_1717A8
checkitem ITEM_TINY_MUSHROOM, 2
- compare_var_to_value VAR_RESULT, 1
+ compare VAR_RESULT, 1
call_if eq, EventScript_1717AC
checkflag FLAG_TEMP_2
goto_if TRUE, EventScript_171687
@@ -46,7 +46,7 @@ EventScript_171696:: @ 8171696
EventScript_1716A5:: @ 81716A5
msgbox gUnknown_81A2C63, MSGBOX_YESNO
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_if eq, EventScript_17179E
goto EventScript_1716BE
end
@@ -55,12 +55,12 @@ EventScript_1716BE:: @ 81716BE
msgbox gUnknown_81A2CC3
special SelectMoveTutorMon
waitstate
- compare_var_to_value VAR_0x8004, 6
+ compare VAR_0x8004, 6
goto_if ge, EventScript_17179E
special IsSelectedMonEgg
- compare_var_to_value VAR_RESULT, 1
+ compare VAR_RESULT, 1
goto_if eq, EventScript_171790
- compare_var_to_value VAR_0x8005, 0
+ compare VAR_0x8005, 0
goto_if eq, EventScript_171782
goto EventScript_1716F4
end
@@ -69,7 +69,7 @@ EventScript_1716F4:: @ 81716F4
msgbox gUnknown_81A2CE1
special DisplayMoveTutorMenu
waitstate
- compare_var_to_value VAR_0x8004, 0
+ compare VAR_0x8004, 0
goto_if eq, EventScript_1716BE
checkflag FLAG_TEMP_4
goto_if TRUE, EventScript_17175B