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

60
data/maps/Route119/scripts.inc
View File

@@ -13,16 +13,14 @@ Route119_OnResume:
Route119_EventScript_TryRemoveKecleon::
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
Route119_OnTransition:
call Common_EventScript_SetupRivalGfxId
call Common_EventScript_SetupRivalOnBikeGfxId
compare VAR_WEATHER_INSTITUTE_STATE, 1
call_if_eq Route119_EventScript_MoveInstituteWorkersDownstairs
call_if_eq VAR_WEATHER_INSTITUTE_STATE, 1, Route119_EventScript_MoveInstituteWorkersDownstairs
special SetRoute119Weather
end
@@ -46,30 +44,22 @@ Route119_EventScript_RivalEncounter::
lockall
addobject LOCALID_RIVAL_ON_BIKE
checkplayergender
compare VAR_RESULT, MALE
call_if_eq Route119_EventScript_PlayMayMusic
compare VAR_RESULT, FEMALE
call_if_eq Route119_EventScript_PlayBrendanMusic
call_if_eq VAR_RESULT, MALE, Route119_EventScript_PlayMayMusic
call_if_eq VAR_RESULT, FEMALE, Route119_EventScript_PlayBrendanMusic
delay 65
compare VAR_TEMP_1, 1
call_if_eq Route119_EventScript_RivalEnter1
compare VAR_TEMP_1, 2
call_if_eq Route119_EventScript_RivalEnter2
call_if_eq VAR_TEMP_1, 1, Route119_EventScript_RivalEnter1
call_if_eq VAR_TEMP_1, 2, Route119_EventScript_RivalEnter2
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
delay 30
compare VAR_TEMP_1, 1
call_if_eq Route119_EventScript_SetRivalPos1
compare VAR_TEMP_1, 2
call_if_eq Route119_EventScript_SetRivalPos2
call_if_eq VAR_TEMP_1, 1, Route119_EventScript_SetRivalPos1
call_if_eq VAR_TEMP_1, 2, Route119_EventScript_SetRivalPos2
removeobject LOCALID_RIVAL_ON_BIKE
addobject LOCALID_RIVAL
delay 30
checkplayergender
compare VAR_RESULT, MALE
goto_if_eq Route119_EventScript_BattleMay
compare VAR_RESULT, FEMALE
goto_if_eq Route119_EventScript_BattleBrendan
goto_if_eq VAR_RESULT, MALE, Route119_EventScript_BattleMay
goto_if_eq VAR_RESULT, FEMALE, Route119_EventScript_BattleBrendan
releaseall
end
@@ -148,36 +138,28 @@ Route119_EventScript_GiveFlyHM::
Route119_EventScript_RivalExitScottArrive::
closemessage
compare VAR_TEMP_1, 1
call_if_eq Route119_EventScript_SetRivalPos1
compare VAR_TEMP_1, 2
call_if_eq Route119_EventScript_SetRivalPos2
call_if_eq VAR_TEMP_1, 1, Route119_EventScript_SetRivalPos1
call_if_eq VAR_TEMP_1, 2, Route119_EventScript_SetRivalPos2
removeobject LOCALID_RIVAL
addobject LOCALID_RIVAL_ON_BIKE
delay 30
compare VAR_TEMP_1, 1
call_if_eq Route119_EventScript_RivalExit1
compare VAR_TEMP_1, 2
call_if_eq Route119_EventScript_RivalExit2
call_if_eq VAR_TEMP_1, 1, Route119_EventScript_RivalExit1
call_if_eq VAR_TEMP_1, 2, Route119_EventScript_RivalExit2
removeobject LOCALID_RIVAL_ON_BIKE
setvar VAR_ROUTE119_STATE, 1
savebgm MUS_DUMMY
fadedefaultbgm
delay 60
compare VAR_TEMP_1, 1
call_if_eq Route119_EventScript_SetScottPos1
compare VAR_TEMP_1, 2
call_if_eq Route119_EventScript_SetScottPos2
call_if_eq VAR_TEMP_1, 1, Route119_EventScript_SetScottPos1
call_if_eq VAR_TEMP_1, 2, Route119_EventScript_SetScottPos2
addobject LOCALID_SCOTT
applymovement LOCALID_SCOTT, Route119_Movement_ScottEnter
waitmovement 0
addvar VAR_SCOTT_STATE, 1
msgbox Route119_Text_ScottWayToGoBeSeeingYou, MSGBOX_DEFAULT
closemessage
compare VAR_TEMP_1, 1
call_if_eq Route119_EventScript_ScottExit1
compare VAR_TEMP_1, 2
call_if_eq Route119_EventScript_ScottExit2
call_if_eq VAR_TEMP_1, 1, Route119_EventScript_ScottExit1
call_if_eq VAR_TEMP_1, 2, Route119_EventScript_ScottExit2
removeobject LOCALID_SCOTT
releaseall
end
@@ -372,8 +354,7 @@ Route119_EventScript_Kent::
Route119_EventScript_Jackson::
trainerbattle_single TRAINER_JACKSON_1, Route119_Text_JacksonIntro, Route119_Text_JacksonDefeat, Route119_EventScript_RegisterJackson
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route119_EventScript_RematchJackson
goto_if_eq VAR_RESULT, TRUE, Route119_EventScript_RematchJackson
msgbox Route119_Text_JacksonPostBattle, MSGBOX_DEFAULT
release
end
@@ -394,8 +375,7 @@ Route119_EventScript_RematchJackson::
Route119_EventScript_Catherine::
trainerbattle_single TRAINER_CATHERINE_1, Route119_Text_CatherineIntro, Route119_Text_CatherineDefeat, Route119_EventScript_RegisterCatherine
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route119_EventScript_RematchCatherine
goto_if_eq VAR_RESULT, TRUE, Route119_EventScript_RematchCatherine
msgbox Route119_Text_CatherinePostBattle, MSGBOX_DEFAULT
release
end