dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into ObjEvent rename

Browse Source
This commit is contained in:
GriffinR
2019-12-06 21:37:17 -05:00
parent 1b30f0c973 47ea65b96e
commit b93101bbeb
167 changed files with 3292 additions and 1686 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/Route130/scripts.inc
+3 -3
View File
@@ -4,7 +4,7 @@ Route130_MapScripts:: @ 81F735F
Route130_OnTransition: @ 81F7365
compare VAR_SOOTOPOLIS_CITY_STATE, 4
call_if_ge Route130_EventScript_CheckSetAlternatingWeather
call_if_ge Route130_EventScript_CheckSetAbnormalWeather
specialvar VAR_RESULT, IsMirageIslandPresent
compare VAR_RESULT, TRUE
goto_if_eq Route130_EventScript_SetMirageIslandLayout
@@ -30,8 +30,8 @@ Route130_EventScript_SetMirageIslandLayout:: @ 81F73B1
setmaplayoutindex LAYOUT_ROUTE130_MIRAGE_ISLAND
end
Route130_EventScript_CheckSetAlternatingWeather:: @ 81F73B5
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
Route130_EventScript_CheckSetAbnormalWeather:: @ 81F73B5
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
return
Route130_EventScript_Rodney:: @ 81F73BF