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
@@ -3,10 +3,8 @@ FiveIsland_MemorialPillar_MapScripts:: @ 81689D2
FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3
lock
checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR
goto_if TRUE, EventScript_168A18
checkflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR
goto_if TRUE, EventScript_168A22
goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, EventScript_168A18
goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, EventScript_168A22
msgbox gUnknown_818B02E
closemessage
applymovement 1, Movement_FacePlayer
@@ -28,7 +26,7 @@ EventScript_168A22:: @ 8168A22
msgbox gUnknown_818B282
giveitem ITEM_TM42
compare VAR_RESULT, 0
goto_if eq, EventScript_168AFE
goto_if_eq EventScript_168AFE
call EventScript_168AE8
release
end
@@ -36,24 +34,22 @@ EventScript_168A22:: @ 8168A22
FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lockall
checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR
goto_if TRUE, EventScript_168B0B
checkflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR
goto_if TRUE, EventScript_168B0B
goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, EventScript_168B0B
goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, EventScript_168B0B
msgbox gUnknown_818B095
checkitem ITEM_LEMONADE, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_168A86
goto_if_eq EventScript_168A86
releaseall
end
EventScript_168A86:: @ 8168A86
msgbox gUnknown_818B105, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_168A9B
goto_if_eq EventScript_168A9B
releaseall
end
@@ -70,7 +66,7 @@ EventScript_168A9B:: @ 8168A9B
msgbox gUnknown_818B171
giveitem ITEM_TM42
compare VAR_RESULT, 0
goto_if eq, EventScript_168AFE
goto_if_eq EventScript_168AFE
call EventScript_168AE8
releaseall
end