Sync event macros

This commit is contained in:
GriffinR
2020-01-10 00:44:57 -05:00
parent 94fbc3ac48
commit 4a6f15ba24
220 changed files with 3209 additions and 3580 deletions
+16 -24
View File
@@ -4,15 +4,14 @@ TwoIsland_House_MapScripts:: @ 8171618
TwoIsland_House_EventScript_171619:: @ 8171619
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
faceplayer
clearflag FLAG_TEMP_2
clearflag FLAG_TEMP_3
clearflag FLAG_TEMP_4
checkflag FLAG_TEMP_1
goto_if TRUE, EventScript_17164F
goto_if_set FLAG_TEMP_1, EventScript_17164F
msgbox gUnknown_81A2B88
setflag FLAG_TEMP_1
goto EventScript_17164F
@@ -21,33 +20,29 @@ TwoIsland_House_EventScript_171619:: @ 8171619
EventScript_17164F:: @ 817164F
checkitem ITEM_BIG_MUSHROOM, 1
compare VAR_RESULT, 1
call_if eq, EventScript_1717A8
call_if_eq EventScript_1717A8
checkitem ITEM_TINY_MUSHROOM, 2
compare VAR_RESULT, 1
call_if eq, EventScript_1717AC
checkflag FLAG_TEMP_2
goto_if TRUE, EventScript_171687
checkflag FLAG_TEMP_3
goto_if TRUE, EventScript_171696
call_if_eq EventScript_1717AC
goto_if_set FLAG_TEMP_2, EventScript_171687
goto_if_set FLAG_TEMP_3, EventScript_171696
goto EventScript_17179E
end
EventScript_171687:: @ 8171687
checkflag FLAG_TEMP_3
call_if TRUE, EventScript_1717B0
call_if_set FLAG_TEMP_3, EventScript_1717B0
goto EventScript_1716A5
end
EventScript_171696:: @ 8171696
checkflag FLAG_TEMP_2
call_if TRUE, EventScript_1717B0
call_if_set FLAG_TEMP_2, EventScript_1717B0
goto EventScript_1716A5
end
EventScript_1716A5:: @ 81716A5
msgbox gUnknown_81A2C63, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_17179E
goto_if_eq EventScript_17179E
goto EventScript_1716BE
end
@@ -56,12 +51,12 @@ EventScript_1716BE:: @ 81716BE
special SelectMoveTutorMon
waitstate
compare VAR_0x8004, 6
goto_if ge, EventScript_17179E
goto_if_ge EventScript_17179E
special IsSelectedMonEgg
compare VAR_RESULT, 1
goto_if eq, EventScript_171790
goto_if_eq EventScript_171790
compare VAR_0x8005, 0
goto_if eq, EventScript_171782
goto_if_eq EventScript_171782
goto EventScript_1716F4
end
@@ -70,13 +65,10 @@ EventScript_1716F4:: @ 81716F4
special DisplayMoveTutorMenu
waitstate
compare VAR_0x8004, 0
goto_if eq, EventScript_1716BE
checkflag FLAG_TEMP_4
goto_if TRUE, EventScript_17175B
checkflag FLAG_TEMP_2
goto_if TRUE, EventScript_171727
checkflag FLAG_TEMP_3
goto_if TRUE, EventScript_171741
goto_if_eq EventScript_1716BE
goto_if_set FLAG_TEMP_4, EventScript_17175B
goto_if_set FLAG_TEMP_2, EventScript_171727
goto_if_set FLAG_TEMP_3, EventScript_171741
end
EventScript_171727:: @ 8171727