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

21
data/maps/AquaHideout_B1F/scripts.inc
View File

@@ -9,8 +9,7 @@ AquaHideout_B1F_OnResume:
AquaHideout_B1F_EventScript_TryRemoveElectrode::
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
@@ -39,12 +38,9 @@ AquaHideout_B1F_EventScript_Electrode1::
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode1
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode1
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode1
goto_if_eq VAR_RESULT, B_OUTCOME_WON, AquaHideout_B1F_EventScript_DefeatedElectrode1
goto_if_eq VAR_RESULT, B_OUTCOME_RAN, AquaHideout_B1F_EventScript_DefeatedElectrode1
goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, AquaHideout_B1F_EventScript_DefeatedElectrode1
setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT
release
end
@@ -66,12 +62,9 @@ AquaHideout_B1F_EventScript_Electrode2::
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode2
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode2
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode2
goto_if_eq VAR_RESULT, B_OUTCOME_WON, AquaHideout_B1F_EventScript_DefeatedElectrode2
goto_if_eq VAR_RESULT, B_OUTCOME_RAN, AquaHideout_B1F_EventScript_DefeatedElectrode2
goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, AquaHideout_B1F_EventScript_DefeatedElectrode2
setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT
release
end