summaryrefslogtreecommitdiff
path: root/data/maps/AncientTomb/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/AncientTomb/scripts.inc')
-rw-r--r--data/maps/AncientTomb/scripts.inc12
1 files changed, 4 insertions, 8 deletions
diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc
index 03070a731..d28ac7bc3 100644
--- a/data/maps/AncientTomb/scripts.inc
+++ b/data/maps/AncientTomb/scripts.inc
@@ -10,8 +10,7 @@ AncientTomb_OnResume:
AncientTomb_EventScript_TryRemoveRegisteel::
specialvar VAR_RESULT, GetBattleOutcome
- compare VAR_RESULT, B_OUTCOME_CAUGHT
- goto_if_ne Common_EventScript_NopReturn
+ goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return
@@ -68,12 +67,9 @@ AncientTomb_EventScript_Registeel::
waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
- compare VAR_RESULT, B_OUTCOME_WON
- goto_if_eq AncientTomb_EventScript_DefeatedRegisteel
- compare VAR_RESULT, B_OUTCOME_RAN
- goto_if_eq AncientTomb_EventScript_RanFromRegisteel
- compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
- goto_if_eq AncientTomb_EventScript_RanFromRegisteel
+ goto_if_eq VAR_RESULT, B_OUTCOME_WON, AncientTomb_EventScript_DefeatedRegisteel
+ goto_if_eq VAR_RESULT, B_OUTCOME_RAN, AncientTomb_EventScript_RanFromRegisteel
+ goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, AncientTomb_EventScript_RanFromRegisteel
setflag FLAG_DEFEATED_REGISTEEL
release
end