summaryrefslogtreecommitdiff
path: root/data/maps/SSTidalCorridor
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/SSTidalCorridor
parentc57efdba5d3cc475f75c5909c31f96bbce6190b8 (diff)
Reformat compare + goto_if/call_if to single statements
Diffstat (limited to 'data/maps/SSTidalCorridor')
-rw-r--r--data/maps/SSTidalCorridor/scripts.inc18
1 files changed, 6 insertions, 12 deletions
diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc
index c99d3ad03..b39b9a433 100644
--- a/data/maps/SSTidalCorridor/scripts.inc
+++ b/data/maps/SSTidalCorridor/scripts.inc
@@ -45,10 +45,8 @@ SSTidalRooms_EventScript_ArrivedInLilycove::
return
SSTidalCorridor_EventScript_ReachedStepCount::
- compare VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
- goto_if_eq SSTidalCorridor_EventScript_HalfwayToLilycove
- compare VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT
- goto_if_eq SSTidalCorridor_EventScript_ArrivedInSlateport
+ goto_if_eq VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT, SSTidalCorridor_EventScript_HalfwayToLilycove
+ goto_if_eq VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT, SSTidalCorridor_EventScript_ArrivedInSlateport
end
SSTidalCorridor_EventScript_HalfwayToLilycove::
@@ -117,10 +115,8 @@ SSTidalCorridor_EventScript_Cabin4Sign::
SSTidalCorridor_EventScript_ExitSailor::
lock
faceplayer
- compare VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_LILYCOVE
- goto_if_eq SSTidalCorridor_EventScript_ExitLilycove
- compare VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT
- goto_if_eq SSTidalCorridor_EventScript_ExitSlateport
+ goto_if_eq VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_LILYCOVE, SSTidalCorridor_EventScript_ExitLilycove
+ goto_if_eq VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT, SSTidalCorridor_EventScript_ExitSlateport
msgbox SSTidalCorridor_Text_CanRestInCabin2, MSGBOX_DEFAULT
release
end
@@ -149,10 +145,8 @@ SSTidalCorridor_EventScript_HideSnatchGiver::
SSTidalCorridor_EventScript_Porthole::
lockall
- compare VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
- goto_if_eq SSTidalCorridor_EventScript_LookThroughPorthole
- compare VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT
- goto_if_eq SSTidalCorridor_EventScript_LookThroughPorthole
+ goto_if_eq VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT, SSTidalCorridor_EventScript_LookThroughPorthole
+ goto_if_eq VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT, SSTidalCorridor_EventScript_LookThroughPorthole
msgbox SSTidalCorridor_Text_HorizonSpreadsBeyondPorthole, MSGBOX_DEFAULT
releaseall
end