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/JaggedPass/scripts.inc
View File

@@ -8,14 +8,12 @@ JaggedPass_MapScripts::
JaggedPass_OnResume:
setstepcallback STEP_CB_ASH
compare VAR_JAGGED_PASS_STATE, 0
call_if_eq JaggedPass_EventScript_CheckHasMagmaEmblem
call_if_eq VAR_JAGGED_PASS_STATE, 0, JaggedPass_EventScript_CheckHasMagmaEmblem
end
JaggedPass_EventScript_CheckHasMagmaEmblem::
checkitem ITEM_MAGMA_EMBLEM
compare VAR_RESULT, TRUE
goto_if_eq JaggedPass_EventScript_SetReadyToOpenHideout
goto_if_eq VAR_RESULT, TRUE, JaggedPass_EventScript_SetReadyToOpenHideout
return
JaggedPass_EventScript_SetReadyToOpenHideout::
@@ -23,8 +21,7 @@ JaggedPass_EventScript_SetReadyToOpenHideout::
return
JaggedPass_OnTransition:
compare VAR_JAGGED_PASS_ASH_WEATHER, 1
call_if_eq JaggedPass_EventScript_SetWeatherAsh
call_if_eq VAR_JAGGED_PASS_ASH_WEATHER, 1, JaggedPass_EventScript_SetWeatherAsh
end
JaggedPass_EventScript_SetWeatherAsh::
@@ -33,8 +30,7 @@ JaggedPass_EventScript_SetWeatherAsh::
return
JaggedPass_OnLoad:
compare VAR_JAGGED_PASS_STATE, 1
goto_if_le JaggedPass_EventScript_ConcealHideoutEntrance
goto_if_le VAR_JAGGED_PASS_STATE, 1, JaggedPass_EventScript_ConcealHideoutEntrance
end
JaggedPass_EventScript_ConcealHideoutEntrance::
@@ -106,8 +102,7 @@ JaggedPass_EventScript_Eric::
JaggedPass_EventScript_Diana::
trainerbattle_single TRAINER_DIANA_1, JaggedPass_Text_DianaIntro, JaggedPass_Text_DianaDefeat, JaggedPass_EventScript_RegisterDiana
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq JaggedPass_EventScript_DianaRematch
goto_if_eq VAR_RESULT, TRUE, JaggedPass_EventScript_DianaRematch
msgbox JaggedPass_Text_DianaPostBattle, MSGBOX_DEFAULT
release
end
@@ -127,8 +122,7 @@ JaggedPass_EventScript_DianaRematch::
JaggedPass_EventScript_Ethan::
trainerbattle_single TRAINER_ETHAN_1, JaggedPass_Text_EthanIntro, JaggedPass_Text_EthanDefeat, JaggedPass_EventScript_RegisterEthan
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq JaggedPass_EventScript_EthanRematch
goto_if_eq VAR_RESULT, TRUE, JaggedPass_EventScript_EthanRematch
msgbox JaggedPass_Text_EthanPostBattle, MSGBOX_DEFAULT
release
end