diff options
Diffstat (limited to 'data/maps/NavelRock_Top/scripts.inc')
| -rw-r--r-- | data/maps/NavelRock_Top/scripts.inc | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index f2b107947..61b046daf 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -4,10 +4,8 @@ NavelRock_Top_MapScripts:: @ 8269113 .byte 0 NavelRock_Top_MapScript1_26911E: @ 826911E - checkflag FLAG_0x092 - call_if 1, NavelRock_Top_EventScript_269131 - checkflag FLAG_0x092 - call_if 0, NavelRock_Top_EventScript_26913A + call_if_set FLAG_0x092, NavelRock_Top_EventScript_269131 + call_if_unset FLAG_0x092, NavelRock_Top_EventScript_26913A end NavelRock_Top_EventScript_269131:: @ 8269131 @@ -17,21 +15,19 @@ NavelRock_Top_EventScript_269131:: @ 8269131 NavelRock_Top_EventScript_26913A:: @ 826913A setvar VAR_TEMP_1, 1 - checkflag FLAG_0x1DC - goto_eq NavelRock_Top_EventScript_27374E + goto_if_set FLAG_0x1DC, NavelRock_Top_EventScript_27374E setvar VAR_TEMP_1, 0 clearflag FLAG_HIDE_HOOH return NavelRock_Top_MapScript1_269151: @ 8269151 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, NavelRock_Top_EventScript_26915B + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NavelRock_Top_EventScript_26915B end NavelRock_Top_EventScript_26915B:: @ 826915B specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, NavelRock_Top_EventScript_27374E + goto_if_ne NavelRock_Top_EventScript_27374E removeobject 1 return @@ -71,11 +67,11 @@ NavelRock_Top_EventScript_26916F:: @ 826916F setvar VAR_LAST_TALKED, 1 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq NavelRock_Top_EventScript_269217 + goto_if_eq NavelRock_Top_EventScript_269217 compare VAR_RESULT, 4 - goto_eq NavelRock_Top_EventScript_269225 + goto_if_eq NavelRock_Top_EventScript_269225 compare VAR_RESULT, 5 - goto_eq NavelRock_Top_EventScript_269225 + goto_if_eq NavelRock_Top_EventScript_269225 setflag FLAG_0x092 releaseall end |