summaryrefslogtreecommitdiff
path: root/data/maps/Route120
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route120')
-rw-r--r--data/maps/Route120/map.json32
-rw-r--r--data/maps/Route120/scripts.inc4
2 files changed, 18 insertions, 18 deletions
diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json
index 61e7d2892..01c267a94 100644
--- a/data/maps/Route120/map.json
+++ b/data/maps/Route120/map.json
@@ -620,63 +620,63 @@
"x": 7,
"y": 15,
"elevation": 0,
- "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT"
+ "weather": "COORD_EVENT_WEATHER_RAIN"
},
{
"type": "weather",
"x": 7,
"y": 16,
"elevation": 0,
- "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT"
+ "weather": "COORD_EVENT_WEATHER_RAIN"
},
{
"type": "weather",
"x": 22,
"y": 61,
"elevation": 3,
- "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT"
+ "weather": "COORD_EVENT_WEATHER_RAIN"
},
{
"type": "weather",
"x": 12,
"y": 64,
"elevation": 3,
- "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT"
+ "weather": "COORD_EVENT_WEATHER_RAIN"
},
{
"type": "weather",
"x": 35,
"y": 63,
"elevation": 3,
- "weather": "COORD_EVENT_WEATHER_CLOUDS"
+ "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
},
{
"type": "weather",
"x": 36,
"y": 63,
"elevation": 3,
- "weather": "COORD_EVENT_WEATHER_CLOUDS"
+ "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
},
{
"type": "weather",
"x": 37,
"y": 63,
"elevation": 3,
- "weather": "COORD_EVENT_WEATHER_CLOUDS"
+ "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
},
{
"type": "weather",
"x": 38,
"y": 63,
"elevation": 3,
- "weather": "COORD_EVENT_WEATHER_CLOUDS"
+ "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
},
{
"type": "weather",
"x": 32,
"y": 88,
"elevation": 5,
- "weather": "COORD_EVENT_WEATHER_CLOUDS"
+ "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
},
{
"type": "weather",
@@ -704,49 +704,49 @@
"x": 32,
"y": 89,
"elevation": 5,
- "weather": "COORD_EVENT_WEATHER_CLOUDS"
+ "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
},
{
"type": "weather",
"x": 32,
"y": 90,
"elevation": 5,
- "weather": "COORD_EVENT_WEATHER_CLOUDS"
+ "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
},
{
"type": "weather",
"x": 32,
"y": 91,
"elevation": 5,
- "weather": "COORD_EVENT_WEATHER_CLOUDS"
+ "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
},
{
"type": "weather",
"x": 10,
"y": 75,
"elevation": 3,
- "weather": "COORD_EVENT_WEATHER_CLOUDS"
+ "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
},
{
"type": "weather",
"x": 11,
"y": 75,
"elevation": 3,
- "weather": "COORD_EVENT_WEATHER_CLOUDS"
+ "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
},
{
"type": "weather",
"x": 12,
"y": 75,
"elevation": 3,
- "weather": "COORD_EVENT_WEATHER_CLOUDS"
+ "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
},
{
"type": "weather",
"x": 13,
"y": 75,
"elevation": 3,
- "weather": "COORD_EVENT_WEATHER_CLOUDS"
+ "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
}
],
"bg_events": [
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc
index f4ef4da87..a965ff060 100644
--- a/data/maps/Route120/scripts.inc
+++ b/data/maps/Route120/scripts.inc
@@ -76,7 +76,7 @@ Route120_EventScript_SetWeather:: @ 81F54D8
return
Route120_EventScript_SetCloudyWeather:: @ 81F54FF
- setweather WEATHER_CLOUDS
+ setweather WEATHER_SUNNY_CLOUDS
return
Route120_EventScript_SetSunnyWeather:: @ 81F5503
@@ -92,7 +92,7 @@ Route120_EventScript_TrySetRainyWeather:: @ 81F5507
end
Route120_EventScript_SetRainyWeather:: @ 81F5523
- setweather WEATHER_RAIN_LIGHT
+ setweather WEATHER_RAIN
return
Route120_EventScript_BerryBeauty:: @ 81F5527