dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat compare + goto_if/call_if to single statements

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

18
data/maps/SkyPillar_Top/scripts.inc
View File

@@ -12,16 +12,13 @@ SkyPillar_Top_OnResume:
SkyPillar_Top_EventScript_TryRemoveRayquaza::
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
SkyPillar_Top_OnTransition:
compare VAR_SKY_PILLAR_STATE, 2
call_if_lt SkyPillar_Top_EventScript_SetCleanLayout
compare VAR_SKY_PILLAR_STATE, 2
call_if_ge SkyPillar_Top_EventScript_TryShowRayquaza
call_if_lt VAR_SKY_PILLAR_STATE, 2, SkyPillar_Top_EventScript_SetCleanLayout
call_if_ge VAR_SKY_PILLAR_STATE, 2, SkyPillar_Top_EventScript_TryShowRayquaza
end
SkyPillar_Top_EventScript_SetCleanLayout::
@@ -57,12 +54,9 @@ SkyPillar_Top_EventScript_Rayquaza::
waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq SkyPillar_Top_EventScript_DefeatedRayquaza
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq SkyPillar_Top_EventScript_RanFromRayquaza
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq SkyPillar_Top_EventScript_RanFromRayquaza
goto_if_eq VAR_RESULT, B_OUTCOME_WON, SkyPillar_Top_EventScript_DefeatedRayquaza
goto_if_eq VAR_RESULT, B_OUTCOME_RAN, SkyPillar_Top_EventScript_RanFromRayquaza
goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, SkyPillar_Top_EventScript_RanFromRayquaza
setflag FLAG_DEFEATED_RAYQUAZA
releaseall
end