diff options
| author | huderlem <huderlem@gmail.com> | 2019-02-25 08:03:22 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-25 08:03:22 -0600 |
| commit | b3a7a1278abea55a2b4982c0dfc42d04c7981ba9 (patch) | |
| tree | 6c0949b768afe69803f3675fe919bcce2d8e52f6 /data | |
| parent | 84573f1774a710160af23f28ca436f6166f233c2 (diff) | |
| parent | 1cd5cb09cfb434b2f688a5a6ec13e0a2d430a41a (diff) | |
Merge pull request #577 from Phlosioneer/weather-15
Document the weather state functions
Diffstat (limited to 'data')
| -rw-r--r-- | data/event_scripts.s | 8 | ||||
| -rw-r--r-- | data/maps/SkyPillar_Outside/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/SootopolisCity/scripts.inc | 4 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 1739b0812..55bbb7618 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -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 diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index 7b826d576..c68dc03e3 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -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 diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index a0ca1fb84..98c9af1ee 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -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 diff --git a/data/specials.inc b/data/specials.inc index cbbd81dc1..965bef117 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -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 |