From efaea2a3ab10523ed1b299d5363922667c809381 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 6 Dec 2019 02:27:58 -0500 Subject: [PATCH] Revert WEATHER_CLOUDY to WEATHER_SHADE --- data/maps/AbandonedShip_CaptainsOffice/map.json | 2 +- data/maps/AbandonedShip_Corridors_1F/map.json | 2 +- data/maps/AbandonedShip_Corridors_B1F/map.json | 2 +- data/maps/AbandonedShip_HiddenFloorCorridors/map.json | 2 +- data/maps/AbandonedShip_HiddenFloorRooms/map.json | 2 +- data/maps/AbandonedShip_Room_B1F/map.json | 2 +- data/maps/AbandonedShip_Rooms2_1F/map.json | 2 +- data/maps/AbandonedShip_Rooms2_B1F/map.json | 2 +- data/maps/AbandonedShip_Rooms_1F/map.json | 2 +- data/maps/AbandonedShip_Rooms_B1F/map.json | 2 +- data/maps/FarawayIsland_Interior/map.json | 2 +- data/maps/NavelRock_Top/map.json | 2 +- data/maps/PetalburgWoods/map.json | 2 +- data/maps/SouthernIsland_Interior/map.json | 2 +- include/constants/weather.h | 4 ++-- src/coord_event_weather.c | 8 ++++---- src/field_weather.c | 6 +++--- src/field_weather_effect.c | 2 +- 18 files changed, 24 insertions(+), 24 deletions(-) diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json index a23f0d3ba..804fd0afc 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.json +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -5,7 +5,7 @@ "music": "MUS_DAN02", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", "allow_bike": true, "allow_escape_rope": true, diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index 3cd708c73..b75fcf3ac 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -5,7 +5,7 @@ "music": "MUS_DAN02", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", "allow_bike": true, "allow_escape_rope": true, diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json index 306f3e93e..04868ad92 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -5,7 +5,7 @@ "music": "MUS_DAN02", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", "allow_bike": true, "allow_escape_rope": true, diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json index 8126d870c..81e19fd1f 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json @@ -5,7 +5,7 @@ "music": "MUS_DAN02", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", "allow_bike": true, "allow_escape_rope": true, diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index 41df80d84..f937eb649 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -5,7 +5,7 @@ "music": "MUS_DAN02", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", "allow_bike": true, "allow_escape_rope": true, diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json index 820730ad7..b8e2a71da 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.json +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -5,7 +5,7 @@ "music": "MUS_DAN02", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", "allow_bike": true, "allow_escape_rope": true, diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json index 880308a74..6f39d4827 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -5,7 +5,7 @@ "music": "MUS_DAN02", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", "allow_bike": true, "allow_escape_rope": true, diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json index f73134689..672d2c54e 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -5,7 +5,7 @@ "music": "MUS_DAN02", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", "allow_bike": true, "allow_escape_rope": true, diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json index db661a47a..28feaf940 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -5,7 +5,7 @@ "music": "MUS_DAN02", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", "allow_bike": true, "allow_escape_rope": true, diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json index 3dfc92b5e..0af0a05ac 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -5,7 +5,7 @@ "music": "MUS_DAN02", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", "allow_bike": true, "allow_escape_rope": true, diff --git a/data/maps/FarawayIsland_Interior/map.json b/data/maps/FarawayIsland_Interior/map.json index 6281d908b..4998380e1 100644 --- a/data/maps/FarawayIsland_Interior/map.json +++ b/data/maps/FarawayIsland_Interior/map.json @@ -5,7 +5,7 @@ "music": "MUS_DAN02", "region_map_section": "MAPSEC_FARAWAY_ISLAND", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_INDOOR", "allow_bike": true, "allow_escape_rope": false, diff --git a/data/maps/NavelRock_Top/map.json b/data/maps/NavelRock_Top/map.json index 5356e47c9..c906c4ceb 100644 --- a/data/maps/NavelRock_Top/map.json +++ b/data/maps/NavelRock_Top/map.json @@ -5,7 +5,7 @@ "music": "MUS_RG_NANADUNGEON", "region_map_section": "MAPSEC_NAVEL_ROCK2", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", "allow_bike": false, "allow_escape_rope": false, diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index e9505ae3c..d43017f99 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -5,7 +5,7 @@ "music": "MUS_DAN01", "region_map_section": "MAPSEC_PETALBURG_WOODS", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_ROUTE", "allow_bike": true, "allow_escape_rope": false, diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json index 57a17bf7a..a647076ba 100644 --- a/data/maps/SouthernIsland_Interior/map.json +++ b/data/maps/SouthernIsland_Interior/map.json @@ -5,7 +5,7 @@ "music": "MUS_DAN02", "region_map_section": "MAPSEC_SOUTHERN_ISLAND", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_ROUTE", "allow_bike": true, "allow_escape_rope": false, diff --git a/include/constants/weather.h b/include/constants/weather.h index a48b309ed..50f42836e 100644 --- a/include/constants/weather.h +++ b/include/constants/weather.h @@ -12,7 +12,7 @@ #define WEATHER_SANDSTORM 8 #define WEATHER_FOG_DIAGONAL 9 #define WEATHER_UNDERWATER 10 -#define WEATHER_CLOUDY 11 +#define WEATHER_SHADE 11 #define WEATHER_DROUGHT 12 #define WEATHER_DOWNPOUR 13 #define WEATHER_UNDERWATER_BUBBLES 14 @@ -32,7 +32,7 @@ #define COORD_EVENT_WEATHER_FOG_DIAGONAL 7 #define COORD_EVENT_WEATHER_VOLCANIC_ASH 8 #define COORD_EVENT_WEATHER_SANDSTORM 9 -#define COORD_EVENT_WEATHER_CLOUDY 10 +#define COORD_EVENT_WEATHER_SHADE 10 #define COORD_EVENT_WEATHER_DROUGHT 11 #define COORD_EVENT_WEATHER_ROUTE119_CYCLE 20 #define COORD_EVENT_WEATHER_ROUTE123_CYCLE 21 diff --git a/src/coord_event_weather.c b/src/coord_event_weather.c index 2c5dbe183..0f9181290 100644 --- a/src/coord_event_weather.c +++ b/src/coord_event_weather.c @@ -18,7 +18,7 @@ static void CoordEventWeather_HorizontalFog(void); static void CoordEventWeather_DiagonalFog(void); static void CoordEventWeather_Ash(void); static void CoordEventWeather_Sandstorm(void); -static void CoordEventWeather_Cloudy(void); +static void CoordEventWeather_Shade(void); static void CoordEventWeather_Drought(void); static void CoordEventWeather_Route119Cycle(void); static void CoordEventWeather_Route123Cycle(void); @@ -34,7 +34,7 @@ static const struct CoordEventWeather sCoordEventWeatherFuncs[] = { COORD_EVENT_WEATHER_FOG_DIAGONAL, CoordEventWeather_DiagonalFog }, { COORD_EVENT_WEATHER_VOLCANIC_ASH, CoordEventWeather_Ash }, { COORD_EVENT_WEATHER_SANDSTORM, CoordEventWeather_Sandstorm }, - { COORD_EVENT_WEATHER_CLOUDY, CoordEventWeather_Cloudy }, + { COORD_EVENT_WEATHER_SHADE, CoordEventWeather_Shade }, { COORD_EVENT_WEATHER_DROUGHT, CoordEventWeather_Drought }, { COORD_EVENT_WEATHER_ROUTE119_CYCLE, CoordEventWeather_Route119Cycle }, { COORD_EVENT_WEATHER_ROUTE123_CYCLE, CoordEventWeather_Route123Cycle }, @@ -85,9 +85,9 @@ static void CoordEventWeather_Sandstorm(void) SetWeather(WEATHER_SANDSTORM); } -static void CoordEventWeather_Cloudy(void) +static void CoordEventWeather_Shade(void) { - SetWeather(WEATHER_CLOUDY); + SetWeather(WEATHER_SHADE); } static void CoordEventWeather_Drought(void) diff --git a/src/field_weather.c b/src/field_weather.c index 7fe929bf3..352571dfc 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -375,7 +375,7 @@ static void FadeInScreenWithWeather(void) case WEATHER_RAIN_THUNDERSTORM: case WEATHER_DOWNPOUR: case WEATHER_SNOW: - case WEATHER_CLOUDY: + case WEATHER_SHADE: if (FadeInScreen_RainShowShade() == FALSE) { gWeatherPtr->gammaIndex = 3; @@ -768,7 +768,7 @@ void FadeScreen(u8 mode, s8 delay) case WEATHER_DOWNPOUR: case WEATHER_SNOW: case WEATHER_FOG_HORIZONTAL: - case WEATHER_CLOUDY: + case WEATHER_SHADE: case WEATHER_DROUGHT: useWeatherPal = TRUE; break; @@ -1022,7 +1022,7 @@ void sub_80AC274(u8 a) SetWeather(WEATHER_SANDSTORM); break; case 10: - SetWeather(WEATHER_CLOUDY); + SetWeather(WEATHER_SHADE); break; } } diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c index 540541406..bb4eccec2 100644 --- a/src/field_weather_effect.c +++ b/src/field_weather_effect.c @@ -2558,7 +2558,7 @@ static u8 TranslateWeatherNum(u8 weather) case WEATHER_SANDSTORM: return WEATHER_SANDSTORM; case WEATHER_FOG_DIAGONAL: return WEATHER_FOG_DIAGONAL; case WEATHER_UNDERWATER: return WEATHER_UNDERWATER; - case WEATHER_CLOUDY: return WEATHER_CLOUDY; + case WEATHER_SHADE: return WEATHER_SHADE; case WEATHER_DROUGHT: return WEATHER_DROUGHT; case WEATHER_DOWNPOUR: return WEATHER_DOWNPOUR; case WEATHER_UNDERWATER_BUBBLES: return WEATHER_UNDERWATER_BUBBLES;