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

Merge pull request #577 from Phlosioneer/weather-15

Browse Source 
Document the weather state functions
This commit is contained in:
huderlem
2019-02-25 08:03:22 -06:00
committed by GitHub
parent 84573f1774 1cd5cb09cf
commit b3a7a1278a
14 changed files with 97 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/event_scripts.s
View File

@@ -1906,7 +1906,7 @@ Common_EventScript_NoRoomLeftForAnother:: @ 8272071
return
Common_EventScript_SetWeather15:: @ 827207A
setweather WEATHER_15
setweather WEATHER_ALTERNATING
return
Common_EventScript_PlayGymBadgeFanfare:: @ 827207E
@@ -3174,14 +3174,14 @@ Route105_EventScript_273D17:: @ 8273D17
Route125_EventScript_273D17:: @ 8273D17
Route127_EventScript_273D17:: @ 8273D17
Route129_EventScript_273D17:: @ 8273D17
setweather 13
setweather WEATHER_RAIN_HEAVY
return
Route114_EventScript_273D1B:: @ 8273D1B
Route115_EventScript_273D1B:: @ 8273D1B
Route116_EventScript_273D1B:: @ 8273D1B
Route118_EventScript_273D1B:: @ 8273D1B
setweather 12
setweather WEATHER_DROUGHT
return
gUnknown_08273D1F:: @ 8273D1F
@@ -3196,7 +3196,7 @@ gUnknown_08273D1F:: @ 8273D1F
Route105_EventScript_273D31:: @ 8273D31
closemessage
fadescreenswapbuffers 1
setweather 2
setweather WEATHER_SUNNY
doweather
call Route105_EventScript_273D6D
special DrawWholeMapView

2
data/maps/SkyPillar_Outside/scripts.inc
View File

@@ -72,7 +72,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT
closemessage
setflag FLAG_SYS_WEATHER_CTRL
setweather WEATHER_15
setweather WEATHER_ALTERNATING
doweather
special WaitWeather
waitstate

4
data/maps/SootopolisCity/scripts.inc
View File

@@ -214,7 +214,7 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
special RemoveCameraObject
delay 60
fadescreenspeed 1, 8
setweather WEATHER_15
setweather WEATHER_ALTERNATING
doweather
setvar VAR_0x8004, 0
special sub_813B7D8
@@ -314,7 +314,7 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
special RemoveCameraObject
delay 60
fadescreenspeed 1, 8
setweather WEATHER_15
setweather WEATHER_ALTERNATING
doweather
setvar VAR_0x8004, 0
special sub_813B7D8

2
data/specials.inc
View File

@@ -503,7 +503,7 @@ gSpecials:: @ 81DBA64
def_special sub_813B374
def_special sub_813B490
def_special sub_80A08CC
def_special sub_813B484
def_special Unused_SetWeatherSunny
def_special sub_81AFDA0
def_special sub_813B4E0
def_special ShouldDoBrailleRegicePuzzle