diff options
Diffstat (limited to 'data/maps/SkyPillar_Top/scripts.inc')
| -rw-r--r-- | data/maps/SkyPillar_Top/scripts.inc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 2b734e5b0..1ac3cf486 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -5,22 +5,21 @@ SkyPillar_Top_MapScripts:: @ 82396B8 .byte 0 SkyPillar_Top_MapScript1_2396C8: @ 82396C8 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, SkyPillar_Top_EventScript_2396D2 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SkyPillar_Top_EventScript_2396D2 end SkyPillar_Top_EventScript_2396D2:: @ 82396D2 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, SkyPillar_Top_EventScript_27374E + goto_if_ne SkyPillar_Top_EventScript_27374E removeobject VAR_LAST_TALKED return SkyPillar_Top_MapScript1_2396E6: @ 82396E6 compare VAR_0x40CA, 2 - call_if 0, SkyPillar_Top_EventScript_2396FD + call_if_lt SkyPillar_Top_EventScript_2396FD compare VAR_0x40CA, 2 - call_if 4, SkyPillar_Top_EventScript_239705 + call_if_ge SkyPillar_Top_EventScript_239705 end SkyPillar_Top_EventScript_2396FD:: @ 82396FD @@ -29,8 +28,7 @@ SkyPillar_Top_EventScript_2396FD:: @ 82396FD return SkyPillar_Top_EventScript_239705:: @ 8239705 - checkflag FLAG_0x1C0 - call_if 0, SkyPillar_Top_EventScript_23970F + call_if_unset FLAG_0x1C0, SkyPillar_Top_EventScript_23970F return SkyPillar_Top_EventScript_23970F:: @ 823970F @@ -58,11 +56,11 @@ SkyPillar_Top_EventScript_239722:: @ 8239722 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq SkyPillar_Top_EventScript_239768 + goto_if_eq SkyPillar_Top_EventScript_239768 compare VAR_RESULT, 4 - goto_eq SkyPillar_Top_EventScript_239771 + goto_if_eq SkyPillar_Top_EventScript_239771 compare VAR_RESULT, 5 - goto_eq SkyPillar_Top_EventScript_239771 + goto_if_eq SkyPillar_Top_EventScript_239771 setflag FLAG_0x1C0 releaseall end |