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

24
data/maps/Route115/scripts.inc
View File

@@ -5,19 +5,14 @@ Route115_MapScripts::
.byte 0
Route115_OnLoad:
compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_WEST
call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute115West
compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_EAST
call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute115East
call_if_eq VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_WEST, AbnormalWeather_EventScript_PlaceTilesRoute115West
call_if_eq VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_EAST, AbnormalWeather_EventScript_PlaceTilesRoute115East
end
Route115_OnTransition:
compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_WEST
call_if_eq AbnormalWeather_StartGroudonWeather
compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_EAST
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_115_WEST, AbnormalWeather_StartGroudonWeather
call_if_eq VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_EAST, AbnormalWeather_StartGroudonWeather
end
Route115_OnFrame:
@@ -39,8 +34,7 @@ Route115_EventScript_MeteorFallsSign::
Route115_EventScript_Timothy::
trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_TimothyIntro, Route115_Text_TimothyDefeat, Route115_EventScript_RegisterTimothy
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route115_EventScript_RematchTimothy
goto_if_eq VAR_RESULT, TRUE, Route115_EventScript_RematchTimothy
msgbox Route115_Text_TimothyPostBattle, MSGBOX_DEFAULT
release
end
@@ -66,8 +60,7 @@ Route115_EventScript_Koichi::
Route115_EventScript_Nob::
trainerbattle_single TRAINER_NOB_1, Route115_Text_NobIntro, Route115_Text_NobDefeat, Route115_EventScript_RegisterNob
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route115_EventScript_RematchNob
goto_if_eq VAR_RESULT, TRUE, Route115_EventScript_RematchNob
msgbox Route115_Text_NobPostBattle, MSGBOX_DEFAULT
release
end
@@ -88,8 +81,7 @@ Route115_EventScript_RematchNob::
Route115_EventScript_Cyndy::
trainerbattle_single TRAINER_CYNDY_1, Route115_Text_CyndyIntro, Route115_Text_CyndyDefeat, Route115_EventScript_RegisterCyndy
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route115_EventScript_RematchCyndy
goto_if_eq VAR_RESULT, TRUE, Route115_EventScript_RematchCyndy
msgbox Route115_Text_CyndyPostBattle, MSGBOX_DEFAULT
release
end