diff options
Diffstat (limited to 'data/maps/AquaHideout_B1F/scripts.inc')
| -rw-r--r-- | data/maps/AquaHideout_B1F/scripts.inc | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 9c660d8b1..6a388e625 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -4,22 +4,19 @@ AquaHideout_B1F_MapScripts:: @ 82339A7 .byte 0 AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, AquaHideout_B1F_EventScript_2339BC + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_2339BC end AquaHideout_B1F_EventScript_2339BC:: @ 82339BC specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, AquaHideout_B1F_EventScript_27374E + goto_if_ne AquaHideout_B1F_EventScript_27374E removeobject VAR_LAST_TALKED return AquaHideout_B1F_MapScript1_2339D0: @ 82339D0 - checkflag FLAG_0x1C4 - call_if 0, AquaHideout_B1F_EventScript_2339E3 - checkflag FLAG_0x1C5 - call_if 0, AquaHideout_B1F_EventScript_2339E7 + call_if_unset FLAG_0x1C4, AquaHideout_B1F_EventScript_2339E3 + call_if_unset FLAG_0x1C5, AquaHideout_B1F_EventScript_2339E7 end AquaHideout_B1F_EventScript_2339E3:: @ 82339E3 @@ -43,11 +40,11 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq AquaHideout_B1F_EventScript_233A2F + goto_if_eq AquaHideout_B1F_EventScript_233A2F compare VAR_RESULT, 4 - goto_eq AquaHideout_B1F_EventScript_233A2F + goto_if_eq AquaHideout_B1F_EventScript_233A2F compare VAR_RESULT, 5 - goto_eq AquaHideout_B1F_EventScript_233A2F + goto_if_eq AquaHideout_B1F_EventScript_233A2F setflag FLAG_0x1C4 release end @@ -70,11 +67,11 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq AquaHideout_B1F_EventScript_233A7C + goto_if_eq AquaHideout_B1F_EventScript_233A7C compare VAR_RESULT, 4 - goto_eq AquaHideout_B1F_EventScript_233A7C + goto_if_eq AquaHideout_B1F_EventScript_233A7C compare VAR_RESULT, 5 - goto_eq AquaHideout_B1F_EventScript_233A7C + goto_if_eq AquaHideout_B1F_EventScript_233A7C setflag FLAG_0x1C5 release end |