summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle_util.c14
-rw-r--r--src/clock.c2
-rw-r--r--src/field_weather.c513
-rw-r--r--src/field_weather_effect.c165
4 files changed, 312 insertions, 382 deletions
diff --git a/src/battle_util.c b/src/battle_util.c
index 94aaea66c..2ddd4f550 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -17,13 +17,13 @@
#include "string_util.h"
#include "battle_message.h"
#include "constants/battle_string_ids.h"
+#include "constants/weather.h"
#include "battle_ai_script_commands.h"
#include "battle_controllers.h"
#include "event_data.h"
#include "link.h"
#include "berry.h"
-
-extern u8 GetCurrentWeather(void);
+#include "field_weather.h"
// rom const data
static const u16 sSoundMovesTable[] =
@@ -1829,9 +1829,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
{
switch (GetCurrentWeather())
{
- case 3:
- case 5:
- case 13:
+ case WEATHER_RAIN_LIGHT:
+ case WEATHER_RAIN_MED:
+ case WEATHER_RAIN_HEAVY:
if (!(gBattleWeather & WEATHER_RAIN_ANY))
{
gBattleWeather = (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_PERMANENT);
@@ -1840,7 +1840,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
effect++;
}
break;
- case 8:
+ case WEATHER_SANDSTORM:
if (!(gBattleWeather & WEATHER_SANDSTORM_ANY))
{
gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY);
@@ -1849,7 +1849,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
effect++;
}
break;
- case 12:
+ case WEATHER_DROUGHT:
if (!(gBattleWeather & WEATHER_SUN_ANY))
{
gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY);
diff --git a/src/clock.c b/src/clock.c
index 91eb5f16d..aea6c2088 100644
--- a/src/clock.c
+++ b/src/clock.c
@@ -5,7 +5,7 @@
#include "lottery_corner.h"
#include "dewford_trend.h"
#include "tv.h"
-#include "field_screen.h"
+#include "field_weather.h"
#include "berry.h"
#include "main.h"
#include "overworld.h"
diff --git a/src/field_weather.c b/src/field_weather.c
index 0be584d51..be3396c63 100644
--- a/src/field_weather.c
+++ b/src/field_weather.c
@@ -47,87 +47,41 @@ struct WeatherCallbacks
};
// This file's functions.
-/*static*/ bool8 LightenSpritePaletteInFog(u8);
-/*static*/ void BuildGammaShiftTables(void);
-/*static*/ void UpdateWeatherGammaShift(void);
-/*static*/ void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex);
-/*static*/ void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor);
-/*static*/ void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor);
-/*static*/ void ApplyFogBlend(u8 blendCoeff, u16 blendColor);
-/*static*/ bool8 FadeInScreen_RainShowShade(void);
-/*static*/ bool8 FadeInScreen_Drought(void);
-/*static*/ bool8 FadeInScreen_Fog1(void);
-/*static*/ void FadeInScreenWithWeather(void);
-/*static*/ void DoNothing(void);
-void None_Init(void);
-void None_Main(void);
-bool8 None_Finish(void);
-void Clouds_InitVars(void);
-void Clouds_Main(void);
-void Clouds_InitAll(void);
-bool8 Clouds_Finish(void);
-void Weather2_InitVars(void);
-void Weather2_Main(void);
-void Weather2_InitAll(void);
-bool8 Weather2_Finish(void);
-void LightRain_InitVars(void);
-void LightRain_Main(void);
-void LightRain_InitAll(void);
-bool8 LightRain_Finish(void);
-void Snow_InitVars(void);
-void Snow_Main(void);
-void Snow_InitAll(void);
-bool8 Snow_Finish(void);
-void MedRain_InitVars(void);
-void Rain_Main(void);
-void MedRain_InitAll(void);
-bool8 Rain_Finish(void);
-void Fog1_InitVars(void);
-void Fog1_Main(void);
-void Fog1_InitAll(void);
-bool8 Fog1_Finish(void);
-void Ash_InitVars(void);
-void Ash_Main(void);
-void Ash_InitAll(void);
-bool8 Ash_Finish(void);
-void Sandstorm_InitVars(void);
-void Sandstorm_Main(void);
-void Sandstorm_InitAll(void);
-bool8 Sandstorm_Finish(void);
-void Fog2_InitVars(void);
-void Fog2_Main(void);
-void Fog2_InitAll(void);
-bool8 Fog2_Finish(void);
-void Fog1_InitVars(void);
-void Fog1_Main(void);
-void Fog1_InitAll(void);
-bool8 Fog1_Finish(void);
-void Shade_InitVars(void);
-void Shade_Main(void);
-void Shade_InitAll(void);
-bool8 Shade_Finish(void);
-void Drought_InitVars(void);
-void Drought_Main(void);
-void Drought_InitAll(void);
-bool8 Drought_Finish(void);
-void HeavyRain_InitVars(void);
-void Rain_Main(void);
-void HeavyRain_InitAll(void);
-bool8 Rain_Finish(void);
-void Bubbles_InitVars(void);
-void Bubbles_Main(void);
-void Bubbles_InitAll(void);
-bool8 Bubbles_Finish(void);
-
-// Const rom data
-
-// This is a pointer to gWeather. All code in this file accesses gWeather directly,
+static bool8 LightenSpritePaletteInFog(u8);
+static void BuildGammaShiftTables(void);
+static void UpdateWeatherGammaShift(void);
+static void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex);
+static void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor);
+static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor);
+static void ApplyFogBlend(u8 blendCoeff, u16 blendColor);
+static bool8 FadeInScreen_RainShowShade(void);
+static bool8 FadeInScreen_Drought(void);
+static bool8 FadeInScreen_Fog1(void);
+static void FadeInScreenWithWeather(void);
+static void DoNothing(void);
+static void Task_WeatherInit(u8 taskId);
+static void Task_WeatherMain(u8 taskId);
+static void None_Init(void);
+static void None_Main(void);
+static u8 None_Finish(void);
+
+// EWRAM
+EWRAM_DATA struct Weather gWeather = {0};
+EWRAM_DATA static u8 sFieldEffectPaletteGammaTypes[32] = {0};
+
+// IWRAM bss
+IWRAM_DATA static const u8 *sPaletteGammaTypes;
+
+// CONST
+extern const u16 gUnknown_0854014C[][4096];
+
+// This is a pointer to gWeatherPtr. All code in this file accesses gWeather directly,
// while code in other field weather files accesses gWeather through this pointer.
// This is likely the result of compiler optimization, since using the pointer in
// this file produces the same result as accessing gWeather directly.
struct Weather *const gWeatherPtr = &gWeather;
-/*static*/ const struct WeatherCallbacks sWeatherFuncs[] =
+static const struct WeatherCallbacks sWeatherFuncs[] =
{
{None_Init, None_Main, None_Init, None_Finish},
{Clouds_InitVars, Clouds_Main, Clouds_InitAll, Clouds_Finish},
@@ -156,7 +110,7 @@ void (*const gWeatherPalStateFuncs[])(void) =
// This table specifies which of the gamma shift tables should be
// applied to each of the background and sprite palettes.
-/*static*/ const u8 sBasePaletteGammaTypes[32] =
+static const u8 sBasePaletteGammaTypes[32] =
{
// background palettes
GAMMA_NORMAL,
@@ -194,18 +148,7 @@ void (*const gWeatherPalStateFuncs[])(void) =
GAMMA_NORMAL,
};
-
-// EWRAM
-EWRAM_DATA struct Weather gWeather = {0};
-EWRAM_DATA u8 gFieldEffectPaletteGammaTypes[32] = {0};
-
-// IWRAM bss
-IWRAM_DATA const u8 *sPaletteGammaTypes;
-IWRAM_DATA u32 filler_03000f54;
-
-// const
-extern const u16 gUnknown_083970E8[];
-extern const u16 gUnknown_0854014C[][4096];
+const u16 gUnknown_083970E8[] = INCBIN_U16("graphics/weather/0.gbapal");
// code
void StartWeather(void)
@@ -215,25 +158,25 @@ void StartWeather(void)
u8 index = AllocSpritePalette(0x1200);
CpuCopy32(gUnknown_083970E8, &gPlttBufferUnfaded[0x100 + index * 16], 32);
BuildGammaShiftTables();
- gWeather.altGammaSpritePalIndex = index;
- gWeather.weatherPicSpritePalIndex = AllocSpritePalette(0x1201);
- gWeather.rainSpriteCount = 0;
- gWeather.unknown_6D8 = 0;
- gWeather.cloudSpritesCreated = 0;
- gWeather.snowflakeSpriteCount = 0;
- gWeather.ashSpritesCreated = 0;
- gWeather.fog1SpritesCreated = 0;
- gWeather.fog2SpritesCreated = 0;
- gWeather.sandstormSprites1Created = 0;
- gWeather.sandstormSprites2Created = 0;
- gWeather.unknown_72E = 0;
- gWeather.lightenedFogSpritePalsCount = 0;
+ gWeatherPtr->altGammaSpritePalIndex = index;
+ gWeatherPtr->weatherPicSpritePalIndex = AllocSpritePalette(0x1201);
+ gWeatherPtr->rainSpriteCount = 0;
+ gWeatherPtr->unknown_6D8 = 0;
+ gWeatherPtr->cloudSpritesCreated = 0;
+ gWeatherPtr->snowflakeSpriteCount = 0;
+ gWeatherPtr->ashSpritesCreated = 0;
+ gWeatherPtr->fog1SpritesCreated = 0;
+ gWeatherPtr->fog2SpritesCreated = 0;
+ gWeatherPtr->sandstormSprites1Created = 0;
+ gWeatherPtr->sandstormSprites2Created = 0;
+ gWeatherPtr->unknown_72E = 0;
+ gWeatherPtr->lightenedFogSpritePalsCount = 0;
Weather_SetBlendCoeffs(16, 0);
- gWeather.currWeather = 0;
- gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE;
- gWeather.readyForInit = FALSE;
- gWeather.weatherChangeComplete = TRUE;
- gWeather.taskId = CreateTask(Task_WeatherInit, 80);
+ gWeatherPtr->currWeather = 0;
+ gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
+ gWeatherPtr->readyForInit = FALSE;
+ gWeatherPtr->weatherChangeComplete = TRUE;
+ gWeatherPtr->taskId = CreateTask(Task_WeatherInit, 80);
}
}
@@ -244,75 +187,75 @@ void ChangeWeather(u8 weather)
PlayRainSoundEffect();
}
- if (gWeather.nextWeather != weather && gWeather.currWeather == weather)
+ if (gWeatherPtr->nextWeather != weather && gWeatherPtr->currWeather == weather)
{
sWeatherFuncs[weather].initVars();
}
- gWeather.weatherChangeComplete = FALSE;
- gWeather.nextWeather = weather;
- gWeather.finishStep = 0;
+ gWeatherPtr->weatherChangeComplete = FALSE;
+ gWeatherPtr->nextWeather = weather;
+ gWeatherPtr->finishStep = 0;
}
void sub_80AB104(u8 weather)
{
PlayRainSoundEffect();
- gWeather.currWeather = weather;
- gWeather.nextWeather = weather;
+ gWeatherPtr->currWeather = weather;
+ gWeatherPtr->nextWeather = weather;
}
void sub_80AB130(u8 weather)
{
PlayRainSoundEffect();
- gWeather.currWeather = weather;
- gWeather.nextWeather = weather;
- gWeather.readyForInit = TRUE;
+ gWeatherPtr->currWeather = weather;
+ gWeatherPtr->nextWeather = weather;
+ gWeatherPtr->readyForInit = TRUE;
}
-void Task_WeatherInit(u8 taskId)
+static void Task_WeatherInit(u8 taskId)
{
// Waits until it's ok to initialize weather.
// When the screen fades in, this is set to TRUE.
- if (gWeather.readyForInit)
+ if (gWeatherPtr->readyForInit)
{
- sWeatherFuncs[gWeather.currWeather].initAll();
+ sWeatherFuncs[gWeatherPtr->currWeather].initAll();
gTasks[taskId].func = Task_WeatherMain;
}
}
-void Task_WeatherMain(u8 taskId)
+static void Task_WeatherMain(u8 taskId)
{
- if (gWeather.currWeather != gWeather.nextWeather)
+ if (gWeatherPtr->currWeather != gWeatherPtr->nextWeather)
{
- if (!sWeatherFuncs[gWeather.currWeather].finish() && gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT)
+ if (!sWeatherFuncs[gWeatherPtr->currWeather].finish() && gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT)
{
// Finished cleaning up previous weather. Now transition to next weather.
- sWeatherFuncs[gWeather.nextWeather].initVars();
- gWeather.gammaStepFrameCounter = 0;
- gWeather.palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER;
- gWeather.currWeather = gWeather.nextWeather;
- gWeather.weatherChangeComplete = TRUE;
+ sWeatherFuncs[gWeatherPtr->nextWeather].initVars();
+ gWeatherPtr->gammaStepFrameCounter = 0;
+ gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER;
+ gWeatherPtr->currWeather = gWeatherPtr->nextWeather;
+ gWeatherPtr->weatherChangeComplete = TRUE;
}
}
else
{
- sWeatherFuncs[gWeather.currWeather].main();
+ sWeatherFuncs[gWeatherPtr->currWeather].main();
}
- gWeatherPalStateFuncs[gWeather.palProcessingState]();
+ gWeatherPalStateFuncs[gWeatherPtr->palProcessingState]();
}
-void None_Init(void)
+static void None_Init(void)
{
- gWeather.gammaTargetIndex = 0;
- gWeather.gammaStepDelay = 0;
+ gWeatherPtr->gammaTargetIndex = 0;
+ gWeatherPtr->gammaStepDelay = 0;
}
-void None_Main(void)
+static void None_Main(void)
{
}
-u8 None_Finish(void)
+static u8 None_Finish(void)
{
return 0;
}
@@ -320,7 +263,7 @@ u8 None_Finish(void)
// Builds two tables that contain gamma shifts for palette colors.
// It's unclear why the two tables aren't declared as const arrays, since
// this function always builds the same two tables.
-/*static*/ void BuildGammaShiftTables(void)
+static void BuildGammaShiftTables(void)
{
u16 v0;
u8 (*v1)[32];
@@ -337,9 +280,9 @@ u8 None_Finish(void)
for (v0 = 0; v0 <= 1; v0++)
{
if (v0 == 0)
- v1 = gWeather.gammaShifts;
+ v1 = gWeatherPtr->gammaShifts;
else
- v1 = gWeather.altGammaShifts;
+ v1 = gWeatherPtr->altGammaShifts;
for (v2 = 0; v2 < 32; v2++)
{
@@ -389,36 +332,36 @@ u8 None_Finish(void)
// When the weather is changing, it gradually updates the palettes
// towards the desired gamma shift.
-/*static*/ void UpdateWeatherGammaShift(void)
+static void UpdateWeatherGammaShift(void)
{
- if (gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT)
+ if (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT)
{
- if (gWeather.gammaIndex == gWeather.gammaTargetIndex)
+ if (gWeatherPtr->gammaIndex == gWeatherPtr->gammaTargetIndex)
{
- gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE;
+ gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
}
else
{
- if (++gWeather.gammaStepFrameCounter >= gWeather.gammaStepDelay)
+ if (++gWeatherPtr->gammaStepFrameCounter >= gWeatherPtr->gammaStepDelay)
{
- gWeather.gammaStepFrameCounter = 0;
- if (gWeather.gammaIndex < gWeather.gammaTargetIndex)
- gWeather.gammaIndex++;
+ gWeatherPtr->gammaStepFrameCounter = 0;
+ if (gWeatherPtr->gammaIndex < gWeatherPtr->gammaTargetIndex)
+ gWeatherPtr->gammaIndex++;
else
- gWeather.gammaIndex--;
+ gWeatherPtr->gammaIndex--;
- ApplyGammaShift(0, 32, gWeather.gammaIndex);
+ ApplyGammaShift(0, 32, gWeatherPtr->gammaIndex);
}
}
}
}
-/*static*/ void FadeInScreenWithWeather(void)
+static void FadeInScreenWithWeather(void)
{
- if (++gWeather.unknown_6CB > 1)
- gWeather.unknown_6CA = 0;
+ if (++gWeatherPtr->unknown_6CB > 1)
+ gWeatherPtr->unknown_6CA = 0;
- switch (gWeather.currWeather)
+ switch (gWeatherPtr->currWeather)
{
case WEATHER_RAIN_LIGHT:
case WEATHER_RAIN_MED:
@@ -427,22 +370,22 @@ u8 None_Finish(void)
case WEATHER_SHADE:
if (FadeInScreen_RainShowShade() == FALSE)
{
- gWeather.gammaIndex = 3;
- gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE;
+ gWeatherPtr->gammaIndex = 3;
+ gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
}
break;
case WEATHER_DROUGHT:
if (FadeInScreen_Drought() == FALSE)
{
- gWeather.gammaIndex = -6;
- gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE;
+ gWeatherPtr->gammaIndex = -6;
+ gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
}
break;
case WEATHER_FOG_1:
if (FadeInScreen_Fog1() == FALSE)
{
- gWeather.gammaIndex = 0;
- gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE;
+ gWeatherPtr->gammaIndex = 0;
+ gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
}
break;
case WEATHER_ASH:
@@ -452,59 +395,59 @@ u8 None_Finish(void)
default:
if (!gPaletteFade.active)
{
- gWeather.gammaIndex = gWeather.gammaTargetIndex;
- gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE;
+ gWeatherPtr->gammaIndex = gWeatherPtr->gammaTargetIndex;
+ gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
}
break;
}
}
-bool8 FadeInScreen_RainShowShade(void)
+static bool8 FadeInScreen_RainShowShade(void)
{
- if (gWeather.fadeScreenCounter == 16)
+ if (gWeatherPtr->fadeScreenCounter == 16)
return FALSE;
- if (++gWeather.fadeScreenCounter >= 16)
+ if (++gWeatherPtr->fadeScreenCounter >= 16)
{
ApplyGammaShift(0, 32, 3);
- gWeather.fadeScreenCounter = 16;
+ gWeatherPtr->fadeScreenCounter = 16;
return FALSE;
}
- ApplyGammaShiftWithBlend(0, 32, 3, 16 - gWeather.fadeScreenCounter, gWeather.fadeDestColor);
+ ApplyGammaShiftWithBlend(0, 32, 3, 16 - gWeatherPtr->fadeScreenCounter, gWeatherPtr->fadeDestColor);
return TRUE;
}
-bool8 FadeInScreen_Drought(void)
+static bool8 FadeInScreen_Drought(void)
{
- if (gWeather.fadeScreenCounter == 16)
+ if (gWeatherPtr->fadeScreenCounter == 16)
return FALSE;
- if (++gWeather.fadeScreenCounter >= 16)
+ if (++gWeatherPtr->fadeScreenCounter >= 16)
{
ApplyGammaShift(0, 32, -6);
- gWeather.fadeScreenCounter = 16;
+ gWeatherPtr->fadeScreenCounter = 16;
return FALSE;
}
- ApplyDroughtGammaShiftWithBlend(-6, 16 - gWeather.fadeScreenCounter, gWeather.fadeDestColor);
+ ApplyDroughtGammaShiftWithBlend(-6, 16 - gWeatherPtr->fadeScreenCounter, gWeatherPtr->fadeDestColor);
return TRUE;
}
-bool8 FadeInScreen_Fog1(void)
+static bool8 FadeInScreen_Fog1(void)
{
- if (gWeather.fadeScreenCounter == 16)
+ if (gWeatherPtr->fadeScreenCounter == 16)
return FALSE;
- gWeather.fadeScreenCounter++;
- ApplyFogBlend(16 - gWeather.fadeScreenCounter, gWeather.fadeDestColor);
+ gWeatherPtr->fadeScreenCounter++;
+ ApplyFogBlend(16 - gWeatherPtr->fadeScreenCounter, gWeatherPtr->fadeDestColor);
return TRUE;
}
-/*static*/ void DoNothing(void)
+static void DoNothing(void)
{ }
-/*static*/ void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex)
+static void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex)
{
u16 curPalIndex;
u16 palOffset;
@@ -531,10 +474,10 @@ bool8 FadeInScreen_Fog1(void)
{
u8 r, g, b;
- if (sPaletteGammaTypes[curPalIndex] == GAMMA_ALT || curPalIndex - 16 == gWeather.altGammaSpritePalIndex)
- gammaTable = gWeather.altGammaShifts[gammaIndex];
+ if (sPaletteGammaTypes[curPalIndex] == GAMMA_ALT || curPalIndex - 16 == gWeatherPtr->altGammaSpritePalIndex)
+ gammaTable = gWeatherPtr->altGammaShifts[gammaIndex];
else
- gammaTable = gWeather.gammaShifts[gammaIndex];
+ gammaTable = gWeatherPtr->gammaShifts[gammaIndex];
for (i = 0; i < 16; i++)
{
@@ -585,7 +528,7 @@ bool8 FadeInScreen_Fog1(void)
}
}
-/*static*/ void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor)
+static void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor)
{
u16 palOffset;
u16 curPalIndex;
@@ -613,9 +556,9 @@ bool8 FadeInScreen_Fog1(void)
u8 *gammaTable;
if (sPaletteGammaTypes[curPalIndex] == GAMMA_NORMAL)
- gammaTable = gWeather.gammaShifts[gammaIndex];
+ gammaTable = gWeatherPtr->gammaShifts[gammaIndex];
else
- gammaTable = gWeather.altGammaShifts[gammaIndex];
+ gammaTable = gWeatherPtr->altGammaShifts[gammaIndex];
for (i = 0; i < 16; i++)
{
@@ -636,7 +579,7 @@ bool8 FadeInScreen_Fog1(void)
}
}
-void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor)
+static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor)
{
struct RGBColor color;
u8 rBlend;
@@ -691,7 +634,7 @@ void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColo
}
}
-void ApplyFogBlend(u8 blendCoeff, u16 blendColor)
+static void ApplyFogBlend(u8 blendCoeff, u16 blendColor)
{
struct RGBColor color;
u8 rBlend;
@@ -738,22 +681,22 @@ void ApplyFogBlend(u8 blendCoeff, u16 blendColor)
}
}
-/*static*/ void MarkFogSpritePalToLighten(u8 paletteIndex)
+static void MarkFogSpritePalToLighten(u8 paletteIndex)
{
- if (gWeather.lightenedFogSpritePalsCount < 6)
+ if (gWeatherPtr->lightenedFogSpritePalsCount < 6)
{
- gWeather.lightenedFogSpritePals[gWeather.lightenedFogSpritePalsCount] = paletteIndex;
- gWeather.lightenedFogSpritePalsCount++;
+ gWeatherPtr->lightenedFogSpritePals[gWeatherPtr->lightenedFogSpritePalsCount] = paletteIndex;
+ gWeatherPtr->lightenedFogSpritePalsCount++;
}
}
-/*static*/ bool8 LightenSpritePaletteInFog(u8 paletteIndex)
+static bool8 LightenSpritePaletteInFog(u8 paletteIndex)
{
u16 i;
- for (i = 0; i < gWeather.lightenedFogSpritePalsCount; i++)
+ for (i = 0; i < gWeatherPtr->lightenedFogSpritePalsCount; i++)
{
- if (gWeather.lightenedFogSpritePals[i] == paletteIndex)
+ if (gWeatherPtr->lightenedFogSpritePals[i] == paletteIndex)
return TRUE;
}
@@ -762,22 +705,22 @@ void ApplyFogBlend(u8 blendCoeff, u16 blendColor)
void sub_80ABC48(s8 gammaIndex)
{
- if (gWeather.palProcessingState == WEATHER_PAL_STATE_IDLE)
+ if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_IDLE)
{
ApplyGammaShift(0, 32, gammaIndex);
- gWeather.gammaIndex = gammaIndex;
+ gWeatherPtr->gammaIndex = gammaIndex;
}
}
void sub_80ABC7C(u8 gammaIndex, u8 gammaTargetIndex, u8 gammaStepDelay)
{
- if (gWeather.palProcessingState == WEATHER_PAL_STATE_IDLE)
+ if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_IDLE)
{
- gWeather.palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER;
- gWeather.gammaIndex = gammaIndex;
- gWeather.gammaTargetIndex = gammaTargetIndex;
- gWeather.gammaStepFrameCounter = 0;
- gWeather.gammaStepDelay = gammaStepDelay;
+ gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER;
+ gWeatherPtr->gammaIndex = gammaIndex;
+ gWeatherPtr->gammaTargetIndex = gammaTargetIndex;
+ gWeatherPtr->gammaStepFrameCounter = 0;
+ gWeatherPtr->gammaStepDelay = gammaStepDelay;
sub_80ABC48(gammaIndex);
}
}
@@ -810,7 +753,7 @@ void FadeScreen(u8 mode, s8 delay)
return;
}
- switch (gWeather.currWeather)
+ switch (gWeatherPtr->currWeather)
{
case WEATHER_RAIN_LIGHT:
case WEATHER_RAIN_MED:
@@ -832,27 +775,27 @@ void FadeScreen(u8 mode, s8 delay)
CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, 0x400);
BeginNormalPaletteFade(0xFFFFFFFF, delay, 0, 16, fadeColor);
- gWeather.palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT;
+ gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT;
}
else
{
- gWeather.fadeDestColor = fadeColor;
+ gWeatherPtr->fadeDestColor = fadeColor;
if (useWeatherPal)
- gWeather.fadeScreenCounter = 0;
+ gWeatherPtr->fadeScreenCounter = 0;
else
BeginNormalPaletteFade(0xFFFFFFFF, delay, 16, 0, fadeColor);
- gWeather.palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_IN;
- gWeather.unknown_6CA = 1;
- gWeather.unknown_6CB = 0;
- Weather_SetBlendCoeffs(gWeather.currBlendEVA, gWeather.currBlendEVB);
- gWeather.readyForInit = TRUE;
+ gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_IN;
+ gWeatherPtr->unknown_6CA = 1;
+ gWeatherPtr->unknown_6CB = 0;
+ Weather_SetBlendCoeffs(gWeatherPtr->currBlendEVA, gWeatherPtr->currBlendEVB);
+ gWeatherPtr->readyForInit = TRUE;
}
}
bool8 IsWeatherNotFadingIn(void)
{
- return (gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_IN);
+ return (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_IN);
}
void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex)
@@ -860,16 +803,16 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex)
u16 paletteIndex = 16 + spritePaletteIndex;
u16 i;
- switch (gWeather.palProcessingState)
+ switch (gWeatherPtr->palProcessingState)
{
case WEATHER_PAL_STATE_SCREEN_FADING_IN:
- if (gWeather.unknown_6CA != 0)
+ if (gWeatherPtr->unknown_6CA != 0)
{
- if (gWeather.currWeather == WEATHER_FOG_1)
+ if (gWeatherPtr->currWeather == WEATHER_FOG_1)
MarkFogSpritePalToLighten(paletteIndex);
paletteIndex *= 16;
for (i = 0; i < 16; i++)
- gPlttBufferFaded[paletteIndex + i] = gWeather.fadeDestColor;
+ gPlttBufferFaded[paletteIndex + i] = gWeatherPtr->fadeDestColor;
}
break;
case WEATHER_PAL_STATE_SCREEN_FADING_OUT:
@@ -880,9 +823,9 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex)
// WEATHER_PAL_STATE_CHANGING_WEATHER
// WEATHER_PAL_STATE_CHANGING_IDLE
default:
- if (gWeather.currWeather != WEATHER_FOG_1)
+ if (gWeatherPtr->currWeather != WEATHER_FOG_1)
{
- ApplyGammaShift(paletteIndex, 1, gWeather.gammaIndex);
+ ApplyGammaShift(paletteIndex, 1, gWeatherPtr->gammaIndex);
}
else
{
@@ -895,24 +838,24 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex)
void ApplyWeatherGammaShiftToPal(u8 paletteIndex)
{
- ApplyGammaShift(paletteIndex, 1, gWeather.gammaIndex);
+ ApplyGammaShift(paletteIndex, 1, gWeatherPtr->gammaIndex);
}
u8 sub_80ABF20(void)
{
- if (gWeather.palProcessingState == WEATHER_PAL_STATE_SCREEN_FADING_IN)
- return gWeather.unknown_6CA;
+ if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_SCREEN_FADING_IN)
+ return gWeatherPtr->unknown_6CA;
else
return 0;
}
void LoadCustomWeatherSpritePalette(const u16 *palette)
{
- LoadPalette(palette, 0x100 + gWeather.weatherPicSpritePalIndex * 16, 32);
- UpdateSpritePaletteWithWeather(gWeather.weatherPicSpritePalIndex);
+ LoadPalette(palette, 0x100 + gWeatherPtr->weatherPicSpritePalIndex * 16, 32);
+ UpdateSpritePaletteWithWeather(gWeatherPtr->weatherPicSpritePalIndex);
}
-void LoadDroughtWeatherPalette(u8 *gammaIndexPtr, u8 *a1)
+static void LoadDroughtWeatherPalette(u8 *gammaIndexPtr, u8 *a1)
{
*gammaIndexPtr = 0x20;
*a1 = 0x20;
@@ -920,16 +863,16 @@ void LoadDroughtWeatherPalette(u8 *gammaIndexPtr, u8 *a1)
void ResetDroughtWeatherPaletteLoading(void)
{
- gWeather.loadDroughtPalsIndex = 1;
- gWeather.loadDroughtPalsOffset = 1;
+ gWeatherPtr->loadDroughtPalsIndex = 1;
+ gWeatherPtr->loadDroughtPalsOffset = 1;
}
bool8 LoadDroughtWeatherPalettes(void)
{
- if (gWeather.loadDroughtPalsIndex < 32)
+ if (gWeatherPtr->loadDroughtPalsIndex < 32)
{
- LoadDroughtWeatherPalette(&gWeather.loadDroughtPalsIndex, &gWeather.loadDroughtPalsOffset);
- if (gWeather.loadDroughtPalsIndex < 32)
+ LoadDroughtWeatherPalette(&gWeatherPtr->loadDroughtPalsIndex, &gWeatherPtr->loadDroughtPalsOffset);
+ if (gWeatherPtr->loadDroughtPalsIndex < 32)
return TRUE;
}
return FALSE;
@@ -942,43 +885,43 @@ void sub_80ABFE0(s8 gammaIndex)
void sub_80ABFF0(void)
{
- gWeather.unknown_73C = 0;
- gWeather.unknown_740 = 0;
- gWeather.unknown_742 = 0;
- gWeather.unknown_73E = 0;
+ gWeatherPtr->unknown_73C = 0;
+ gWeatherPtr->unknown_740 = 0;
+ gWeatherPtr->unknown_742 = 0;
+ gWeatherPtr->unknown_73E = 0;
}
void sub_80AC01C(void)
{
- switch (gWeather.unknown_742)
+ switch (gWeatherPtr->unknown_742)
{
case 0:
- if (++gWeather.unknown_740 > 5)
+ if (++gWeatherPtr->unknown_740 > 5)
{
- gWeather.unknown_740 = 0;
- sub_80ABFE0(gWeather.unknown_73C++);
- if (gWeather.unknown_73C > 5)
+ gWeatherPtr->unknown_740 = 0;
+ sub_80ABFE0(gWeatherPtr->unknown_73C++);
+ if (gWeatherPtr->unknown_73C > 5)
{
- gWeather.unknown_73E = gWeather.unknown_73C;
- gWeather.unknown_742 = 1;
- gWeather.unknown_740 = 0x3C;
+ gWeatherPtr->unknown_73E = gWeatherPtr->unknown_73C;
+ gWeatherPtr->unknown_742 = 1;
+ gWeatherPtr->unknown_740 = 0x3C;
}
}
break;
case 1:
- gWeather.unknown_740 = (gWeather.unknown_740 + 3) & 0x7F;
- gWeather.unknown_73C = ((gSineTable[gWeather.unknown_740] - 1) >> 6) + 2;
- if (gWeather.unknown_73C != gWeather.unknown_73E)
- sub_80ABFE0(gWeather.unknown_73C);
- gWeather.unknown_73E = gWeather.unknown_73C;
+ gWeatherPtr->unknown_740 = (gWeatherPtr->unknown_740 + 3) & 0x7F;
+ gWeatherPtr->unknown_73C = ((gSineTable[gWeatherPtr->unknown_740] - 1) >> 6) + 2;
+ if (gWeatherPtr->unknown_73C != gWeatherPtr->unknown_73E)
+ sub_80ABFE0(gWeatherPtr->unknown_73C);
+ gWeatherPtr->unknown_73E = gWeatherPtr->unknown_73C;
break;
case 2:
- if (++gWeather.unknown_740 > 5)
+ if (++gWeatherPtr->unknown_740 > 5)
{
- gWeather.unknown_740 = 0;
- sub_80ABFE0(--gWeather.unknown_73C);
- if (gWeather.unknown_73C == 3)
- gWeather.unknown_742 = 0;
+ gWeatherPtr->unknown_740 = 0;
+ sub_80ABFE0(--gWeatherPtr->unknown_73C);
+ if (gWeatherPtr->unknown_73C == 3)
+ gWeatherPtr->unknown_742 = 0;
}
break;
}
@@ -986,54 +929,54 @@ void sub_80AC01C(void)
void Weather_SetBlendCoeffs(u8 eva, u8 evb)
{
- gWeather.currBlendEVA = eva;
- gWeather.currBlendEVB = evb;
- gWeather.targetBlendEVA = eva;
- gWeather.targetBlendEVB = evb;
+ gWeatherPtr->currBlendEVA = eva;
+ gWeatherPtr->currBlendEVB = evb;
+ gWeatherPtr->targetBlendEVA = eva;
+ gWeatherPtr->targetBlendEVB = evb;
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(eva, evb));
}
void Weather_SetTargetBlendCoeffs(u8 eva, u8 evb, int delay)
{
- gWeather.targetBlendEVA = eva;
- gWeather.targetBlendEVB = evb;
- gWeather.blendDelay = delay;
- gWeather.blendFrameCounter = 0;
- gWeather.blendUpdateCounter = 0;
+ gWeatherPtr->targetBlendEVA = eva;
+ gWeatherPtr->targetBlendEVB = evb;
+ gWeatherPtr->blendDelay = delay;
+ gWeatherPtr->blendFrameCounter = 0;
+ gWeatherPtr->blendUpdateCounter = 0;
}
bool8 Weather_UpdateBlend(void)
{
- if (gWeather.currBlendEVA == gWeather.targetBlendEVA
- && gWeather.currBlendEVB == gWeather.targetBlendEVB)
+ if (gWeatherPtr->currBlendEVA == gWeatherPtr->targetBlendEVA
+ && gWeatherPtr->currBlendEVB == gWeatherPtr->targetBlendEVB)
return TRUE;
- if (++gWeather.blendFrameCounter > gWeather.blendDelay)
+ if (++gWeatherPtr->blendFrameCounter > gWeatherPtr->blendDelay)
{
- gWeather.blendFrameCounter = 0;
- gWeather.blendUpdateCounter++;
+ gWeatherPtr->blendFrameCounter = 0;
+ gWeatherPtr->blendUpdateCounter++;
// Update currBlendEVA and currBlendEVB on alternate frames
- if (gWeather.blendUpdateCounter & 1)
+ if (gWeatherPtr->blendUpdateCounter & 1)
{
- if (gWeather.currBlendEVA < gWeather.targetBlendEVA)
- gWeather.currBlendEVA++;
- else if (gWeather.currBlendEVA > gWeather.targetBlendEVA)
- gWeather.currBlendEVA--;
+ if (gWeatherPtr->currBlendEVA < gWeatherPtr->targetBlendEVA)
+ gWeatherPtr->currBlendEVA++;
+ else if (gWeatherPtr->currBlendEVA > gWeatherPtr->targetBlendEVA)
+ gWeatherPtr->currBlendEVA--;
}
else
{
- if (gWeather.currBlendEVB < gWeather.targetBlendEVB)
- gWeather.currBlendEVB++;
- else if (gWeather.currBlendEVB > gWeather.targetBlendEVB)
- gWeather.currBlendEVB--;
+ if (gWeatherPtr->currBlendEVB < gWeatherPtr->targetBlendEVB)
+ gWeatherPtr->currBlendEVB++;
+ else if (gWeatherPtr->currBlendEVB > gWeatherPtr->targetBlendEVB)
+ gWeatherPtr->currBlendEVB--;
}
}
- SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gWeather.currBlendEVA, gWeather.currBlendEVB));
+ SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gWeatherPtr->currBlendEVA, gWeatherPtr->currBlendEVB));
- if (gWeather.currBlendEVA == gWeather.targetBlendEVA
- && gWeather.currBlendEVB == gWeather.targetBlendEVB)
+ if (gWeatherPtr->currBlendEVA == gWeatherPtr->targetBlendEVA
+ && gWeatherPtr->currBlendEVB == gWeatherPtr->targetBlendEVB)
return TRUE;
return FALSE;
@@ -1078,23 +1021,23 @@ void sub_80AC274(u8 a)
u8 GetCurrentWeather(void)
{
- return gWeather.currWeather;
+ return gWeatherPtr->currWeather;
}
void SetRainStrengthFromSoundEffect(u16 soundEffect)
{
- if (gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT)
+ if (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT)
{
switch (soundEffect)
{
case SE_T_KOAME:
- gWeather.rainStrength = 0;
+ gWeatherPtr->rainStrength = 0;
break;
case SE_T_OOAME:
- gWeather.rainStrength = 1;
+ gWeatherPtr->rainStrength = 1;
break;
case SE_T_AME:
- gWeather.rainStrength = 2;
+ gWeatherPtr->rainStrength = 2;
break;
default:
return;
@@ -1108,7 +1051,7 @@ void PlayRainSoundEffect(void)
{
if (IsSpecialSEPlaying())
{
- switch (gWeather.rainStrength)
+ switch (gWeatherPtr->rainStrength)
{
case 0:
PlaySE(SE_T_KOAME_E);
@@ -1126,24 +1069,24 @@ void PlayRainSoundEffect(void)
u8 IsWeatherChangeComplete(void)
{
- return gWeather.weatherChangeComplete;
+ return gWeatherPtr->weatherChangeComplete;
}
void SetWeatherScreenFadeOut(void)
{
- gWeather.palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT;
+ gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT;
}
void sub_80AC3E4(void)
{
- gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE;
+ gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
}
void PreservePaletteInWeather(u8 preservedPalIndex)
{
- CpuCopy16(sBasePaletteGammaTypes, gFieldEffectPaletteGammaTypes, 32);
- gFieldEffectPaletteGammaTypes[preservedPalIndex] = GAMMA_NONE;
- sPaletteGammaTypes = gFieldEffectPaletteGammaTypes;
+ CpuCopy16(sBasePaletteGammaTypes, sFieldEffectPaletteGammaTypes, 32);
+ sFieldEffectPaletteGammaTypes[preservedPalIndex] = GAMMA_NONE;
+ sPaletteGammaTypes = sFieldEffectPaletteGammaTypes;
}
void ResetPreservedPalettesInWeather(void)
diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c
index ad3e80cfa..88ebb1936 100644
--- a/src/field_weather_effect.c
+++ b/src/field_weather_effect.c
@@ -12,7 +12,14 @@
#include "trig.h"
#include "gpu_regs.h"
-const u16 gUnknown_083970E8[] = INCBIN_U16("graphics/weather/0.gbapal");
+// This file's functions.
+void sub_80AC6B4(struct Sprite *);
+
+// EWRAM
+EWRAM_DATA static u8 gUnknown_02038BC4 = 0;
+EWRAM_DATA static u16 gUnknown_02038BC6 = 0;
+
+// CONST
const u16 gUnknown_0854C290[] = INCBIN_U16("graphics/weather/1.gbapal");
const u16 gUnknown_0854C2B0[] = INCBIN_U16("graphics/weather/2.gbapal");
const u8 gWeatherFog2Tiles[] = INCBIN_U8("graphics/weather/fog2.4bpp");
@@ -25,16 +32,16 @@ const u8 gWeatherAshTiles[] = INCBIN_U8("graphics/weather/ash.4bpp");
const u8 gWeatherRainTiles[] = INCBIN_U8("graphics/weather/rain.4bpp");
const u8 gWeatherSandstormTiles[] = INCBIN_U8("graphics/weather/sandstorm.4bpp");
-/*static*/ const struct Coords16 gUnknown_0854FB50[] =
+static const struct Coords16 gUnknown_0854FB50[] =
{
{ 0, 66},
{ 5, 73},
{10, 78},
};
-/*static*/ const struct SpriteSheet sCloudSpriteSheet = {gWeatherCloudTiles, sizeof(gWeatherCloudTiles), 0x1200};
+static const struct SpriteSheet sCloudSpriteSheet = {gWeatherCloudTiles, sizeof(gWeatherCloudTiles), 0x1200};
-/*static*/ const struct OamData gOamData_839A9DC =
+static const struct OamData gOamData_839A9DC =
{
.y = 0,
.affineMode = 0,
@@ -51,19 +58,18 @@ const u8 gWeatherSandstormTiles[] = INCBIN_U8("graphics/weather/sandstorm.4bpp")
.affineParam = 0,
};
-/*static*/ const union AnimCmd gSpriteAnim_839A9E4[] =
+static const union AnimCmd gSpriteAnim_839A9E4[] =
{
ANIMCMD_FRAME(0, 16),
ANIMCMD_END,
};
-/*static*/ const union AnimCmd *const gSpriteAnimTable_839A9EC[] =
+static const union AnimCmd *const gSpriteAnimTable_839A9EC[] =
{
gSpriteAnim_839A9E4,
};
-void sub_80AC6B4(struct Sprite *);
-/*static*/ const struct SpriteTemplate sCloudSpriteTemplate =
+static const struct SpriteTemplate sCloudSpriteTemplate =
{
.tileTag = 4608,
.paletteTag = 4609,
@@ -74,15 +80,6 @@ void sub_80AC6B4(struct Sprite *);
.callback = sub_80AC6B4,
};
-extern void sub_80ABC48(s8 gammaIndex);
-extern void sub_80ABFF0(void);
-extern void sub_80AC01C(void);
-extern void Weather_SetTargetBlendCoeffs(u8 a, u8 b, int c);
-extern bool8 Weather_UpdateBlend(void);
-extern void SetRainStrengthFromSoundEffect(u16 sndEff);
-extern void sub_80ABC7C(u8 a, u8 b, u8 c);
-extern void sub_80AB104(u8);
-
//------------------------------------------------------------------------------
// Clouds
//------------------------------------------------------------------------------
@@ -97,8 +94,6 @@ void Clouds_InitVars(void)
Weather_SetBlendCoeffs(0, 16);
}
-void Clouds_Main(void);
-
void Clouds_InitAll(void)
{
Clouds_InitVars();
@@ -170,7 +165,7 @@ void Weather2_Main(void)
{
}
-int Weather2_Finish(void)
+bool8 Weather2_Finish(void)
{
return 0;
}
@@ -238,8 +233,6 @@ void Drought_InitVars(void)
gWeatherPtr->gammaStepDelay = 0;
}
-void Drought_Main(void);
-
void Drought_InitAll(void)
{
Drought_InitVars();
@@ -281,7 +274,7 @@ void Drought_Main(void)
}
}
-int Drought_Finish(void)
+bool8 Drought_Finish(void)
{
return 0;
}
@@ -370,8 +363,6 @@ void LightRain_InitVars(void)
SetRainStrengthFromSoundEffect(SE_T_KOAME);
}
-void LightRain_Main(void);
-
void LightRain_InitAll(void)
{
LightRain_InitVars();
@@ -551,7 +542,7 @@ void LoadRainSpriteSheet(void)
LoadSpriteSheet(&sRainSpriteSheet);
}
-/*static*/ const struct Coords16 sRainSpriteCoords[] =
+static const struct Coords16 sRainSpriteCoords[] =
{
{ 0, 0},
{ 0, 160},
@@ -579,7 +570,7 @@ void LoadRainSpriteSheet(void)
{ 48, 96},
};
-/*static*/ const struct OamData gOamData_839AA68 =
+static const struct OamData gOamData_839AA68 =
{
.y = 0,
.affineMode = 0,
@@ -596,13 +587,13 @@ void LoadRainSpriteSheet(void)
.affineParam = 0,
};
-/*static*/ const union AnimCmd gSpriteAnim_839AA70[] =
+static const union AnimCmd gSpriteAnim_839AA70[] =
{
ANIMCMD_FRAME(0, 16),
ANIMCMD_JUMP(0),
};
-/*static*/ const union AnimCmd gSpriteAnim_839AA78[] =
+static const union AnimCmd gSpriteAnim_839AA78[] =
{
ANIMCMD_FRAME(8, 3),
ANIMCMD_FRAME(32, 2),
@@ -610,7 +601,7 @@ void LoadRainSpriteSheet(void)
ANIMCMD_END,
};
-/*static*/ const union AnimCmd gSpriteAnim_839AA88[] =
+static const union AnimCmd gSpriteAnim_839AA88[] =
{
ANIMCMD_FRAME(8, 3),
ANIMCMD_FRAME(16, 3),
@@ -618,14 +609,14 @@ void LoadRainSpriteSheet(void)
ANIMCMD_END,
};
-/*static*/ const union AnimCmd *const gSpriteAnimTable_839AA98[] =
+static const union AnimCmd *const gSpriteAnimTable_839AA98[] =
{
gSpriteAnim_839AA70,
gSpriteAnim_839AA78,
gSpriteAnim_839AA88,
};
-/*static*/ const struct SpriteTemplate sRainSpriteTemplate =
+static const struct SpriteTemplate sRainSpriteTemplate =
{
.tileTag = 4614,
.paletteTag = 4608,
@@ -636,7 +627,6 @@ void LoadRainSpriteSheet(void)
.callback = sub_807E5C0,
};
-
const s16 gUnknown_0839AABC[][2] =
{
{-104, 208},
@@ -649,9 +639,9 @@ const u16 gUnknown_0839AAC4[][2] =
{12, 10},
};
-/*static*/ const struct SpriteSheet sRainSpriteSheet = {gWeatherRainTiles, sizeof(gWeatherRainTiles), 0x1206};
+static const struct SpriteSheet sRainSpriteSheet = {gWeatherRainTiles, sizeof(gWeatherRainTiles), 0x1206};
-/*static*/ const struct OamData gOamData_839AAD4 =
+static const struct OamData gOamData_839AAD4 =
{
.y = 0,
.affineMode = 0,
@@ -668,32 +658,32 @@ const u16 gUnknown_0839AAC4[][2] =
.affineParam = 0,
};
-/*static*/ const struct SpriteFrameImage gSpriteImageTable_839AADC[] =
+static const struct SpriteFrameImage gSpriteImageTable_839AADC[] =
{
{gWeatherSnow1Tiles, sizeof(gWeatherSnow1Tiles)},
{gWeatherSnow2Tiles, sizeof(gWeatherSnow2Tiles)},
};
-/*static*/ const union AnimCmd gSpriteAnim_839AAEC[] =
+static const union AnimCmd gSpriteAnim_839AAEC[] =
{
ANIMCMD_FRAME(0, 16),
ANIMCMD_END,
};
-/*static*/ const union AnimCmd gSpriteAnim_839AAF4[] =
+static const union AnimCmd gSpriteAnim_839AAF4[] =
{
ANIMCMD_FRAME(1, 16),
ANIMCMD_END,
};
-/*static*/ const union AnimCmd *const gSpriteAnimTable_839AAFC[] =
+static const union AnimCmd *const gSpriteAnimTable_839AAFC[] =
{
gSpriteAnim_839AAEC,
gSpriteAnim_839AAF4,
};
void sub_807ED48(struct Sprite *);
-/*static*/ const struct SpriteTemplate sSnowflakeSpriteTemplate =
+static const struct SpriteTemplate sSnowflakeSpriteTemplate =
{
.tileTag = 0xFFFF,
.paletteTag = 4608,
@@ -705,9 +695,9 @@ void sub_807ED48(struct Sprite *);
};
// unused data
-/*static*/ const u16 unusedData_839AB1C[] = {0, 6, 6, 12, 18, 42, 300, 300};
+static const u16 unusedData_839AB1C[] = {0, 6, 6, 12, 18, 42, 300, 300};
-/*static*/ const struct OamData gOamData_839AB2C =
+static const struct OamData gOamData_839AB2C =
{
.y = 0,
.affineMode = 0,
@@ -724,43 +714,43 @@ void sub_807ED48(struct Sprite *);
.affineParam = 0,
};
-/*static*/ const union AnimCmd gSpriteAnim_839AB34[] =
+static const union AnimCmd gSpriteAnim_839AB34[] =
{
ANIMCMD_FRAME(0, 16),
ANIMCMD_END,
};
-/*static*/ const union AnimCmd gSpriteAnim_839AB3C[] =
+static const union AnimCmd gSpriteAnim_839AB3C[] =
{
ANIMCMD_FRAME(32, 16),
ANIMCMD_END,
};
-/*static*/ const union AnimCmd gSpriteAnim_839AB44[] =
+static const union AnimCmd gSpriteAnim_839AB44[] =
{
ANIMCMD_FRAME(64, 16),
ANIMCMD_END,
};
-/*static*/ const union AnimCmd gSpriteAnim_839AB4C[] =
+static const union AnimCmd gSpriteAnim_839AB4C[] =
{
ANIMCMD_FRAME(96, 16),
ANIMCMD_END,
};
-/*static*/ const union AnimCmd gSpriteAnim_839AB54[] =
+static const union AnimCmd gSpriteAnim_839AB54[] =
{
ANIMCMD_FRAME(128, 16),
ANIMCMD_END,
};
-/*static*/ const union AnimCmd gSpriteAnim_839AB5C[] =
+static const union AnimCmd gSpriteAnim_839AB5C[] =
{
ANIMCMD_FRAME(160, 16),
ANIMCMD_END,
};
-/*static*/ const union AnimCmd *const gSpriteAnimTable_839AB64[] =
+static const union AnimCmd *const gSpriteAnimTable_839AB64[] =
{
gSpriteAnim_839AB34,
gSpriteAnim_839AB3C,
@@ -770,19 +760,19 @@ void sub_807ED48(struct Sprite *);
gSpriteAnim_839AB5C,
};
-/*static*/ const union AffineAnimCmd gSpriteAffineAnim_839AB7C[] =
+static const union AffineAnimCmd gSpriteAffineAnim_839AB7C[] =
{
AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0),
AFFINEANIMCMD_END,
};
-/*static*/ const union AffineAnimCmd *const gSpriteAffineAnimTable_839AB8C[] =
+static const union AffineAnimCmd *const gSpriteAffineAnimTable_839AB8C[] =
{
gSpriteAffineAnim_839AB7C,
};
-/*static*/ void Fog1SpriteCallback(struct Sprite *);
-/*static*/ const struct SpriteTemplate sFog1SpriteTemplate =
+static void Fog1SpriteCallback(struct Sprite *);
+static const struct SpriteTemplate sFog1SpriteTemplate =
{
.tileTag = 4609,
.paletteTag = 4608,
@@ -1286,8 +1276,8 @@ void UpdateThunderSound(void)
//------------------------------------------------------------------------------
void Fog1_Main(void);
-/*static*/ void CreateFog1Sprites(void);
-/*static*/ void DestroyFog1Sprites(void);
+static void CreateFog1Sprites(void);
+static void DestroyFog1Sprites(void);
void Fog1_InitVars(void)
{
@@ -1370,7 +1360,7 @@ bool8 Fog1_Finish(void)
#define sprColumn data[0]
-/*static*/ void Fog1SpriteCallback(struct Sprite *sprite)
+static void Fog1SpriteCallback(struct Sprite *sprite)
{
sprite->pos2.y = (u8)gSpriteCoordOffsetY;
sprite->pos1.x = gWeatherPtr->fog1ScrollPosX + 32 + sprite->sprColumn * 64;
@@ -1381,7 +1371,7 @@ bool8 Fog1_Finish(void)
}
}
-/*static*/ void CreateFog1Sprites(void)
+static void CreateFog1Sprites(void)
{
u16 i;
@@ -1414,7 +1404,7 @@ bool8 Fog1_Finish(void)
#undef sprColumn
-/*static*/ void DestroyFog1Sprites(void)
+static void DestroyFog1Sprites(void)
{
u16 i;
@@ -1513,7 +1503,7 @@ bool8 Ash_Finish(void)
return TRUE;
}
-/*static*/ const struct SpriteSheet sAshSpriteSheet = {gWeatherAshTiles, sizeof(gWeatherAshTiles), 0x1202};
+static const struct SpriteSheet sAshSpriteSheet = {gWeatherAshTiles, sizeof(gWeatherAshTiles), 0x1202};
void LoadAshSpriteSheet(void)
{
@@ -1550,7 +1540,7 @@ const union AnimCmd *const gSpriteAnimTable_839ABCC[] =
};
void sub_807FAA8(struct Sprite *);
-/*static*/ const struct SpriteTemplate sAshSpriteTemplate =
+static const struct SpriteTemplate sAshSpriteTemplate =
{
.tileTag = 4610,
.paletteTag = 4608,
@@ -2003,7 +1993,7 @@ const struct SpriteTemplate sSandstormSpriteTemplate =
.callback = SandstormSpriteCallback1,
};
-/*static*/ const struct SpriteSheet sSandstormSpriteSheet = {gWeatherSandstormTiles, sizeof(gWeatherSandstormTiles), 0x1204};
+static const struct SpriteSheet sSandstormSpriteSheet = {gWeatherSandstormTiles, sizeof(gWeatherSandstormTiles), 0x1204};
void CreateSandstormSprites_1(void)
{
@@ -2294,16 +2284,15 @@ void unc_0807DAB4(struct Sprite *sprite)
DestroySprite(sprite);
}
-// New Emerald functions.
-extern u8 gUnknown_02038BC4;
-extern u16 gUnknown_02038BC6;
-void sub_80AEC94(u32 a0, u32 a1)
+//------------------------------------------------------------------------------
+
+static void sub_80AEC94(u32 a0, u32 a1)
{
gUnknown_02038BC4 = a0;
gUnknown_02038BC6 = a1;
}
-void sub_80AECA8(u8 taskId)
+static void sub_80AECA8(u8 taskId)
{
s16 *data = gTasks[taskId].data;
@@ -2330,34 +2319,32 @@ void sub_80AECA8(u8 taskId)
}
}
-void sub_80AED28(void)
+static void sub_80AED28(void)
{
u8 taskId = CreateTask(sub_80AECA8, 0);
s16 *data = gTasks[taskId].data;
data[15] = 600;
- if (gUnknown_02038BC4 == 13)
+ if (gUnknown_02038BC4 == WEATHER_RAIN_HEAVY)
{
- data[1] = 12;
- data[2] = 13;
+ data[1] = WEATHER_DROUGHT;
+ data[2] = WEATHER_RAIN_HEAVY;
}
- else if (gUnknown_02038BC4 == 12)
+ else if (gUnknown_02038BC4 == WEATHER_DROUGHT)
{
- data[1] = 13;
- data[2] = 12;
+ data[1] = WEATHER_RAIN_HEAVY;
+ data[2] = WEATHER_DROUGHT;
}
else
{
- gUnknown_02038BC4 = 13;
- data[1] = 12;
- data[2] = 13;
+ gUnknown_02038BC4 = WEATHER_RAIN_HEAVY;
+ data[1] = WEATHER_DROUGHT;
+ data[2] = WEATHER_RAIN_HEAVY;
}
}
-//------------------------------------------------------------------------------
-
-/*static*/ u8 TranslateWeatherNum(u8);
-/*static*/ void UpdateRainCounter(u8, u8);
+static u8 TranslateWeatherNum(u8);
+static void UpdateRainCounter(u8, u8);
void SetSav1Weather(u32 weather)
{
@@ -2394,7 +2381,7 @@ void DoCurrentWeather(void)
{
u8 weather = GetSav1Weather();
- if (weather == 15)
+ if (weather == WEATHER_15)
{
if (!FuncIsActiveTask(sub_80AECA8))
sub_80AED28();
@@ -2404,7 +2391,7 @@ void DoCurrentWeather(void)
{
if (FuncIsActiveTask(sub_80AECA8))
DestroyTask(FindTaskIdByFunc(sub_80AECA8));
- gUnknown_02038BC4 = 13;
+ gUnknown_02038BC4 = WEATHER_RAIN_HEAVY;
}
ChangeWeather(weather);
}
@@ -2413,7 +2400,7 @@ void sub_80AEE84(void)
{
u8 weather = GetSav1Weather();
- if (weather == 15)
+ if (weather == WEATHER_15)
{
if (!FuncIsActiveTask(sub_80AECA8))
sub_80AED28();
@@ -2423,19 +2410,19 @@ void sub_80AEE84(void)
{
if (FuncIsActiveTask(sub_80AECA8))
DestroyTask(FindTaskIdByFunc(sub_80AECA8));
- gUnknown_02038BC4 = 13;
+ gUnknown_02038BC4 = WEATHER_RAIN_HEAVY;
}
sub_80AB104(weather);
}
-/*static*/ const u8 sWeatherCycleRoute119[] =
+static const u8 sWeatherCycleRoute119[] =
{
WEATHER_SUNNY,
WEATHER_RAIN_LIGHT,
WEATHER_RAIN_MED,
WEATHER_RAIN_LIGHT,
};
-/*static*/ const u8 sWeatherCycleRoute123[] =
+static const u8 sWeatherCycleRoute123[] =
{
WEATHER_SUNNY,
WEATHER_SUNNY,
@@ -2443,7 +2430,7 @@ void sub_80AEE84(void)
WEATHER_SUNNY,
};
-/*static*/ u8 TranslateWeatherNum(u8 weather)
+static u8 TranslateWeatherNum(u8 weather)
{
switch (weather)
{
@@ -2462,7 +2449,7 @@ void sub_80AEE84(void)
case WEATHER_DROUGHT: return WEATHER_DROUGHT;
case WEATHER_RAIN_HEAVY: return WEATHER_RAIN_HEAVY;
case WEATHER_BUBBLES: return WEATHER_BUBBLES;
- case 15: return 15;
+ case WEATHER_15: return WEATHER_15;
case WEATHER_ROUTE119_CYCLE: return sWeatherCycleRoute119[gSaveBlock1Ptr->weatherCycleStage];
case WEATHER_ROUTE123_CYCLE: return sWeatherCycleRoute123[gSaveBlock1Ptr->weatherCycleStage];
default: return WEATHER_NONE;
@@ -2476,7 +2463,7 @@ void UpdateWeatherPerDay(u16 increment)
gSaveBlock1Ptr->weatherCycleStage = weatherStage;
}
-/*static*/ void UpdateRainCounter(u8 newWeather, u8 oldWeather)
+static void UpdateRainCounter(u8 newWeather, u8 oldWeather)
{
if (newWeather != oldWeather
&& (newWeather == WEATHER_RAIN_LIGHT || newWeather == WEATHER_RAIN_MED))
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 12:45:19 +0000