Reformat compare + goto_if/call_if to single statements

This commit is contained in:
GriffinR
2021-11-18 23:06:30 -05:00
parent c57efdba5d
commit e66ea0cb99
293 changed files with 2990 additions and 5978 deletions
+6 -12
View File
@@ -2,10 +2,8 @@ EventScript_FieldPoison::
lockall
special TryFieldPoisonWhiteOut
waitstate
compare VAR_RESULT, FLDPSN_WHITEOUT
goto_if_eq EventScript_FieldWhiteOut
compare VAR_RESULT, FLDPSN_FRONTIER_WHITEOUT
goto_if_eq EventScript_FrontierFieldWhiteOut
goto_if_eq VAR_RESULT, FLDPSN_WHITEOUT, EventScript_FieldWhiteOut
goto_if_eq VAR_RESULT, FLDPSN_FRONTIER_WHITEOUT, EventScript_FrontierFieldWhiteOut
releaseall
end
@@ -30,16 +28,12 @@ EventScript_FrontierFieldWhiteOut::
waitmessage
waitbuttonpress
pike_inchallenge
compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattlePike_EventScript_Retire
goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattlePike_EventScript_Retire
pyramid_inchallenge
compare VAR_RESULT, 1 @ On Pyramid floor
goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
compare VAR_RESULT, 2 @ On Pyramid peak
goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
goto_if_eq VAR_RESULT, 1, BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost @ On Pyramid floor
goto_if_eq VAR_RESULT, 2, BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost @ On Pyramid peak
trainerhill_inchallenge
compare VAR_RESULT, TRUE
goto_if_eq TrainerHill_1F_EventScript_Lost
goto_if_eq VAR_RESULT, TRUE, TrainerHill_1F_EventScript_Lost
special Script_FadeOutMapMusic
waitstate
fadescreen FADE_TO_BLACK