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

42
data/maps/NewMauville_Inside/scripts.inc
View File

@@ -5,17 +5,14 @@ NewMauville_Inside_MapScripts::
.byte 0
NewMauville_Inside_OnResume:
compare VAR_TEMP_1, 1
call_if_eq NewMauville_Inside_EventScript_SetBarrierStateBlueButton
compare VAR_TEMP_2, 1
call_if_eq NewMauville_Inside_EventScript_SetBarrierStateGreenButton
call_if_eq VAR_TEMP_1, 1, NewMauville_Inside_EventScript_SetBarrierStateBlueButton
call_if_eq VAR_TEMP_2, 1, NewMauville_Inside_EventScript_SetBarrierStateGreenButton
call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NewMauville_Inside_EventScript_TryRemoveVoltorb
end
NewMauville_Inside_EventScript_TryRemoveVoltorb::
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
@@ -40,8 +37,7 @@ NewMauville_Inside_EventScript_ShowVoltorb3::
return
NewMauville_Inside_OnLoad:
compare VAR_NEW_MAUVILLE_STATE, 2
call_if_eq NewMauville_Inside_EventScript_SetGeneratorOffMetatiles
call_if_eq VAR_NEW_MAUVILLE_STATE, 2, NewMauville_Inside_EventScript_SetGeneratorOffMetatiles
end
NewMauville_Inside_EventScript_BlueButton::
@@ -167,8 +163,7 @@ NewMauville_Inside_EventScript_SetGeneratorOffMetatiles::
NewMauville_Inside_EventScript_Generator::
lockall
compare VAR_NEW_MAUVILLE_STATE, 2
goto_if_eq NewMauville_Inside_EventScript_GeneratorOff
goto_if_eq VAR_NEW_MAUVILLE_STATE, 2, NewMauville_Inside_EventScript_GeneratorOff
msgbox NewMauville_Inside_Text_GeneratorRadiatingHeat, MSGBOX_DEFAULT
releaseall
end
@@ -190,12 +185,9 @@ NewMauville_Inside_EventScript_Voltorb1::
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb1
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb1
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb1
goto_if_eq VAR_RESULT, B_OUTCOME_WON, NewMauville_Inside_EventScript_DefeatedVoltorb1
goto_if_eq VAR_RESULT, B_OUTCOME_RAN, NewMauville_Inside_EventScript_DefeatedVoltorb1
goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, NewMauville_Inside_EventScript_DefeatedVoltorb1
setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE
release
end
@@ -217,12 +209,9 @@ NewMauville_Inside_EventScript_Voltorb2::
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb2
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb2
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb2
goto_if_eq VAR_RESULT, B_OUTCOME_WON, NewMauville_Inside_EventScript_DefeatedVoltorb2
goto_if_eq VAR_RESULT, B_OUTCOME_RAN, NewMauville_Inside_EventScript_DefeatedVoltorb2
goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, NewMauville_Inside_EventScript_DefeatedVoltorb2
setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE
release
end
@@ -244,12 +233,9 @@ NewMauville_Inside_EventScript_Voltorb3::
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb3
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb3
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb3
goto_if_eq VAR_RESULT, B_OUTCOME_WON, NewMauville_Inside_EventScript_DefeatedVoltorb3
goto_if_eq VAR_RESULT, B_OUTCOME_RAN, NewMauville_Inside_EventScript_DefeatedVoltorb3
goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, NewMauville_Inside_EventScript_DefeatedVoltorb3
setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE
release
end