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

18
data/maps/Route125/scripts.inc
View File

@@ -6,19 +6,14 @@ Route125_MapScripts::
Route125_OnTransition:
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_WEST
call_if_eq AbnormalWeather_StartKyogreWeather
compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_EAST
call_if_eq AbnormalWeather_StartKyogreWeather
call_if_eq VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_HideMapNamePopup
call_if_eq VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_WEST, AbnormalWeather_StartKyogreWeather
call_if_eq VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_EAST, AbnormalWeather_StartKyogreWeather
end
Route125_OnLoad:
compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_WEST
call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute125West
compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_EAST
call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute125East
call_if_eq VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_WEST, AbnormalWeather_EventScript_PlaceTilesRoute125West
call_if_eq VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_EAST, AbnormalWeather_EventScript_PlaceTilesRoute125East
end
Route125_OnFrame:
@@ -48,8 +43,7 @@ Route125_EventScript_Sharon::
Route125_EventScript_Ernest::
trainerbattle_single TRAINER_ERNEST_1, Route125_Text_ErnestIntro, Route125_Text_ErnestDefeat, Route125_EventScript_RegisterErnest
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route125_EventScript_RematchErnest
goto_if_eq VAR_RESULT, TRUE, Route125_EventScript_RematchErnest
msgbox Route125_Text_ErnestPostBattle, MSGBOX_DEFAULT
release
end