summaryrefslogtreecommitdiff
path: root/data/maps/TerraCave_End
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-11-18 23:06:30 -0500
committerGriffinR <griffin.g.richards@gmail.com>2021-11-18 23:06:51 -0500
commite66ea0cb996c70093fe3f250cafb7f1f87e84d4d (patch)
tree162e07afa059e7683e4aa991a1a82205c16b3025 /data/maps/TerraCave_End
parentc57efdba5d3cc475f75c5909c31f96bbce6190b8 (diff)
Reformat compare + goto_if/call_if to single statements
Diffstat (limited to 'data/maps/TerraCave_End')
-rw-r--r--data/maps/TerraCave_End/scripts.inc12
1 files changed, 4 insertions, 8 deletions
diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc
index 0036f33b5..5f0051bec 100644
--- a/data/maps/TerraCave_End/scripts.inc
+++ b/data/maps/TerraCave_End/scripts.inc
@@ -11,8 +11,7 @@ TerraCave_End_OnResume:
TerraCave_End_EventScript_TryRemoveGroudon::
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 LOCALID_GROUDON
return
@@ -43,12 +42,9 @@ TerraCave_End_EventScript_Groudon::
clearflag FLAG_SYS_CTRL_OBJ_DELETE
setvar VAR_TEMP_1, 0
specialvar VAR_RESULT, GetBattleOutcome
- compare VAR_RESULT, B_OUTCOME_WON
- goto_if_eq TerraCave_End_EventScript_DefeatedGroudon
- compare VAR_RESULT, B_OUTCOME_RAN
- goto_if_eq TerraCave_End_EventScript_RanFromGroudon
- compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
- goto_if_eq TerraCave_End_EventScript_RanFromGroudon
+ goto_if_eq VAR_RESULT, B_OUTCOME_WON, TerraCave_End_EventScript_DefeatedGroudon
+ goto_if_eq VAR_RESULT, B_OUTCOME_RAN, TerraCave_End_EventScript_RanFromGroudon
+ goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, TerraCave_End_EventScript_RanFromGroudon
setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 1
setflag FLAG_DEFEATED_GROUDON
releaseall