improve call_if macros

This commit is contained in:
Melody
2018-12-21 21:32:45 -05:00
parent ac2e4adf2d
commit 55005f1588
175 changed files with 1245 additions and 1400 deletions
@@ -7,9 +7,9 @@ SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E
setvar VAR_0x8004, 16
special CallFrontierUtilFunc
compare VAR_RESULT, 0
call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D
call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D
compare VAR_0x40C0, 0
call_if 5, SootopolisCity_MysteryEventsHouse_1F_EventScript_227991
call_if_ne SootopolisCity_MysteryEventsHouse_1F_EventScript_227991
end
SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D
@@ -40,11 +40,11 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7
applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6
waitmovement 0
compare VAR_0x40C0, 1
call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04
call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04
compare VAR_0x40C0, 2
call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D
call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D
compare VAR_0x40C0, 3
call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16
call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16
special LoadPlayerParty
setvar VAR_0x40C0, 0
releaseall
@@ -110,11 +110,11 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, MSGBOX_DEFAULT
closemessage
compare VAR_FACING, 2
call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE
call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE
compare VAR_FACING, 4
call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10
call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10
compare VAR_FACING, 3
call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22
call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22
warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1
waitstate
release