summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle_util.c6
-rw-r--r--src/cable_car.c8
-rw-r--r--src/coord_event_weather.c40
-rw-r--r--src/field_control_avatar.c4
-rw-r--r--src/field_specials.c46
-rw-r--r--src/field_weather.c46
-rw-r--r--src/field_weather_effect.c118
-rw-r--r--src/map_name_popup.c2
-rw-r--r--src/overworld.c8
-rw-r--r--src/region_map.c4
10 files changed, 141 insertions, 141 deletions
diff --git a/src/battle_util.c b/src/battle_util.c
index 8587bb88e..4352a02c2 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -1830,9 +1830,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
{
switch (GetCurrentWeather())
{
- case WEATHER_RAIN_LIGHT:
- case WEATHER_RAIN_MED:
- case WEATHER_RAIN_HEAVY:
+ case WEATHER_RAIN:
+ case WEATHER_RAIN_THUNDERSTORM:
+ case WEATHER_DOWNPOUR:
if (!(gBattleWeather & WEATHER_RAIN_ANY))
{
gBattleWeather = (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_PERMANENT);
diff --git a/src/cable_car.c b/src/cable_car.c
index c6e7e724e..d310ae299 100644
--- a/src/cable_car.c
+++ b/src/cable_car.c
@@ -307,7 +307,7 @@ static void CableCarMainCallback_Setup(void)
gMain.state++;
break;
case 5:
- if (sCableCar->weather == WEATHER_ASH)
+ if (sCableCar->weather == WEATHER_VOLCANIC_ASH)
{
gMain.state++;
}
@@ -425,7 +425,7 @@ static void sub_81503E4(u8 taskId)
case 1:
switch (sCableCar->weather)
{
- case WEATHER_ASH:
+ case WEATHER_VOLCANIC_ASH:
if (gWeatherPtr->sprites.s2.ashSprites[0] != NULL && gWeatherPtr->sprites.s2.ashSprites[0]->oam.priority != 0)
{
for (; i < NUM_ASH_SPRITES; i++)
@@ -815,7 +815,7 @@ static void LoadCableCarSprites(void)
gSprites[spriteId].pos2.y = 4;
gSprites[spriteId].data[0] = 200;
gSprites[spriteId].data[1] = 99;
- sCableCar->weather = WEATHER_ASH;
+ sCableCar->weather = WEATHER_VOLCANIC_ASH;
sCableCar->unk4 = 0x15e;
SetCurrentAndNextWeatherNoDelay(WEATHER_SUNNY);
break;
@@ -841,7 +841,7 @@ static void LoadCableCarSprites(void)
gSprites[spriteId].data[1] = 0x41;
sCableCar->weather = WEATHER_SUNNY;
sCableCar->unk4 = 0x109;
- SetCurrentAndNextWeatherNoDelay(WEATHER_ASH);
+ SetCurrentAndNextWeatherNoDelay(WEATHER_VOLCANIC_ASH);
break;
}
for (i = 0; i < 9; i++)
diff --git a/src/coord_event_weather.c b/src/coord_event_weather.c
index 60b87fa30..2c5dbe183 100644
--- a/src/coord_event_weather.c
+++ b/src/coord_event_weather.c
@@ -11,30 +11,30 @@ struct CoordEventWeather
static void CoordEventWeather_Clouds(void);
static void CoordEventWeather_Sunny(void);
-static void CoordEventWeather_LightRain(void);
+static void CoordEventWeather_Rain(void);
static void CoordEventWeather_Snow(void);
static void CoordEventWeather_Thunderstorm(void);
-static void CoordEventWeather_Fog(void);
+static void CoordEventWeather_HorizontalFog(void);
static void CoordEventWeather_DiagonalFog(void);
static void CoordEventWeather_Ash(void);
static void CoordEventWeather_Sandstorm(void);
-static void CoordEventWeather_Dark(void);
+static void CoordEventWeather_Cloudy(void);
static void CoordEventWeather_Drought(void);
static void CoordEventWeather_Route119Cycle(void);
static void CoordEventWeather_Route123Cycle(void);
static const struct CoordEventWeather sCoordEventWeatherFuncs[] =
{
- { COORD_EVENT_WEATHER_CLOUDS, CoordEventWeather_Clouds },
+ { COORD_EVENT_WEATHER_SUNNY_CLOUDS, CoordEventWeather_Clouds },
{ COORD_EVENT_WEATHER_SUNNY, CoordEventWeather_Sunny },
- { COORD_EVENT_WEATHER_RAIN_LIGHT, CoordEventWeather_LightRain },
+ { COORD_EVENT_WEATHER_RAIN, CoordEventWeather_Rain },
{ COORD_EVENT_WEATHER_SNOW, CoordEventWeather_Snow },
- { COORD_EVENT_WEATHER_RAIN_MED, CoordEventWeather_Thunderstorm },
- { COORD_EVENT_WEATHER_FOG_1, CoordEventWeather_Fog },
- { COORD_EVENT_WEATHER_FOG_2, CoordEventWeather_DiagonalFog },
- { COORD_EVENT_WEATHER_ASH, CoordEventWeather_Ash },
+ { COORD_EVENT_WEATHER_RAIN_THUNDERSTORM, CoordEventWeather_Thunderstorm },
+ { COORD_EVENT_WEATHER_FOG_HORIZONTAL, CoordEventWeather_HorizontalFog },
+ { COORD_EVENT_WEATHER_FOG_DIAGONAL, CoordEventWeather_DiagonalFog },
+ { COORD_EVENT_WEATHER_VOLCANIC_ASH, CoordEventWeather_Ash },
{ COORD_EVENT_WEATHER_SANDSTORM, CoordEventWeather_Sandstorm },
- { COORD_EVENT_WEATHER_SHADE, CoordEventWeather_Dark },
+ { COORD_EVENT_WEATHER_CLOUDY, CoordEventWeather_Cloudy },
{ COORD_EVENT_WEATHER_DROUGHT, CoordEventWeather_Drought },
{ COORD_EVENT_WEATHER_ROUTE119_CYCLE, CoordEventWeather_Route119Cycle },
{ COORD_EVENT_WEATHER_ROUTE123_CYCLE, CoordEventWeather_Route123Cycle },
@@ -42,7 +42,7 @@ static const struct CoordEventWeather sCoordEventWeatherFuncs[] =
static void CoordEventWeather_Clouds(void)
{
- SetWeather(WEATHER_CLOUDS);
+ SetWeather(WEATHER_SUNNY_CLOUDS);
}
static void CoordEventWeather_Sunny(void)
@@ -50,9 +50,9 @@ static void CoordEventWeather_Sunny(void)
SetWeather(WEATHER_SUNNY);
}
-static void CoordEventWeather_LightRain(void)
+static void CoordEventWeather_Rain(void)
{
- SetWeather(WEATHER_RAIN_LIGHT);
+ SetWeather(WEATHER_RAIN);
}
static void CoordEventWeather_Snow(void)
@@ -62,22 +62,22 @@ static void CoordEventWeather_Snow(void)
static void CoordEventWeather_Thunderstorm(void)
{
- SetWeather(WEATHER_RAIN_MED);
+ SetWeather(WEATHER_RAIN_THUNDERSTORM);
}
-static void CoordEventWeather_Fog(void)
+static void CoordEventWeather_HorizontalFog(void)
{
- SetWeather(WEATHER_FOG_1);
+ SetWeather(WEATHER_FOG_HORIZONTAL);
}
static void CoordEventWeather_DiagonalFog(void)
{
- SetWeather(WEATHER_FOG_2);
+ SetWeather(WEATHER_FOG_DIAGONAL);
}
static void CoordEventWeather_Ash(void)
{
- SetWeather(WEATHER_ASH);
+ SetWeather(WEATHER_VOLCANIC_ASH);
}
static void CoordEventWeather_Sandstorm(void)
@@ -85,9 +85,9 @@ static void CoordEventWeather_Sandstorm(void)
SetWeather(WEATHER_SANDSTORM);
}
-static void CoordEventWeather_Dark(void)
+static void CoordEventWeather_Cloudy(void)
{
- SetWeather(WEATHER_SHADE);
+ SetWeather(WEATHER_CLOUDY);
}
static void CoordEventWeather_Drought(void)
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 8b4c7380c..852fa2e1b 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -558,9 +558,9 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
ScriptContext1_SetupScript(EventScript_EggHatch);
return TRUE;
}
- if (UnusualWeatherHasExpired() == TRUE)
+ if (AbnormalWeatherHasExpired() == TRUE)
{
- ScriptContext1_SetupScript(UnusualWeather_EventScript_EndEventAndCleanup_1);
+ ScriptContext1_SetupScript(AbnormalWeather_EventScript_EndEventAndCleanup_1);
return TRUE;
}
if (ShouldDoBrailleRegicePuzzle() == TRUE)
diff --git a/src/field_specials.c b/src/field_specials.c
index 830c2246d..bffb9f591 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -3542,36 +3542,36 @@ bool8 IsDestinationBoxFull(void)
return FALSE;
}
-void CreateUnusualWeatherEvent(void)
+void CreateAbnormalWeatherEvent(void)
{
u16 randomValue = Random();
- VarSet(VAR_UNUSUAL_WEATHER_STEP_COUNTER, 0);
+ VarSet(VAR_ABNORMAL_WEATHER_STEP_COUNTER, 0);
if (FlagGet(FLAG_DEFEATED_KYOGRE) == TRUE)
{
- VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START);
+ VarSet(VAR_ABNORMAL_WEATHER_LOCATION, (randomValue % ABNORMAL_WEATHER_COUNT_PER_LEGENDARY) + ABNORMAL_WEATHER_GROUDON_LOCATIONS_START);
}
else if (FlagGet(FLAG_DEFEATED_GROUDON) == TRUE)
{
- VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START);
+ VarSet(VAR_ABNORMAL_WEATHER_LOCATION, (randomValue % ABNORMAL_WEATHER_COUNT_PER_LEGENDARY) + ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START);
}
else if ((randomValue & 1) == 0)
{
randomValue = Random();
- VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START);
+ VarSet(VAR_ABNORMAL_WEATHER_LOCATION, (randomValue % ABNORMAL_WEATHER_COUNT_PER_LEGENDARY) + ABNORMAL_WEATHER_GROUDON_LOCATIONS_START);
}
else
{
randomValue = Random();
- VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START);
+ VarSet(VAR_ABNORMAL_WEATHER_LOCATION, (randomValue % ABNORMAL_WEATHER_COUNT_PER_LEGENDARY) + ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START);
}
}
-// Saves the map name for the current unusual weather location in gStringVar1, then
+// Saves the map name for the current abnormal weather location in gStringVar1, then
// returns TRUE if the weather is for Kyogre, and FALSE if it's for Groudon.
-bool32 GetUnusualWeatherMapNameAndType(void)
+bool32 GetAbnormalWeatherMapNameAndType(void)
{
- static const u8 sUnusualWeatherMapNumbers[] = {
+ static const u8 sAbnormalWeatherMapNumbers[] = {
MAP_NUM(ROUTE114),
MAP_NUM(ROUTE114),
MAP_NUM(ROUTE115),
@@ -3590,11 +3590,11 @@ bool32 GetUnusualWeatherMapNameAndType(void)
MAP_NUM(ROUTE129)
};
- u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION);
+ u16 abnormalWeather = VarGet(VAR_ABNORMAL_WEATHER_LOCATION);
- GetMapName(gStringVar1, sUnusualWeatherMapNumbers[unusualWeather - 1], 0);
+ GetMapName(gStringVar1, sAbnormalWeatherMapNumbers[abnormalWeather - 1], 0);
- if (unusualWeather < UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START)
+ if (abnormalWeather < ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START)
{
return FALSE;
}
@@ -3604,10 +3604,10 @@ bool32 GetUnusualWeatherMapNameAndType(void)
}
}
-bool8 UnusualWeatherHasExpired(void)
+bool8 AbnormalWeatherHasExpired(void)
{
// Duplicate array.
- static const u8 sUnusualWeatherMapNumbers_2[] = {
+ static const u8 sAbnormalWeatherMapNumbers[] = {
MAP_NUM(ROUTE114),
MAP_NUM(ROUTE114),
MAP_NUM(ROUTE115),
@@ -3626,17 +3626,17 @@ bool8 UnusualWeatherHasExpired(void)
MAP_NUM(ROUTE129)
};
- u16 steps = VarGet(VAR_UNUSUAL_WEATHER_STEP_COUNTER);
- u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION);
+ u16 steps = VarGet(VAR_ABNORMAL_WEATHER_STEP_COUNTER);
+ u16 abnormalWeather = VarGet(VAR_ABNORMAL_WEATHER_LOCATION);
- if (unusualWeather == UNUSUAL_WEATHER_NONE)
+ if (abnormalWeather == ABNORMAL_WEATHER_NONE)
{
return FALSE;
}
if (++steps > 999)
{
- VarSet(VAR_UNUSUAL_WEATHER_STEP_COUNTER, 0);
+ VarSet(VAR_ABNORMAL_WEATHER_STEP_COUNTER, 0);
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(UNDERWATER_MARINE_CAVE))
{
switch (gSaveBlock1Ptr->location.mapNum)
@@ -3646,7 +3646,7 @@ bool8 UnusualWeatherHasExpired(void)
case MAP_NUM(MARINE_CAVE_END):
case MAP_NUM(TERRA_CAVE_ENTRANCE):
case MAP_NUM(TERRA_CAVE_END):
- VarSet(VAR_SHOULD_END_UNUSUAL_WEATHER, 1);
+ VarSet(VAR_SHOULD_END_ABNORMAL_WEATHER, 1);
return FALSE;
default:
break;
@@ -3661,27 +3661,27 @@ bool8 UnusualWeatherHasExpired(void)
case MAP_NUM(UNDERWATER5):
case MAP_NUM(UNDERWATER6):
case MAP_NUM(UNDERWATER7):
- VarSet(VAR_SHOULD_END_UNUSUAL_WEATHER, 1);
+ VarSet(VAR_SHOULD_END_ABNORMAL_WEATHER, 1);
return FALSE;
default:
break;
}
}
- if (gSaveBlock1Ptr->location.mapNum == sUnusualWeatherMapNumbers_2[unusualWeather - 1] &&
+ if (gSaveBlock1Ptr->location.mapNum == sAbnormalWeatherMapNumbers[abnormalWeather - 1] &&
gSaveBlock1Ptr->location.mapGroup == 0)
{
return TRUE;
}
else
{
- VarSet(VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE);
+ VarSet(VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_NONE);
return FALSE;
}
}
else
{
- VarSet(VAR_UNUSUAL_WEATHER_STEP_COUNTER, steps);
+ VarSet(VAR_ABNORMAL_WEATHER_STEP_COUNTER, steps);
return FALSE;
}
}
diff --git a/src/field_weather.c b/src/field_weather.c
index 024b6631f..7fe929bf3 100644
--- a/src/field_weather.c
+++ b/src/field_weather.c
@@ -188,7 +188,7 @@ void StartWeather(void)
void SetNextWeather(u8 weather)
{
- if (weather != WEATHER_RAIN_LIGHT && weather != WEATHER_RAIN_MED && weather != WEATHER_RAIN_HEAVY)
+ if (weather != WEATHER_RAIN && weather != WEATHER_RAIN_THUNDERSTORM && weather != WEATHER_DOWNPOUR)
{
PlayRainStoppingSoundEffect();
}
@@ -371,11 +371,11 @@ static void FadeInScreenWithWeather(void)
switch (gWeatherPtr->currWeather)
{
- case WEATHER_RAIN_LIGHT:
- case WEATHER_RAIN_MED:
- case WEATHER_RAIN_HEAVY:
+ case WEATHER_RAIN:
+ case WEATHER_RAIN_THUNDERSTORM:
+ case WEATHER_DOWNPOUR:
case WEATHER_SNOW:
- case WEATHER_SHADE:
+ case WEATHER_CLOUDY:
if (FadeInScreen_RainShowShade() == FALSE)
{
gWeatherPtr->gammaIndex = 3;
@@ -389,17 +389,17 @@ static void FadeInScreenWithWeather(void)
gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
}
break;
- case WEATHER_FOG_1:
+ case WEATHER_FOG_HORIZONTAL:
if (FadeInScreen_Fog1() == FALSE)
{
gWeatherPtr->gammaIndex = 0;
gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
}
break;
- case WEATHER_ASH:
+ case WEATHER_VOLCANIC_ASH:
case WEATHER_SANDSTORM:
- case WEATHER_FOG_2:
- case WEATHER_FOG_3:
+ case WEATHER_FOG_DIAGONAL:
+ case WEATHER_UNDERWATER:
default:
if (!gPaletteFade.active)
{
@@ -763,12 +763,12 @@ void FadeScreen(u8 mode, s8 delay)
switch (gWeatherPtr->currWeather)
{
- case WEATHER_RAIN_LIGHT:
- case WEATHER_RAIN_MED:
- case WEATHER_RAIN_HEAVY:
+ case WEATHER_RAIN:
+ case WEATHER_RAIN_THUNDERSTORM:
+ case WEATHER_DOWNPOUR:
case WEATHER_SNOW:
- case WEATHER_FOG_1:
- case WEATHER_SHADE:
+ case WEATHER_FOG_HORIZONTAL:
+ case WEATHER_CLOUDY:
case WEATHER_DROUGHT:
useWeatherPal = TRUE;
break;
@@ -816,7 +816,7 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex)
case WEATHER_PAL_STATE_SCREEN_FADING_IN:
if (gWeatherPtr->unknown_6CA != 0)
{
- if (gWeatherPtr->currWeather == WEATHER_FOG_1)
+ if (gWeatherPtr->currWeather == WEATHER_FOG_HORIZONTAL)
MarkFogSpritePalToLighten(paletteIndex);
paletteIndex *= 16;
for (i = 0; i < 16; i++)
@@ -831,7 +831,7 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex)
// WEATHER_PAL_STATE_CHANGING_WEATHER
// WEATHER_PAL_STATE_CHANGING_IDLE
default:
- if (gWeatherPtr->currWeather != WEATHER_FOG_1)
+ if (gWeatherPtr->currWeather != WEATHER_FOG_HORIZONTAL)
{
ApplyGammaShift(paletteIndex, 1, gWeatherPtr->gammaIndex);
}
@@ -995,34 +995,34 @@ void sub_80AC274(u8 a)
switch (a)
{
case 1:
- SetWeather(WEATHER_CLOUDS);
+ SetWeather(WEATHER_SUNNY_CLOUDS);
break;
case 2:
SetWeather(WEATHER_SUNNY);
break;
case 3:
- SetWeather(WEATHER_RAIN_LIGHT);
+ SetWeather(WEATHER_RAIN);
break;
case 4:
SetWeather(WEATHER_SNOW);
break;
case 5:
- SetWeather(WEATHER_RAIN_MED);
+ SetWeather(WEATHER_RAIN_THUNDERSTORM);
break;
case 6:
- SetWeather(WEATHER_FOG_1);
+ SetWeather(WEATHER_FOG_HORIZONTAL);
break;
case 7:
- SetWeather(WEATHER_FOG_2);
+ SetWeather(WEATHER_FOG_DIAGONAL);
break;
case 8:
- SetWeather(WEATHER_ASH);
+ SetWeather(WEATHER_VOLCANIC_ASH);
break;
case 9:
SetWeather(WEATHER_SANDSTORM);
break;
case 10:
- SetWeather(WEATHER_SHADE);
+ SetWeather(WEATHER_CLOUDY);
break;
}
}
diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c
index 7f955c10a..540541406 100644
--- a/src/field_weather_effect.c
+++ b/src/field_weather_effect.c
@@ -14,7 +14,7 @@
#include "gpu_regs.h"
// EWRAM
-EWRAM_DATA static u8 gCurrentAlternatingWeather = 0;
+EWRAM_DATA static u8 gCurrentAbnormalWeather = 0;
EWRAM_DATA static u16 gUnusedWeatherRelated = 0;
// CONST
@@ -516,9 +516,9 @@ bool8 LightRain_Finish(void)
switch (gWeatherPtr->finishStep)
{
case 0:
- if (gWeatherPtr->nextWeather == WEATHER_RAIN_LIGHT
- || gWeatherPtr->nextWeather == WEATHER_RAIN_MED
- || gWeatherPtr->nextWeather == WEATHER_RAIN_HEAVY)
+ if (gWeatherPtr->nextWeather == WEATHER_RAIN
+ || gWeatherPtr->nextWeather == WEATHER_RAIN_THUNDERSTORM
+ || gWeatherPtr->nextWeather == WEATHER_DOWNPOUR)
{
gWeatherPtr->finishStep = 0xFF;
return FALSE;
@@ -1178,9 +1178,9 @@ bool8 Rain_Finish(void)
Rain_Main();
if (gWeatherPtr->unknown_6EA)
{
- if (gWeatherPtr->nextWeather == WEATHER_RAIN_LIGHT
- || gWeatherPtr->nextWeather == WEATHER_RAIN_MED
- || gWeatherPtr->nextWeather == WEATHER_RAIN_HEAVY)
+ if (gWeatherPtr->nextWeather == WEATHER_RAIN
+ || gWeatherPtr->nextWeather == WEATHER_RAIN_THUNDERSTORM
+ || gWeatherPtr->nextWeather == WEATHER_DOWNPOUR)
return FALSE;
gWeatherPtr->targetRainSpriteCount = 0;
@@ -1365,7 +1365,7 @@ void Fog1_Main(void)
{
case 0:
CreateFog1Sprites();
- if (gWeatherPtr->currWeather == WEATHER_FOG_1)
+ if (gWeatherPtr->currWeather == WEATHER_FOG_HORIZONTAL)
Weather_SetTargetBlendCoeffs(12, 8, 3);
else
Weather_SetTargetBlendCoeffs(4, 16, 0);
@@ -2399,13 +2399,13 @@ static void UpdateBubbleSprite(struct Sprite *sprite)
//------------------------------------------------------------------------------
// Unused function.
-static void UnusedSetCurrentAlternatingWeather(u32 a0, u32 a1)
+static void UnusedSetCurrentAbnormalWeather(u32 a0, u32 a1)
{
- gCurrentAlternatingWeather = a0;
+ gCurrentAbnormalWeather = a0;
gUnusedWeatherRelated = a1;
}
-static void Task_DoAlternatingWeather(u8 taskId)
+static void Task_DoAbnormalWeather(u8 taskId)
{
s16 *data = gTasks[taskId].data;
@@ -2415,7 +2415,7 @@ static void Task_DoAlternatingWeather(u8 taskId)
if (data[15]-- <= 0)
{
SetNextWeather(data[1]);
- gCurrentAlternatingWeather = data[1];
+ gCurrentAbnormalWeather = data[1];
data[15] = 600;
data[0]++;
}
@@ -2424,7 +2424,7 @@ static void Task_DoAlternatingWeather(u8 taskId)
if (data[15]-- <= 0)
{
SetNextWeather(data[2]);
- gCurrentAlternatingWeather = data[2];
+ gCurrentAbnormalWeather = data[2];
data[15] = 600;
data[0] = 0;
}
@@ -2432,27 +2432,27 @@ static void Task_DoAlternatingWeather(u8 taskId)
}
}
-static void CreateAlternatingWeatherTask(void)
+static void CreateAbnormalWeatherTask(void)
{
- u8 taskId = CreateTask(Task_DoAlternatingWeather, 0);
+ u8 taskId = CreateTask(Task_DoAbnormalWeather, 0);
s16 *data = gTasks[taskId].data;
data[15] = 600;
- if (gCurrentAlternatingWeather == WEATHER_RAIN_HEAVY)
+ if (gCurrentAbnormalWeather == WEATHER_DOWNPOUR)
{
data[1] = WEATHER_DROUGHT;
- data[2] = WEATHER_RAIN_HEAVY;
+ data[2] = WEATHER_DOWNPOUR;
}
- else if (gCurrentAlternatingWeather == WEATHER_DROUGHT)
+ else if (gCurrentAbnormalWeather == WEATHER_DROUGHT)
{
- data[1] = WEATHER_RAIN_HEAVY;
+ data[1] = WEATHER_DOWNPOUR;
data[2] = WEATHER_DROUGHT;
}
else
{
- gCurrentAlternatingWeather = WEATHER_RAIN_HEAVY;
+ gCurrentAbnormalWeather = WEATHER_DOWNPOUR;
data[1] = WEATHER_DROUGHT;
- data[2] = WEATHER_RAIN_HEAVY;
+ data[2] = WEATHER_DOWNPOUR;
}
}
@@ -2494,17 +2494,17 @@ void DoCurrentWeather(void)
{
u8 weather = GetSav1Weather();
- if (weather == WEATHER_ALTERNATING)
+ if (weather == WEATHER_ABNORMAL)
{
- if (!FuncIsActiveTask(Task_DoAlternatingWeather))
- CreateAlternatingWeatherTask();
- weather = gCurrentAlternatingWeather;
+ if (!FuncIsActiveTask(Task_DoAbnormalWeather))
+ CreateAbnormalWeatherTask();
+ weather = gCurrentAbnormalWeather;
}
else
{
- if (FuncIsActiveTask(Task_DoAlternatingWeather))
- DestroyTask(FindTaskIdByFunc(Task_DoAlternatingWeather));
- gCurrentAlternatingWeather = WEATHER_RAIN_HEAVY;
+ if (FuncIsActiveTask(Task_DoAbnormalWeather))
+ DestroyTask(FindTaskIdByFunc(Task_DoAbnormalWeather));
+ gCurrentAbnormalWeather = WEATHER_DOWNPOUR;
}
SetNextWeather(weather);
}
@@ -2513,17 +2513,17 @@ void ResumePausedWeather(void)
{
u8 weather = GetSav1Weather();
- if (weather == WEATHER_ALTERNATING)
+ if (weather == WEATHER_ABNORMAL)
{
- if (!FuncIsActiveTask(Task_DoAlternatingWeather))
- CreateAlternatingWeatherTask();
- weather = gCurrentAlternatingWeather;
+ if (!FuncIsActiveTask(Task_DoAbnormalWeather))
+ CreateAbnormalWeatherTask();
+ weather = gCurrentAbnormalWeather;
}
else
{
- if (FuncIsActiveTask(Task_DoAlternatingWeather))
- DestroyTask(FindTaskIdByFunc(Task_DoAlternatingWeather));
- gCurrentAlternatingWeather = WEATHER_RAIN_HEAVY;
+ if (FuncIsActiveTask(Task_DoAbnormalWeather))
+ DestroyTask(FindTaskIdByFunc(Task_DoAbnormalWeather));
+ gCurrentAbnormalWeather = WEATHER_DOWNPOUR;
}
SetCurrentAndNextWeather(weather);
}
@@ -2531,15 +2531,15 @@ void ResumePausedWeather(void)
static const u8 sWeatherCycleRoute119[] =
{
WEATHER_SUNNY,
- WEATHER_RAIN_LIGHT,
- WEATHER_RAIN_MED,
- WEATHER_RAIN_LIGHT,
+ WEATHER_RAIN,
+ WEATHER_RAIN_THUNDERSTORM,
+ WEATHER_RAIN,
};
static const u8 sWeatherCycleRoute123[] =
{
WEATHER_SUNNY,
WEATHER_SUNNY,
- WEATHER_RAIN_LIGHT,
+ WEATHER_RAIN,
WEATHER_SUNNY,
};
@@ -2547,25 +2547,25 @@ static u8 TranslateWeatherNum(u8 weather)
{
switch (weather)
{
- case WEATHER_NONE: return WEATHER_NONE;
- case WEATHER_CLOUDS: return WEATHER_CLOUDS;
- case WEATHER_SUNNY: return WEATHER_SUNNY;
- case WEATHER_RAIN_LIGHT: return WEATHER_RAIN_LIGHT;
- case WEATHER_SNOW: return WEATHER_SNOW;
- case WEATHER_RAIN_MED: return WEATHER_RAIN_MED;
- case WEATHER_FOG_1: return WEATHER_FOG_1;
- case WEATHER_ASH: return WEATHER_ASH;
- case WEATHER_SANDSTORM: return WEATHER_SANDSTORM;
- case WEATHER_FOG_2: return WEATHER_FOG_2;
- case WEATHER_FOG_3: return WEATHER_FOG_3;
- case WEATHER_SHADE: return WEATHER_SHADE;
- case WEATHER_DROUGHT: return WEATHER_DROUGHT;
- case WEATHER_RAIN_HEAVY: return WEATHER_RAIN_HEAVY;
- case WEATHER_BUBBLES: return WEATHER_BUBBLES;
- case WEATHER_ALTERNATING: return WEATHER_ALTERNATING;
- case WEATHER_ROUTE119_CYCLE: return sWeatherCycleRoute119[gSaveBlock1Ptr->weatherCycleStage];
- case WEATHER_ROUTE123_CYCLE: return sWeatherCycleRoute123[gSaveBlock1Ptr->weatherCycleStage];
- default: return WEATHER_NONE;
+ case WEATHER_NONE: return WEATHER_NONE;
+ case WEATHER_SUNNY_CLOUDS: return WEATHER_SUNNY_CLOUDS;
+ case WEATHER_SUNNY: return WEATHER_SUNNY;
+ case WEATHER_RAIN: return WEATHER_RAIN;
+ case WEATHER_SNOW: return WEATHER_SNOW;
+ case WEATHER_RAIN_THUNDERSTORM: return WEATHER_RAIN_THUNDERSTORM;
+ case WEATHER_FOG_HORIZONTAL: return WEATHER_FOG_HORIZONTAL;
+ case WEATHER_VOLCANIC_ASH: return WEATHER_VOLCANIC_ASH;
+ 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_DROUGHT: return WEATHER_DROUGHT;
+ case WEATHER_DOWNPOUR: return WEATHER_DOWNPOUR;
+ case WEATHER_UNDERWATER_BUBBLES: return WEATHER_UNDERWATER_BUBBLES;
+ case WEATHER_ABNORMAL: return WEATHER_ABNORMAL;
+ case WEATHER_ROUTE119_CYCLE: return sWeatherCycleRoute119[gSaveBlock1Ptr->weatherCycleStage];
+ case WEATHER_ROUTE123_CYCLE: return sWeatherCycleRoute123[gSaveBlock1Ptr->weatherCycleStage];
+ default: return WEATHER_NONE;
}
}
@@ -2579,7 +2579,7 @@ void UpdateWeatherPerDay(u16 increment)
static void UpdateRainCounter(u8 newWeather, u8 oldWeather)
{
if (newWeather != oldWeather
- && (newWeather == WEATHER_RAIN_LIGHT || newWeather == WEATHER_RAIN_MED))
+ && (newWeather == WEATHER_RAIN || newWeather == WEATHER_RAIN_THUNDERSTORM))
IncrementGameStat(GAME_STAT_GOT_RAINED_ON);
}
diff --git a/src/map_name_popup.c b/src/map_name_popup.c
index d95b808e9..b84489a17 100644
--- a/src/map_name_popup.c
+++ b/src/map_name_popup.c
@@ -371,7 +371,7 @@ static void LoadMapNamePopUpWindowBg(void)
LoadBgTiles(GetWindowAttribute(popupWindowId, WINDOW_BG), gMapPopUp_Outline_Table[popUpThemeId], 0x400, 0x21D);
CallWindowFunction(popupWindowId, sub_80D4A78);
PutWindowTilemap(popupWindowId);
- if(gMapHeader.weather == WEATHER_BUBBLES)
+ if (gMapHeader.weather == WEATHER_UNDERWATER_BUBBLES)
LoadPalette(&gUnknown_0857F444, 0xE0, 0x20);
else
LoadPalette(gMapPopUp_Palette_Table[popUpThemeId], 0xE0, 0x20);
diff --git a/src/overworld.c b/src/overworld.c
index f135dd3b1..c288f2e00 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -432,11 +432,11 @@ static void Overworld_ResetStateAfterWhiteOut(void)
FlagClear(FLAG_SYS_USE_STRENGTH);
FlagClear(FLAG_SYS_USE_FLASH);
// If you were defeated by Kyogre/Groudon and the step counter has
- // maxed out, end the unusual weather.
- if (VarGet(VAR_SHOULD_END_UNUSUAL_WEATHER) == 1)
+ // maxed out, end the abnormal weather.
+ if (VarGet(VAR_SHOULD_END_ABNORMAL_WEATHER) == 1)
{
- VarSet(VAR_SHOULD_END_UNUSUAL_WEATHER, 0);
- VarSet(VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE);
+ VarSet(VAR_SHOULD_END_ABNORMAL_WEATHER, 0);
+ VarSet(VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_NONE);
}
}
diff --git a/src/region_map.c b/src/region_map.c
index b6133ee0d..9929de382 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -1259,7 +1259,7 @@ static u16 RegionMap_GetTerraCaveMapSecId(void)
{
s16 idx;
- idx = VarGet(VAR_UNUSUAL_WEATHER_LOCATION) - 1;
+ idx = VarGet(VAR_ABNORMAL_WEATHER_LOCATION) - 1;
if (idx < 0 || idx > 15)
{
idx = 0;
@@ -1271,7 +1271,7 @@ static void RegionMap_GetMarineCaveCoords(u16 *x, u16 *y)
{
u16 idx;
- idx = VarGet(VAR_UNUSUAL_WEATHER_LOCATION);
+ idx = VarGet(VAR_ABNORMAL_WEATHER_LOCATION);
if (idx < 9 || idx > 16)
{
idx = 9;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 14:46:14 +0000