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

36
data/maps/Route118/scripts.inc
View File

@@ -8,19 +8,14 @@ Route118_MapScripts::
Route118_OnTransition:
call GabbyAndTy_EventScript_UpdateLocation
compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_EAST
call_if_eq AbnormalWeather_StartGroudonWeather
compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_WEST
call_if_eq AbnormalWeather_StartGroudonWeather
call_if_eq VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_HideMapNamePopup
call_if_eq VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_EAST, AbnormalWeather_StartGroudonWeather
call_if_eq VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_WEST, AbnormalWeather_StartGroudonWeather
end
Route118_OnLoad:
compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_EAST
call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute118East
compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_WEST
call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute118West
call_if_eq VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_EAST, AbnormalWeather_EventScript_PlaceTilesRoute118East
call_if_eq VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_WEST, AbnormalWeather_EventScript_PlaceTilesRoute118West
end
Route118_OnFrame:
@@ -32,10 +27,8 @@ Route118_EventScript_GoodRodFisherman::
faceplayer
goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_ReceivedGoodRod
msgbox Route118_Text_YouAgreeGoodRodIsGood, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq Route118_EventScript_ReceiveGoodRod
compare VAR_RESULT, NO
goto_if_eq Route118_EventScript_DeclineGoodRod
goto_if_eq VAR_RESULT, YES, Route118_EventScript_ReceiveGoodRod
goto_if_eq VAR_RESULT, NO, Route118_EventScript_DeclineGoodRod
end
Route118_EventScript_ReceiveGoodRod::
@@ -103,12 +96,9 @@ Route118_EventScript_StevenTrigger::
delay 30
msgbox Route118_Text_StevenQuestions, MSGBOX_DEFAULT
closemessage
compare VAR_0x8008, 0
call_if_eq Route118_EventScript_StevenExit0
compare VAR_0x8008, 1
call_if_eq Route118_EventScript_StevenExit1
compare VAR_0x8008, 2
call_if_eq Route118_EventScript_StevenExit2
call_if_eq VAR_0x8008, 0, Route118_EventScript_StevenExit0
call_if_eq VAR_0x8008, 1, Route118_EventScript_StevenExit1
call_if_eq VAR_0x8008, 2, Route118_EventScript_StevenExit2
setvar VAR_ROUTE118_STATE, 1
removeobject LOCALID_STEVEN
releaseall
@@ -190,8 +180,7 @@ Route118_Movement_StevenExit2:
Route118_EventScript_Rose::
trainerbattle_single TRAINER_ROSE_1, Route118_Text_RoseIntro, Route118_Text_RoseDefeat, Route118_EventScript_RegisterRose
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route118_EventScript_RematchRose
goto_if_eq VAR_RESULT, TRUE, Route118_EventScript_RematchRose
msgbox Route118_Text_RosePostBattle, MSGBOX_DEFAULT
release
end
@@ -222,8 +211,7 @@ Route118_EventScript_Wade::
Route118_EventScript_Dalton::
trainerbattle_single TRAINER_DALTON_1, Route118_Text_DaltonIntro, Route118_Text_DaltonDefeat, Route118_EventScript_RegisterDalton
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route118_EventScript_RematchDalton
goto_if_eq VAR_RESULT, TRUE, Route118_EventScript_RematchDalton
msgbox Route118_Text_DaltonPostBattle, MSGBOX_DEFAULT
release
end