dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix inconsistent static s/g names

Browse Source
This commit is contained in:
GriffinR
2022-05-17 13:51:54 -04:00
parent ef4d99c87e
commit 593e2c9be0
42 changed files with 528 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_weather_effect.c
+15 -15
View File
@@ -15,8 +15,8 @@
#include "gpu_regs.h"
// EWRAM
EWRAM_DATA static u8 gCurrentAbnormalWeather = 0;
EWRAM_DATA static u16 gUnusedWeatherRelated = 0;
EWRAM_DATA static u8 sCurrentAbnormalWeather = 0;
EWRAM_DATA static u16 sUnusedWeatherRelated = 0;
// CONST
const u16 gCloudsWeatherPalette[] = INCBIN_U16("graphics/weather/cloud.gbapal");
@@ -1815,7 +1815,7 @@ static void UpdateFogDiagonalMovement(void)
gWeatherPtr->fogDPosY = gSpriteCoordOffsetY + gWeatherPtr->fogDYOffset;
}
static const struct SpriteSheet gFogDiagonalSpriteSheet =
static const struct SpriteSheet sFogDiagonalSpriteSheet =
{
.data = gWeatherFogDiagonalTiles,
.size = sizeof(gWeatherFogDiagonalTiles),
@@ -1870,7 +1870,7 @@ static void CreateFogDiagonalSprites(void)
if (!gWeatherPtr->fogDSpritesCreated)
{
fogDiagonalSpriteSheet = gFogDiagonalSpriteSheet;
fogDiagonalSpriteSheet = sFogDiagonalSpriteSheet;
LoadSpriteSheet(&fogDiagonalSpriteSheet);
for (i = 0; i < NUM_FOG_DIAGONAL_SPRITES; i++)
{
@@ -2429,8 +2429,8 @@ static void UpdateBubbleSprite(struct Sprite *sprite)
// Unused function.
static void UnusedSetCurrentAbnormalWeather(u32 a0, u32 a1)
{
gCurrentAbnormalWeather = a0;
gUnusedWeatherRelated = a1;
sCurrentAbnormalWeather = a0;
sUnusedWeatherRelated = a1;
}
static void Task_DoAbnormalWeather(u8 taskId)
@@ -2443,7 +2443,7 @@ static void Task_DoAbnormalWeather(u8 taskId)
if (data[15]-- <= 0)
{
SetNextWeather(data[1]);
gCurrentAbnormalWeather = data[1];
sCurrentAbnormalWeather = data[1];
data[15] = 600;
data[0]++;
}
@@ -2452,7 +2452,7 @@ static void Task_DoAbnormalWeather(u8 taskId)
if (data[15]-- <= 0)
{
SetNextWeather(data[2]);
gCurrentAbnormalWeather = data[2];
sCurrentAbnormalWeather = data[2];
data[15] = 600;
data[0] = 0;
}
@@ -2466,19 +2466,19 @@ static void CreateAbnormalWeatherTask(void)
s16 *data = gTasks[taskId].data;
data[15] = 600;
if (gCurrentAbnormalWeather == WEATHER_DOWNPOUR)
if (sCurrentAbnormalWeather == WEATHER_DOWNPOUR)
{
data[1] = WEATHER_DROUGHT;
data[2] = WEATHER_DOWNPOUR;
}
else if (gCurrentAbnormalWeather == WEATHER_DROUGHT)
else if (sCurrentAbnormalWeather == WEATHER_DROUGHT)
{
data[1] = WEATHER_DOWNPOUR;
data[2] = WEATHER_DROUGHT;
}
else
{
gCurrentAbnormalWeather = WEATHER_DOWNPOUR;
sCurrentAbnormalWeather = WEATHER_DOWNPOUR;
data[1] = WEATHER_DROUGHT;
data[2] = WEATHER_DOWNPOUR;
}
@@ -2526,13 +2526,13 @@ void DoCurrentWeather(void)
{
if (!FuncIsActiveTask(Task_DoAbnormalWeather))
CreateAbnormalWeatherTask();
weather = gCurrentAbnormalWeather;
weather = sCurrentAbnormalWeather;
}
else
{
if (FuncIsActiveTask(Task_DoAbnormalWeather))
DestroyTask(FindTaskIdByFunc(Task_DoAbnormalWeather));
gCurrentAbnormalWeather = WEATHER_DOWNPOUR;
sCurrentAbnormalWeather = WEATHER_DOWNPOUR;
}
SetNextWeather(weather);
}
@@ -2545,13 +2545,13 @@ void ResumePausedWeather(void)
{
if (!FuncIsActiveTask(Task_DoAbnormalWeather))
CreateAbnormalWeatherTask();
weather = gCurrentAbnormalWeather;
weather = sCurrentAbnormalWeather;
}
else
{
if (FuncIsActiveTask(Task_DoAbnormalWeather))
DestroyTask(FindTaskIdByFunc(Task_DoAbnormalWeather));
gCurrentAbnormalWeather = WEATHER_DOWNPOUR;
sCurrentAbnormalWeather = WEATHER_DOWNPOUR;
}
SetCurrentAndNextWeather(weather);
}