ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 20:24:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert WEATHER_CLOUDY to WEATHER_SHADE

Browse Source
This commit is contained in:
GriffinR 2019-12-06 02:27:58 -05:00 committed by huderlem
parent a4191040c9
commit efaea2a3ab
18 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/AbandonedShip_CaptainsOffice/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,

2
data/maps/AbandonedShip_Corridors_1F/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,

2
data/maps/AbandonedShip_Corridors_B1F/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,

2
data/maps/AbandonedShip_HiddenFloorCorridors/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,

2
data/maps/AbandonedShip_HiddenFloorRooms/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,

2
data/maps/AbandonedShip_Room_B1F/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,

2
data/maps/AbandonedShip_Rooms2_1F/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,

2
data/maps/AbandonedShip_Rooms2_B1F/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,

2
data/maps/AbandonedShip_Rooms_1F/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,

2
data/maps/AbandonedShip_Rooms_B1F/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,

2
data/maps/FarawayIsland_Interior/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_FARAWAY_ISLAND", "region_map_section": "MAPSEC_FARAWAY_ISLAND",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_INDOOR", "map_type": "MAP_TYPE_INDOOR",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,

2
data/maps/NavelRock_Top/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_RG_NANADUNGEON", "music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2", "region_map_section": "MAPSEC_NAVEL_ROCK2",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": false, "allow_bike": false,
"allow_escape_rope": false, "allow_escape_rope": false,

2
data/maps/PetalburgWoods/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_DAN01", "music": "MUS_DAN01",
"region_map_section": "MAPSEC_PETALBURG_WOODS", "region_map_section": "MAPSEC_PETALBURG_WOODS",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_ROUTE", "map_type": "MAP_TYPE_ROUTE",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,

2
data/maps/SouthernIsland_Interior/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_SOUTHERN_ISLAND", "region_map_section": "MAPSEC_SOUTHERN_ISLAND",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_ROUTE", "map_type": "MAP_TYPE_ROUTE",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,

4
include/constants/weather.h
View File

@ -12,7 +12,7 @@
#define WEATHER_SANDSTORM 8 #define WEATHER_SANDSTORM 8
#define WEATHER_FOG_DIAGONAL 9 #define WEATHER_FOG_DIAGONAL 9
#define WEATHER_UNDERWATER 10 #define WEATHER_UNDERWATER 10
#define WEATHER_CLOUDY 11 #define WEATHER_SHADE 11
#define WEATHER_DROUGHT 12 #define WEATHER_DROUGHT 12
#define WEATHER_DOWNPOUR 13 #define WEATHER_DOWNPOUR 13
#define WEATHER_UNDERWATER_BUBBLES 14 #define WEATHER_UNDERWATER_BUBBLES 14
@ -32,7 +32,7 @@
#define COORD_EVENT_WEATHER_FOG_DIAGONAL 7 #define COORD_EVENT_WEATHER_FOG_DIAGONAL 7
#define COORD_EVENT_WEATHER_VOLCANIC_ASH 8 #define COORD_EVENT_WEATHER_VOLCANIC_ASH 8
#define COORD_EVENT_WEATHER_SANDSTORM 9 #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_DROUGHT 11
#define COORD_EVENT_WEATHER_ROUTE119_CYCLE 20 #define COORD_EVENT_WEATHER_ROUTE119_CYCLE 20
#define COORD_EVENT_WEATHER_ROUTE123_CYCLE 21 #define COORD_EVENT_WEATHER_ROUTE123_CYCLE 21

8
src/coord_event_weather.c
View File

@ -18,7 +18,7 @@ static void CoordEventWeather_HorizontalFog(void);
static void CoordEventWeather_DiagonalFog(void); static void CoordEventWeather_DiagonalFog(void);
static void CoordEventWeather_Ash(void); static void CoordEventWeather_Ash(void);
static void CoordEventWeather_Sandstorm(void); static void CoordEventWeather_Sandstorm(void);
static void CoordEventWeather_Cloudy(void); static void CoordEventWeather_Shade(void);
static void CoordEventWeather_Drought(void); static void CoordEventWeather_Drought(void);
static void CoordEventWeather_Route119Cycle(void); static void CoordEventWeather_Route119Cycle(void);
static void CoordEventWeather_Route123Cycle(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_FOG_DIAGONAL, CoordEventWeather_DiagonalFog },
{ COORD_EVENT_WEATHER_VOLCANIC_ASH, CoordEventWeather_Ash }, { COORD_EVENT_WEATHER_VOLCANIC_ASH, CoordEventWeather_Ash },
{ COORD_EVENT_WEATHER_SANDSTORM, CoordEventWeather_Sandstorm }, { 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_DROUGHT, CoordEventWeather_Drought },
{ COORD_EVENT_WEATHER_ROUTE119_CYCLE, CoordEventWeather_Route119Cycle }, { COORD_EVENT_WEATHER_ROUTE119_CYCLE, CoordEventWeather_Route119Cycle },
{ COORD_EVENT_WEATHER_ROUTE123_CYCLE, CoordEventWeather_Route123Cycle }, { COORD_EVENT_WEATHER_ROUTE123_CYCLE, CoordEventWeather_Route123Cycle },
@ -85,9 +85,9 @@ static void CoordEventWeather_Sandstorm(void)
SetWeather(WEATHER_SANDSTORM); SetWeather(WEATHER_SANDSTORM);
} }
static void CoordEventWeather_Cloudy(void) static void CoordEventWeather_Shade(void)
{ {
SetWeather(WEATHER_CLOUDY); SetWeather(WEATHER_SHADE);
} }
static void CoordEventWeather_Drought(void) static void CoordEventWeather_Drought(void)

6
src/field_weather.c
View File

@ -375,7 +375,7 @@ static void FadeInScreenWithWeather(void)
case WEATHER_RAIN_THUNDERSTORM: case WEATHER_RAIN_THUNDERSTORM:
case WEATHER_DOWNPOUR: case WEATHER_DOWNPOUR:
case WEATHER_SNOW: case WEATHER_SNOW:
case WEATHER_CLOUDY: case WEATHER_SHADE:
if (FadeInScreen_RainShowShade() == FALSE) if (FadeInScreen_RainShowShade() == FALSE)
{ {
gWeatherPtr->gammaIndex = 3; gWeatherPtr->gammaIndex = 3;
@ -768,7 +768,7 @@ void FadeScreen(u8 mode, s8 delay)
case WEATHER_DOWNPOUR: case WEATHER_DOWNPOUR:
case WEATHER_SNOW: case WEATHER_SNOW:
case WEATHER_FOG_HORIZONTAL: case WEATHER_FOG_HORIZONTAL:
case WEATHER_CLOUDY: case WEATHER_SHADE:
case WEATHER_DROUGHT: case WEATHER_DROUGHT:
useWeatherPal = TRUE; useWeatherPal = TRUE;
break; break;
@ -1022,7 +1022,7 @@ void sub_80AC274(u8 a)
SetWeather(WEATHER_SANDSTORM); SetWeather(WEATHER_SANDSTORM);
break; break;
case 10: case 10:
SetWeather(WEATHER_CLOUDY); SetWeather(WEATHER_SHADE);
break; break;
} }
} }

2
src/field_weather_effect.c
View File

@ -2558,7 +2558,7 @@ static u8 TranslateWeatherNum(u8 weather)
case WEATHER_SANDSTORM: return WEATHER_SANDSTORM; case WEATHER_SANDSTORM: return WEATHER_SANDSTORM;
case WEATHER_FOG_DIAGONAL: return WEATHER_FOG_DIAGONAL; case WEATHER_FOG_DIAGONAL: return WEATHER_FOG_DIAGONAL;
case WEATHER_UNDERWATER: return WEATHER_UNDERWATER; 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_DROUGHT: return WEATHER_DROUGHT;
case WEATHER_DOWNPOUR: return WEATHER_DOWNPOUR; case WEATHER_DOWNPOUR: return WEATHER_DOWNPOUR;
case WEATHER_UNDERWATER_BUBBLES: return WEATHER_UNDERWATER_BUBBLES; case WEATHER_UNDERWATER_BUBBLES: return WEATHER_UNDERWATER_BUBBLES;