ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-25 03:04:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finish documenting the other weather effects

Browse Source
This commit is contained in:
Marcus Huderle 2019-04-02 18:28:56 -05:00
parent 35505c7f5b
commit 1241700b20
7 changed files with 366 additions and 361 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/specials.inc
View File

@ -327,7 +327,7 @@ gSpecials:: @ 81DBA64
def_special SetUpTrainerMovement def_special SetUpTrainerMovement
def_special DoSealedChamberShakingEffect2 def_special DoSealedChamberShakingEffect2
def_special FoundBlackGlasses def_special FoundBlackGlasses
def_special sub_80AC81C def_special StartDroughtWeatherBlend
def_special DoDiveWarp def_special DoDiveWarp
def_special DoFallWarp def_special DoFallWarp
def_special ShowContestEntryMonPic def_special ShowContestEntryMonPic

19
graphics/weather/1.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
65 148 255
180 222 255
115 205 246
131 197 255
82 189 246
172 238 246
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

19
graphics/weather/2.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
0 0 0
255 230 139
189 131 74
238 197 123
213 164 98
164 106 49
255 246 164
222 205 164
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

59
include/field_weather.h
View File

@ -3,10 +3,13 @@
#include "sprite.h" #include "sprite.h"
#define MAX_RAIN_SPRITES 24 #define MAX_RAIN_SPRITES 24
#define NUM_CLOUD_SPRITES 3 #define NUM_CLOUD_SPRITES 3
#define NUM_FOG_SPRITES 20 #define NUM_FOG1_SPRITES 20
#define NUM_ASH_SPRITES 20 #define NUM_ASH_SPRITES 20
#define NUM_FOG2_SPRITES 20
#define NUM_SANDSTORM_SPRITES 20
#define NUM_SWIRL_SANDSTORM_SPRITES 5
// Controls how the weather should be changing the screen palettes. // Controls how the weather should be changing the screen palettes.
enum enum
@ -39,11 +42,11 @@ struct Weather
struct struct
{ {
u8 filler0[0xA0]; u8 filler0[0xA0];
struct Sprite *fog1Sprites[NUM_FOG_SPRITES]; struct Sprite *fog1Sprites[NUM_FOG1_SPRITES];
struct Sprite *ashSprites[NUM_ASH_SPRITES]; struct Sprite *ashSprites[NUM_ASH_SPRITES];
struct Sprite *fog2Sprites[20]; struct Sprite *fog2Sprites[NUM_FOG2_SPRITES];
struct Sprite *sandstormSprites1[20]; struct Sprite *sandstormSprites1[NUM_SANDSTORM_SPRITES];
struct Sprite *sandstormSprites2[5]; struct Sprite *sandstormSprites2[NUM_SWIRL_SANDSTORM_SPRITES];
} s2; } s2;
} sprites; } sprites;
u8 gammaShifts[19][32]; u8 gammaShifts[19][32];
@ -92,32 +95,32 @@ struct Weather
u8 lightenedFogSpritePals[6]; u8 lightenedFogSpritePals[6];
u8 lightenedFogSpritePalsCount; u8 lightenedFogSpritePalsCount;
u8 fog1SpritesCreated; u8 fog1SpritesCreated;
u16 baseAshSpritesX; u16 ashBaseSpritesX;
u16 unknown_6FE; u16 unknown_6FE;
u8 ashSpritesCreated; u8 ashSpritesCreated;
u8 filler_701[3]; u8 filler_701[3];
u32 unknown_704; u32 sandstormXOffset;
u32 unknown_708; u32 sandstormYOffset;
u8 filler_70C[2]; u8 filler_70C[2];
u16 unknown_70E; u16 sandstormBaseSpritesX;
u16 unknown_710; u16 sandstormPosY;
u16 unknown_712; u16 sandstormWaveIndex;
u16 unknown_714; u16 sandstormWaveCounter;
u8 sandstormSprites1Created; u8 sandstormSpritesCreated;
u8 sandstormSprites2Created; u8 sandstormSwirlSpritesCreated;
u16 unknown_718; u16 fog2BaseSpritesX;
u16 unknown_71A; u16 fog2PosY;
u16 unknown_71C; u16 fog2ScrollXCounter;
u16 unknown_71E; u16 fog2ScrollYCounter;
u16 unknown_720; u16 fog2XOffset;
u16 unknown_722; u16 fog2YOffset;
u8 fog2SpritesCreated; u8 fog2SpritesCreated;
u8 filler_725[1]; u8 filler_725[1];
u16 unknown_726; u16 bubblesDelayCounter;
u16 unknown_728; u16 bubblesDelayIndex;
u16 unknown_72A; u16 bubblesCoordsIndex;
u16 unknown_72C; u16 bubblesSpriteCount;
u8 unknown_72E; u8 bubblesSpritesCreated;
u8 filler_72F; u8 filler_72F;
u16 currBlendEVA; u16 currBlendEVA;
u16 currBlendEVB; u16 currBlendEVB;

19
src/cable_car.c
View File

@ -407,13 +407,12 @@ static void sub_81503E4(u8 taskId)
case WEATHER_ASH: case WEATHER_ASH:
if (gWeatherPtr->sprites.s2.ashSprites[0] != NULL && gWeatherPtr->sprites.s2.ashSprites[0]->oam.priority != 0) if (gWeatherPtr->sprites.s2.ashSprites[0] != NULL && gWeatherPtr->sprites.s2.ashSprites[0]->oam.priority != 0)
{ {
for (; i < 20; i++) for (; i < NUM_ASH_SPRITES; i++)
{ {
if (gWeatherPtr->sprites.s2.ashSprites[i] != NULL) if (gWeatherPtr->sprites.s2.ashSprites[i])
{
gWeatherPtr->sprites.s2.ashSprites[i]->oam.priority = 0; gWeatherPtr->sprites.s2.ashSprites[i]->oam.priority = 0;
}
} }
sCableCar->state = 2; sCableCar->state = 2;
} }
break; break;
@ -424,12 +423,10 @@ static void sub_81503E4(u8 taskId)
} }
else if (sCableCar->timer >= sCableCar->unk4 + 8) else if (sCableCar->timer >= sCableCar->unk4 + 8)
{ {
for (; i < 20; i++) for (; i < NUM_ASH_SPRITES; i++)
{ {
if (gWeatherPtr->sprites.s2.ashSprites[i] != NULL) if (gWeatherPtr->sprites.s2.ashSprites[i])
{ gWeatherPtr->sprites.s2.ashSprites[i]->invisible ^= 1;
gWeatherPtr->sprites.s2.ashSprites[i]->invisible ^= TRUE;
}
} }
} }
break; break;
@ -445,9 +442,7 @@ static void sub_81503E4(u8 taskId)
break; break;
case 3: case 3:
if (!gPaletteFade.active) if (!gPaletteFade.active)
{
sCableCar->state = 0xFF; sCableCar->state = 0xFF;
}
break; break;
case 0xFF: case 0xFF:
SetVBlankCallback(NULL); SetVBlankCallback(NULL);
@ -536,7 +531,7 @@ static void sub_8150664(u8 taskId)
if (sCableCar->timer < sCableCar->unk4) if (sCableCar->timer < sCableCar->unk4)
gSpriteCoordOffsetX = (gSpriteCoordOffsetX + 247) % 248; gSpriteCoordOffsetX = (gSpriteCoordOffsetX + 247) % 248;
else else
gWeatherPtr->unknown_6FC = (gWeatherPtr->unknown_6FC + 247) % 248; gWeatherPtr->ashBaseSpritesX = (gWeatherPtr->ashBaseSpritesX + 247) % 248;
} }
static void CableCarVblankCallback(void) static void CableCarVblankCallback(void)

6
src/field_weather.c
View File

@ -173,9 +173,9 @@ void StartWeather(void)
gWeatherPtr->ashSpritesCreated = 0; gWeatherPtr->ashSpritesCreated = 0;
gWeatherPtr->fog1SpritesCreated = 0; gWeatherPtr->fog1SpritesCreated = 0;
gWeatherPtr->fog2SpritesCreated = 0; gWeatherPtr->fog2SpritesCreated = 0;
gWeatherPtr->sandstormSprites1Created = 0; gWeatherPtr->sandstormSpritesCreated = 0;
gWeatherPtr->sandstormSprites2Created = 0; gWeatherPtr->sandstormSwirlSpritesCreated = 0;
gWeatherPtr->unknown_72E = 0; gWeatherPtr->bubblesSpritesCreated = 0;
gWeatherPtr->lightenedFogSpritePalsCount = 0; gWeatherPtr->lightenedFogSpritePalsCount = 0;
Weather_SetBlendCoeffs(16, 0); Weather_SetBlendCoeffs(16, 0);
gWeatherPtr->currWeather = 0; gWeatherPtr->currWeather = 0;

603
src/field_weather_effect.c
View File

@ -1,4 +1,5 @@
#include "global.h" #include "global.h"
#include "battle_anim.h"
#include "event_object_movement.h" #include "event_object_movement.h"
#include "field_weather.h" #include "field_weather.h"
#include "overworld.h" #include "overworld.h"
@ -17,8 +18,8 @@ EWRAM_DATA static u8 gCurrentAlternatingWeather = 0;
EWRAM_DATA static u16 gUnusedWeatherRelated = 0; EWRAM_DATA static u16 gUnusedWeatherRelated = 0;
// CONST // CONST
const u16 gUnknown_0854C290[] = INCBIN_U16("graphics/weather/1.gbapal"); const u16 gCloudsWeatherPalette[] = INCBIN_U16("graphics/weather/cloud.gbapal");
const u16 gUnknown_0854C2B0[] = INCBIN_U16("graphics/weather/2.gbapal"); const u16 gSandstormWeatherPalette[] = INCBIN_U16("graphics/weather/sandstorm.gbapal");
const u8 gWeatherFog2Tiles[] = INCBIN_U8("graphics/weather/fog2.4bpp"); const u8 gWeatherFog2Tiles[] = INCBIN_U8("graphics/weather/fog2.4bpp");
const u8 gWeatherFog1Tiles[] = INCBIN_U8("graphics/weather/fog1.4bpp"); const u8 gWeatherFog1Tiles[] = INCBIN_U8("graphics/weather/fog1.4bpp");
const u8 gWeatherCloudTiles[] = INCBIN_U8("graphics/weather/cloud.4bpp"); const u8 gWeatherCloudTiles[] = INCBIN_U8("graphics/weather/cloud.4bpp");
@ -180,7 +181,7 @@ static void CreateCloudSprites(void)
return; return;
LoadSpriteSheet(&sCloudSpriteSheet); LoadSpriteSheet(&sCloudSpriteSheet);
LoadCustomWeatherSpritePalette(gUnknown_0854C290); LoadCustomWeatherSpritePalette(gCloudsWeatherPalette);
for (i = 0; i < NUM_CLOUD_SPRITES; i++) for (i = 0; i < NUM_CLOUD_SPRITES; i++)
{ {
spriteId = CreateSprite(&sCloudSpriteTemplate, 0, 0, 0xFF); spriteId = CreateSprite(&sCloudSpriteTemplate, 0, 0, 0xFF);
@ -229,6 +230,8 @@ static void UpdateCloudSprite(struct Sprite *sprite)
// Drought // Drought
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
static void UpdateDroughtBlend(u8);
void Drought_InitVars(void) void Drought_InitVars(void)
{ {
gWeatherPtr->initStep = 0; gWeatherPtr->initStep = 0;
@ -280,14 +283,12 @@ void Drought_Main(void)
bool8 Drought_Finish(void) bool8 Drought_Finish(void)
{ {
return 0; return FALSE;
} }
void task50_0807B6D4(u8); void StartDroughtWeatherBlend(void)
void sub_80AC81C(void)
{ {
CreateTask(task50_0807B6D4, 0x50); CreateTask(UpdateDroughtBlend, 0x50);
} }
#define tState data[0] #define tState data[0]
@ -295,7 +296,7 @@ void sub_80AC81C(void)
#define tBlendDelay data[2] #define tBlendDelay data[2]
#define tWinRange data[3] #define tWinRange data[3]
void task50_0807B6D4(u8 taskId) static void UpdateDroughtBlend(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
@ -1436,7 +1437,7 @@ static void CreateFog1Sprites(void)
.tag = 0x1201, .tag = 0x1201,
}; };
LoadSpriteSheet(&fog1SpriteSheet); LoadSpriteSheet(&fog1SpriteSheet);
for (i = 0; i < NUM_FOG_SPRITES; i++) for (i = 0; i < NUM_FOG1_SPRITES; i++)
{ {
spriteId = CreateSpriteAtEnd(&sFog1SpriteTemplate, 0, 0, 0xFF); spriteId = CreateSpriteAtEnd(&sFog1SpriteTemplate, 0, 0, 0xFF);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
@ -1463,7 +1464,7 @@ static void DestroyFog1Sprites(void)
if (gWeatherPtr->fog1SpritesCreated) if (gWeatherPtr->fog1SpritesCreated)
{ {
for (i = 0; i < NUM_FOG_SPRITES; i++) for (i = 0; i < NUM_FOG1_SPRITES; i++)
{ {
if (gWeatherPtr->sprites.s2.fog1Sprites[i] != NULL) if (gWeatherPtr->sprites.s2.fog1Sprites[i] != NULL)
DestroySprite(gWeatherPtr->sprites.s2.fog1Sprites[i]); DestroySprite(gWeatherPtr->sprites.s2.fog1Sprites[i]);
@ -1508,9 +1509,9 @@ void Ash_InitAll(void)
void Ash_Main(void) void Ash_Main(void)
{ {
gWeatherPtr->baseAshSpritesX = gSpriteCoordOffsetX & 0x1FF; gWeatherPtr->ashBaseSpritesX = gSpriteCoordOffsetX & 0x1FF;
while (gWeatherPtr->baseAshSpritesX >= 240) while (gWeatherPtr->ashBaseSpritesX >= 240)
gWeatherPtr->baseAshSpritesX -= 240; gWeatherPtr->ashBaseSpritesX -= 240;
switch (gWeatherPtr->initStep) switch (gWeatherPtr->initStep)
{ {
@ -1676,10 +1677,10 @@ static void UpdateAshSprite(struct Sprite *sprite)
} }
sprite->pos1.y = gSpriteCoordOffsetY + sprite->tOffsetY; sprite->pos1.y = gSpriteCoordOffsetY + sprite->tOffsetY;
sprite->pos1.x = gWeatherPtr->baseAshSpritesX + 32 + sprite->tSpriteColumn * 64; sprite->pos1.x = gWeatherPtr->ashBaseSpritesX + 32 + sprite->tSpriteColumn * 64;
if (sprite->pos1.x > 271) if (sprite->pos1.x > 271)
{ {
sprite->pos1.x = gWeatherPtr->baseAshSpritesX + 480 - (4 - sprite->tSpriteColumn) * 64; sprite->pos1.x = gWeatherPtr->ashBaseSpritesX + 480 - (4 - sprite->tSpriteColumn) * 64;
sprite->pos1.x &= 0x1FF; sprite->pos1.x &= 0x1FF;
} }
} }
@ -1693,6 +1694,11 @@ static void UpdateAshSprite(struct Sprite *sprite)
// Fog 2 // Fog 2
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
static void UpdateFog2Movement(void);
static void CreateFog2Sprites(void);
static void DestroyFog2Sprites(void);
static void UpdateFog2Sprite(struct Sprite *);
void Fog2_InitVars(void) void Fog2_InitVars(void)
{ {
gWeatherPtr->initStep = 0; gWeatherPtr->initStep = 0;
@ -1701,20 +1707,18 @@ void Fog2_InitVars(void)
gWeatherPtr->gammaStepDelay = 20; gWeatherPtr->gammaStepDelay = 20;
gWeatherPtr->fog1ScrollCounter = 0; gWeatherPtr->fog1ScrollCounter = 0;
gWeatherPtr->fog1ScrollOffset = 1; gWeatherPtr->fog1ScrollOffset = 1;
if (gWeatherPtr->fog2SpritesCreated == 0) if (!gWeatherPtr->fog2SpritesCreated)
{ {
gWeatherPtr->unknown_71C = 0; gWeatherPtr->fog2ScrollXCounter = 0;
gWeatherPtr->unknown_71E = 0; gWeatherPtr->fog2ScrollYCounter = 0;
gWeatherPtr->unknown_720 = 0; gWeatherPtr->fog2XOffset = 0;
gWeatherPtr->unknown_722 = 0; gWeatherPtr->fog2YOffset = 0;
gWeatherPtr->unknown_718 = 0; gWeatherPtr->fog2BaseSpritesX = 0;
gWeatherPtr->unknown_71A = 0; gWeatherPtr->fog2PosY = 0;
Weather_SetBlendCoeffs(0, 16); Weather_SetBlendCoeffs(0, 16);
} }
} }
void Fog2_Main(void);
void Fog2_InitAll(void) void Fog2_InitAll(void)
{ {
Fog2_InitVars(); Fog2_InitVars();
@ -1722,12 +1726,9 @@ void Fog2_InitAll(void)
Fog2_Main(); Fog2_Main();
} }
void sub_807FC9C(void);
void CreateFog2Sprites(void);
void Fog2_Main(void) void Fog2_Main(void)
{ {
sub_807FC9C(); UpdateFog2Movement();
switch (gWeatherPtr->initStep) switch (gWeatherPtr->initStep)
{ {
case 0: case 0:
@ -1747,11 +1748,9 @@ void Fog2_Main(void)
} }
} }
void DestroyFog2Sprites(void);
bool8 Fog2_Finish(void) bool8 Fog2_Finish(void)
{ {
sub_807FC9C(); UpdateFog2Movement();
switch (gWeatherPtr->finishStep) switch (gWeatherPtr->finishStep)
{ {
case 0: case 0:
@ -1773,57 +1772,32 @@ bool8 Fog2_Finish(void)
return TRUE; return TRUE;
} }
void sub_807FC9C(void) static void UpdateFog2Movement(void)
{ {
if (++gWeatherPtr->unknown_71C > 2) if (++gWeatherPtr->fog2ScrollXCounter > 2)
{ {
gWeatherPtr->unknown_720++; gWeatherPtr->fog2XOffset++;
gWeatherPtr->unknown_71C = 0; gWeatherPtr->fog2ScrollXCounter = 0;
} }
if (++gWeatherPtr->unknown_71E > 4) if (++gWeatherPtr->fog2ScrollYCounter > 4)
{ {
gWeatherPtr->unknown_722++; gWeatherPtr->fog2YOffset++;
gWeatherPtr->unknown_71E = 0; gWeatherPtr->fog2ScrollYCounter = 0;
} }
gWeatherPtr->unknown_718 = (gSpriteCoordOffsetX - gWeatherPtr->unknown_720) & 0xFF; gWeatherPtr->fog2BaseSpritesX = (gSpriteCoordOffsetX - gWeatherPtr->fog2XOffset) & 0xFF;
gWeatherPtr->unknown_71A = gSpriteCoordOffsetY + gWeatherPtr->unknown_722; gWeatherPtr->fog2PosY = gSpriteCoordOffsetY + gWeatherPtr->fog2YOffset;
} }
extern const struct SpriteTemplate sFog2SpriteTemplate; // defined below static const struct SpriteSheet gFog2SpriteSheet =
void CreateFog2Sprites(void)
{ {
u16 i; .data = gWeatherFog2Tiles,
.size = sizeof(gWeatherFog2Tiles),
.tag = 0x1203,
};
if (!gWeatherPtr->fog2SpritesCreated) static const struct OamData sFog2SpriteOamData =
{
struct SpriteSheet fog2SpriteSheet = {gWeatherFog2Tiles, sizeof(gWeatherFog2Tiles), 0x1203};
LoadSpriteSheet(&fog2SpriteSheet);
for (i = 0; i < 20; i++)
{
u8 spriteId = CreateSpriteAtEnd(&sFog2SpriteTemplate, 0, (i / 5) * 64, 0xFF);
if (spriteId != MAX_SPRITES)
{
struct Sprite *sprite = &gSprites[spriteId];
sprite->data[0] = i % 5;
sprite->data[1] = i / 5;
gWeatherPtr->sprites.s2.fog2Sprites[i] = sprite;
}
else
{
gWeatherPtr->sprites.s2.fog2Sprites[i] = NULL;
}
}
gWeatherPtr->fog2SpritesCreated = TRUE;
}
}
const struct OamData gOamData_839ABF0 =
{ {
.y = 0, .y = 0,
.affineMode = 0, .affineMode = 0,
@ -1840,103 +1814,146 @@ const struct OamData gOamData_839ABF0 =
.affineParam = 0, .affineParam = 0,
}; };
const union AnimCmd gSpriteAnim_839ABF8[] = static const union AnimCmd sFog2SpriteAnimCmd0[] =
{ {
ANIMCMD_FRAME(0, 16), ANIMCMD_FRAME(0, 16),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gSpriteAnimTable_839AC00[] = static const union AnimCmd *const sFog2SpriteAnimCmds[] =
{ {
gSpriteAnim_839ABF8, sFog2SpriteAnimCmd0,
}; };
void Fog2SpriteCallback(struct Sprite *); static const struct SpriteTemplate sFog2SpriteTemplate =
const struct SpriteTemplate sFog2SpriteTemplate =
{ {
.tileTag = 4611, .tileTag = 0x1203,
.paletteTag = 0x1200, .paletteTag = 0x1200,
.oam = &gOamData_839ABF0, .oam = &sFog2SpriteOamData,
.anims = gSpriteAnimTable_839AC00, .anims = sFog2SpriteAnimCmds,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = Fog2SpriteCallback, .callback = UpdateFog2Sprite,
}; };
void DestroyFog2Sprites(void) #define tSpriteColumn data[0]
#define tSpriteRow data[1]
static void CreateFog2Sprites(void)
{
u16 i;
struct SpriteSheet fog2SpriteSheet;
u8 spriteId;
struct Sprite *sprite;
if (!gWeatherPtr->fog2SpritesCreated)
{
fog2SpriteSheet = gFog2SpriteSheet;
LoadSpriteSheet(&fog2SpriteSheet);
for (i = 0; i < NUM_FOG2_SPRITES; i++)
{
spriteId = CreateSpriteAtEnd(&sFog2SpriteTemplate, 0, (i / 5) * 64, 0xFF);
if (spriteId != MAX_SPRITES)
{
sprite = &gSprites[spriteId];
sprite->tSpriteColumn = i % 5;
sprite->tSpriteRow = i / 5;
gWeatherPtr->sprites.s2.fog2Sprites[i] = sprite;
}
else
{
gWeatherPtr->sprites.s2.fog2Sprites[i] = NULL;
}
}
gWeatherPtr->fog2SpritesCreated = TRUE;
}
}
static void DestroyFog2Sprites(void)
{ {
u16 i; u16 i;
if (gWeatherPtr->fog2SpritesCreated) if (gWeatherPtr->fog2SpritesCreated)
{ {
for (i = 0; i < 20; i++) for (i = 0; i < NUM_FOG2_SPRITES; i++)
{ {
if (gWeatherPtr->sprites.s2.fog2Sprites[i] != NULL) if (gWeatherPtr->sprites.s2.fog2Sprites[i])
DestroySprite(gWeatherPtr->sprites.s2.fog2Sprites[i]); DestroySprite(gWeatherPtr->sprites.s2.fog2Sprites[i]);
} }
FreeSpriteTilesByTag(0x1203); FreeSpriteTilesByTag(0x1203);
gWeatherPtr->fog2SpritesCreated = FALSE; gWeatherPtr->fog2SpritesCreated = FALSE;
} }
} }
void Fog2SpriteCallback(struct Sprite *sprite) static void UpdateFog2Sprite(struct Sprite *sprite)
{ {
sprite->pos2.y = gWeatherPtr->unknown_71A; sprite->pos2.y = gWeatherPtr->fog2PosY;
sprite->pos1.x = gWeatherPtr->unknown_718 + 32 + sprite->data[0] * 64; sprite->pos1.x = gWeatherPtr->fog2BaseSpritesX + 32 + sprite->tSpriteColumn * 64;
if (sprite->pos1.x > 271) if (sprite->pos1.x > 271)
{ {
sprite->pos1.x = gWeatherPtr->unknown_718 + 0x1E0 - (4 - sprite->data[0]) * 64; sprite->pos1.x = gWeatherPtr->fog2BaseSpritesX + 480 - (4 - sprite->tSpriteColumn) * 64;
sprite->pos1.x &= 0x1FF; sprite->pos1.x &= 0x1FF;
} }
} }
#undef tSpriteColumn
#undef tSpriteRow
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Sandstorm // Sandstorm
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
static void UpdateSandstormWaveIndex(void);
static void UpdateSandstormMovement(void);
static void CreateSandstormSprites(void);
static void CreateSwirlSandstormSprites(void);
static void DestroySandstormSprites(void);
static void UpdateSandstormSprite(struct Sprite *);
static void WaitSandSwirlSpriteEntrance(struct Sprite *);
static void UpdateSandstormSwirlSprite(struct Sprite *);
#define MIN_SANDSTORM_WAVE_INDEX 0x20
void Sandstorm_InitVars(void) void Sandstorm_InitVars(void)
{ {
gWeatherPtr->initStep = 0; gWeatherPtr->initStep = 0;
gWeatherPtr->weatherGfxLoaded = 0; gWeatherPtr->weatherGfxLoaded = 0;
gWeatherPtr->gammaTargetIndex = 0; gWeatherPtr->gammaTargetIndex = 0;
gWeatherPtr->gammaStepDelay = 20; gWeatherPtr->gammaStepDelay = 20;
if (gWeatherPtr->sandstormSprites1Created == 0) if (!gWeatherPtr->sandstormSpritesCreated)
{ {
gWeatherPtr->unknown_704 = gWeatherPtr->unknown_708 = 0; gWeatherPtr->sandstormXOffset = gWeatherPtr->sandstormYOffset = 0;
gWeatherPtr->unknown_712 = 8; gWeatherPtr->sandstormWaveIndex = 8;
gWeatherPtr->unknown_714 = 0; gWeatherPtr->sandstormWaveCounter = 0;
// Dead code. How does the compiler not optimize this out? // Dead code. How does the compiler not optimize this out?
if (gWeatherPtr->unknown_712 > 0x5F) if (gWeatherPtr->sandstormWaveIndex >= 0x80 - MIN_SANDSTORM_WAVE_INDEX)
gWeatherPtr->unknown_712 = 0x80 - gWeatherPtr->unknown_712; gWeatherPtr->sandstormWaveIndex = 0x80 - gWeatherPtr->sandstormWaveIndex;
Weather_SetBlendCoeffs(0, 16); Weather_SetBlendCoeffs(0, 16);
} }
} }
void Sandstorm_Main(void);
void Sandstorm_InitAll(void) void Sandstorm_InitAll(void)
{ {
Sandstorm_InitVars(); Sandstorm_InitVars();
while (gWeatherPtr->weatherGfxLoaded == FALSE) while (!gWeatherPtr->weatherGfxLoaded)
Sandstorm_Main(); Sandstorm_Main();
} }
void sub_808002C(void);
void sub_8080064(void);
void CreateSandstormSprites_1(void);
void CreateSandstormSprites_2(void);
void Sandstorm_Main(void) void Sandstorm_Main(void)
{ {
sub_8080064(); UpdateSandstormMovement();
sub_808002C(); UpdateSandstormWaveIndex();
if (gWeatherPtr->unknown_712 > 0x5F) if (gWeatherPtr->sandstormWaveIndex >= 0x80 - MIN_SANDSTORM_WAVE_INDEX)
gWeatherPtr->unknown_712 = 32; gWeatherPtr->sandstormWaveIndex = MIN_SANDSTORM_WAVE_INDEX;
switch (gWeatherPtr->initStep) switch (gWeatherPtr->initStep)
{ {
case 0: case 0:
CreateSandstormSprites_1(); CreateSandstormSprites();
CreateSandstormSprites_2(); CreateSwirlSandstormSprites();
gWeatherPtr->initStep++; gWeatherPtr->initStep++;
break; break;
case 1: case 1:
@ -1944,20 +1961,19 @@ void Sandstorm_Main(void)
gWeatherPtr->initStep++; gWeatherPtr->initStep++;
break; break;
case 2: case 2:
if (!Weather_UpdateBlend()) if (Weather_UpdateBlend())
break; {
gWeatherPtr->weatherGfxLoaded = TRUE; gWeatherPtr->weatherGfxLoaded = TRUE;
gWeatherPtr->initStep++; gWeatherPtr->initStep++;
}
break; break;
} }
} }
void sub_80800E4(void);
bool8 Sandstorm_Finish(void) bool8 Sandstorm_Finish(void)
{ {
sub_8080064(); UpdateSandstormMovement();
sub_808002C(); UpdateSandstormWaveIndex();
switch (gWeatherPtr->finishStep) switch (gWeatherPtr->finishStep)
{ {
case 0: case 0:
@ -1965,64 +1981,66 @@ bool8 Sandstorm_Finish(void)
gWeatherPtr->finishStep++; gWeatherPtr->finishStep++;
break; break;
case 1: case 1:
if (!Weather_UpdateBlend()) if (Weather_UpdateBlend())
break; gWeatherPtr->finishStep++;
gWeatherPtr->finishStep++;
break; break;
case 2: case 2:
sub_80800E4(); DestroySandstormSprites();
gWeatherPtr->finishStep++; gWeatherPtr->finishStep++;
break; break;
default: default:
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
} }
void sub_808002C(void) static void UpdateSandstormWaveIndex(void)
{ {
if (gWeatherPtr->unknown_714++ > 4) if (gWeatherPtr->sandstormWaveCounter++ > 4)
{ {
gWeatherPtr->unknown_712++; gWeatherPtr->sandstormWaveIndex++;
gWeatherPtr->unknown_714 = 0; gWeatherPtr->sandstormWaveCounter = 0;
} }
} }
void sub_8080064(void) static void UpdateSandstormMovement(void)
{ {
gWeatherPtr->unknown_704 -= gSineTable[gWeatherPtr->unknown_712] * 4; gWeatherPtr->sandstormXOffset -= gSineTable[gWeatherPtr->sandstormWaveIndex] * 4;
gWeatherPtr->unknown_708 -= gSineTable[gWeatherPtr->unknown_712]; gWeatherPtr->sandstormYOffset -= gSineTable[gWeatherPtr->sandstormWaveIndex];
gWeatherPtr->unknown_70E = (gSpriteCoordOffsetX + (gWeatherPtr->unknown_704 >> 8)) & 0xFF; gWeatherPtr->sandstormBaseSpritesX = (gSpriteCoordOffsetX + (gWeatherPtr->sandstormXOffset >> 8)) & 0xFF;
gWeatherPtr->unknown_710 = gSpriteCoordOffsetY + (gWeatherPtr->unknown_708 >> 8); gWeatherPtr->sandstormPosY = gSpriteCoordOffsetY + (gWeatherPtr->sandstormYOffset >> 8);
} }
void sub_80800E4(void) static void DestroySandstormSprites(void)
{ {
u16 i; u16 i;
if (gWeatherPtr->sandstormSprites1Created) if (gWeatherPtr->sandstormSpritesCreated)
{ {
for (i = 0; i < 20; i++) for (i = 0; i < NUM_SANDSTORM_SPRITES; i++)
{ {
if (gWeatherPtr->sprites.s2.sandstormSprites1[i] != NULL) if (gWeatherPtr->sprites.s2.sandstormSprites1[i])
DestroySprite(gWeatherPtr->sprites.s2.sandstormSprites1[i]); DestroySprite(gWeatherPtr->sprites.s2.sandstormSprites1[i]);
} }
gWeatherPtr->sandstormSprites1Created = FALSE;
gWeatherPtr->sandstormSpritesCreated = FALSE;
FreeSpriteTilesByTag(0x1204); FreeSpriteTilesByTag(0x1204);
} }
if (gWeatherPtr->sandstormSprites2Created) if (gWeatherPtr->sandstormSwirlSpritesCreated)
{ {
for (i = 0; i < 5; i++) for (i = 0; i < NUM_SWIRL_SANDSTORM_SPRITES; i++)
{ {
if (gWeatherPtr->sprites.s2.sandstormSprites2[i] != NULL) if (gWeatherPtr->sprites.s2.sandstormSprites2[i] != NULL)
DestroySprite(gWeatherPtr->sprites.s2.sandstormSprites2[i]); DestroySprite(gWeatherPtr->sprites.s2.sandstormSprites2[i]);
} }
gWeatherPtr->sandstormSprites2Created = FALSE;
gWeatherPtr->sandstormSwirlSpritesCreated = FALSE;
} }
} }
const struct OamData gOamData_839AC1C = static const struct OamData sSandstormSpriteOamData =
{ {
.y = 0, .y = 0,
.affineMode = 0, .affineMode = 0,
@ -2039,142 +2057,162 @@ const struct OamData gOamData_839AC1C =
.affineParam = 0, .affineParam = 0,
}; };
const union AnimCmd gSpriteAnim_839AC24[] = static const union AnimCmd sSandstormSpriteAnimCmd0[] =
{ {
ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(0, 3),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gSpriteAnim_839AC2C[] = static const union AnimCmd sSandstormSpriteAnimCmd1[] =
{ {
ANIMCMD_FRAME(64, 3), ANIMCMD_FRAME(64, 3),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gSpriteAnimTable_839AC34[] = static const union AnimCmd *const sSandstormSpriteAnimCmds[] =
{ {
gSpriteAnim_839AC24, sSandstormSpriteAnimCmd0,
gSpriteAnim_839AC2C, sSandstormSpriteAnimCmd1,
}; };
void SandstormSpriteCallback1(struct Sprite *); static const struct SpriteTemplate sSandstormSpriteTemplate =
const struct SpriteTemplate sSandstormSpriteTemplate =
{ {
.tileTag = 0x1204, .tileTag = 0x1204,
.paletteTag = 0x1201, .paletteTag = 0x1201,
.oam = &gOamData_839AC1C, .oam = &sSandstormSpriteOamData,
.anims = gSpriteAnimTable_839AC34, .anims = sSandstormSpriteAnimCmds,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = SandstormSpriteCallback1, .callback = UpdateSandstormSprite,
}; };
static const struct SpriteSheet sSandstormSpriteSheet = {gWeatherSandstormTiles, sizeof(gWeatherSandstormTiles), 0x1204}; static const struct SpriteSheet sSandstormSpriteSheet =
{
.data = gWeatherSandstormTiles,
.size = sizeof(gWeatherSandstormTiles),
.tag = 0x1204,
};
void CreateSandstormSprites_1(void) // Regular sandstorm sprites
#define tSpriteColumn data[0]
#define tSpriteRow data[1]
// Swirly sandstorm sprites
#define tRadius data[0]
#define tWaveIndex data[1]
#define tRadiusCounter data[2]
#define tEntranceDelay data[3]
static void CreateSandstormSprites(void)
{ {
u16 i; u16 i;
u8 spriteId;
if (!gWeatherPtr->sandstormSprites1Created) if (!gWeatherPtr->sandstormSpritesCreated)
{ {
LoadSpriteSheet(&sSandstormSpriteSheet); LoadSpriteSheet(&sSandstormSpriteSheet);
LoadCustomWeatherSpritePalette(gUnknown_0854C2B0); LoadCustomWeatherSpritePalette(gSandstormWeatherPalette);
for (i = 0; i < 20; i++) for (i = 0; i < NUM_SANDSTORM_SPRITES; i++)
{ {
u8 spriteId = CreateSpriteAtEnd(&sSandstormSpriteTemplate, 0, (i / 5) * 64, 1); spriteId = CreateSpriteAtEnd(&sSandstormSpriteTemplate, 0, (i / 5) * 64, 1);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
gWeatherPtr->sprites.s2.sandstormSprites1[i] = &gSprites[spriteId]; gWeatherPtr->sprites.s2.sandstormSprites1[i] = &gSprites[spriteId];
gWeatherPtr->sprites.s2.sandstormSprites1[i]->data[0] = i % 5; gWeatherPtr->sprites.s2.sandstormSprites1[i]->tSpriteColumn = i % 5;
gWeatherPtr->sprites.s2.sandstormSprites1[i]->data[1] = i / 5; gWeatherPtr->sprites.s2.sandstormSprites1[i]->tSpriteRow = i / 5;
} }
else else
{ {
gWeatherPtr->sprites.s2.sandstormSprites1[i] = NULL; gWeatherPtr->sprites.s2.sandstormSprites1[i] = NULL;
} }
} }
gWeatherPtr->sandstormSprites1Created = TRUE;
gWeatherPtr->sandstormSpritesCreated = TRUE;
} }
} }
const u16 gUnknown_0839AC5C[] = {0, 120, 80, 160, 40, 0}; static const u16 sSwirlEntranceDelays[] = {0, 120, 80, 160, 40, 0};
void SandstormSpriteCallback2(struct Sprite *); static void CreateSwirlSandstormSprites(void)
void CreateSandstormSprites_2(void)
{ {
u16 i; u16 i;
u8 spriteId;
if (!gWeatherPtr->sandstormSprites2Created) if (!gWeatherPtr->sandstormSwirlSpritesCreated)
{ {
for (i = 0; i < 5; i++) for (i = 0; i < NUM_SWIRL_SANDSTORM_SPRITES; i++)
{ {
u8 spriteId = CreateSpriteAtEnd(&sSandstormSpriteTemplate, i * 48 + 24, 208, 1); spriteId = CreateSpriteAtEnd(&sSandstormSpriteTemplate, i * 48 + 24, 208, 1);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
gWeatherPtr->sprites.s2.sandstormSprites2[i] = &gSprites[spriteId]; gWeatherPtr->sprites.s2.sandstormSprites2[i] = &gSprites[spriteId];
gWeatherPtr->sprites.s2.sandstormSprites2[i]->oam.size = 2; gWeatherPtr->sprites.s2.sandstormSprites2[i]->oam.size = 2;
gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[1] = i * 51; gWeatherPtr->sprites.s2.sandstormSprites2[i]->tSpriteRow = i * 51;
gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[0] = 8; gWeatherPtr->sprites.s2.sandstormSprites2[i]->tRadius = 8;
gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[2] = 0; gWeatherPtr->sprites.s2.sandstormSprites2[i]->tRadiusCounter = 0;
gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[4] = 0x6730; gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[4] = 0x6730; // unused value
gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[3] = gUnknown_0839AC5C[i]; gWeatherPtr->sprites.s2.sandstormSprites2[i]->tEntranceDelay = sSwirlEntranceDelays[i];
StartSpriteAnim(gWeatherPtr->sprites.s2.sandstormSprites2[i], 1); StartSpriteAnim(gWeatherPtr->sprites.s2.sandstormSprites2[i], 1);
CalcCenterToCornerVec(gWeatherPtr->sprites.s2.sandstormSprites2[i], 0, 2, 0); CalcCenterToCornerVec(gWeatherPtr->sprites.s2.sandstormSprites2[i], 0, 2, 0);
gWeatherPtr->sprites.s2.sandstormSprites2[i]->callback = SandstormSpriteCallback2; gWeatherPtr->sprites.s2.sandstormSprites2[i]->callback = WaitSandSwirlSpriteEntrance;
} }
else else
{ {
gWeatherPtr->sprites.s2.sandstormSprites2[i] = NULL; gWeatherPtr->sprites.s2.sandstormSprites2[i] = NULL;
} }
gWeatherPtr->sandstormSprites2Created = TRUE;
gWeatherPtr->sandstormSwirlSpritesCreated = TRUE;
} }
} }
} }
void SandstormSpriteCallback1(struct Sprite *sprite) static void UpdateSandstormSprite(struct Sprite *sprite)
{ {
sprite->pos2.y = gWeatherPtr->unknown_710; sprite->pos2.y = gWeatherPtr->sandstormPosY;
sprite->pos1.x = gWeatherPtr->unknown_70E + 32 + sprite->data[0] * 64; sprite->pos1.x = gWeatherPtr->sandstormBaseSpritesX + 32 + sprite->tSpriteColumn * 64;
if (sprite->pos1.x > 271) if (sprite->pos1.x > 271)
{ {
sprite->pos1.x = gWeatherPtr->unknown_70E + 0x1E0 - (4 - sprite->data[0]) * 64; sprite->pos1.x = gWeatherPtr->sandstormBaseSpritesX + 480 - (4 - sprite->tSpriteColumn) * 64;
sprite->pos1.x &= 0x1FF; sprite->pos1.x &= 0x1FF;
} }
} }
void SandstormSpriteCallback3(struct Sprite *); static void WaitSandSwirlSpriteEntrance(struct Sprite *sprite)
void SandstormSpriteCallback2(struct Sprite *sprite)
{ {
if (--sprite->data[3] == -1) if (--sprite->tEntranceDelay == -1)
sprite->callback = SandstormSpriteCallback3; sprite->callback = UpdateSandstormSwirlSprite;
} }
void SandstormSpriteCallback3(struct Sprite *sprite) static void UpdateSandstormSwirlSprite(struct Sprite *sprite)
{ {
u32 x; u32 x, y;
u32 y;
if (--sprite->pos1.y < -48) if (--sprite->pos1.y < -48)
{ {
sprite->pos1.y = 208; sprite->pos1.y = 208;
sprite->data[0] = 4; sprite->tRadius = 4;
} }
x = sprite->data[0] * gSineTable[sprite->data[1]];
y = sprite->data[0] * gSineTable[sprite->data[1] + 64]; x = sprite->tRadius * gSineTable[sprite->tWaveIndex];
y = sprite->tRadius * gSineTable[sprite->tWaveIndex + 0x40];
sprite->pos2.x = x >> 8; sprite->pos2.x = x >> 8;
sprite->pos2.y = y >> 8; sprite->pos2.y = y >> 8;
sprite->data[1] = (sprite->data[1] + 10) & 0xFF; sprite->tWaveIndex = (sprite->tWaveIndex + 10) & 0xFF;
if (++sprite->data[2] > 8) if (++sprite->tRadiusCounter > 8)
{ {
sprite->data[2] = 0; sprite->tRadiusCounter = 0;
sprite->data[0]++; sprite->tRadius++;
} }
} }
#undef tSpriteColumn
#undef tSpriteRow
#undef tRadius
#undef tWaveIndex
#undef tRadiusCounter
#undef tEntranceDelay
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Shade // Shade
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -2204,61 +2242,20 @@ bool8 Shade_Finish(void)
// Bubbles // Bubbles
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
const u8 gUnknown_0839AC68[] = {40, 90, 60, 90, 2, 60, 40, 30}; static void CreateBubbleSprite(u16);
static void DestroyBubbleSprites(void);
static void UpdateBubbleSprite(struct Sprite *);
const struct SpriteSheet gWeatherBubbleSpriteSheet = {gWeatherBubbleTiles, sizeof(gWeatherBubbleTiles), 0x1205}; static const u8 sBubbleStartDelays[] = {40, 90, 60, 90, 2, 60, 40, 30};
void Bubbles_InitVars(void) static const struct SpriteSheet sWeatherBubbleSpriteSheet =
{ {
Fog1_InitVars(); .data = gWeatherBubbleTiles,
if (gWeatherPtr->unknown_72E == 0) .size = sizeof(gWeatherBubbleTiles),
{ .tag = 0x1205,
LoadSpriteSheet(&gWeatherBubbleSpriteSheet); };
gWeatherPtr->unknown_728 = 0;
gWeatherPtr->unknown_726 = gUnknown_0839AC68[0];
gWeatherPtr->unknown_72A = 0;
gWeatherPtr->unknown_72C = 0;
}
}
void Bubbles_Main(void); static const s16 sBubbleStartCoords[][2] =
void Bubbles_InitAll(void)
{
Bubbles_InitVars();
while (gWeatherPtr->weatherGfxLoaded == FALSE)
Bubbles_Main();
}
void sub_8080588(u16);
void Bubbles_Main(void)
{
Fog1_Main();
if (++gWeatherPtr->unknown_726 > gUnknown_0839AC68[gWeatherPtr->unknown_728])
{
gWeatherPtr->unknown_726 = 0;
if (++gWeatherPtr->unknown_728 > 7)
gWeatherPtr->unknown_728 = 0;
sub_8080588(gWeatherPtr->unknown_72A);
if (++gWeatherPtr->unknown_72A > 12)
gWeatherPtr->unknown_72A = 0;
}
}
void sub_8080610(void);
bool8 Bubbles_Finish(void)
{
if (!Fog1_Finish())
{
sub_8080610();
return FALSE;
}
return TRUE;
}
const s16 gUnknown_0839AC78[][2] =
{ {
{120, 160}, {120, 160},
{376, 160}, {376, 160},
@ -2275,91 +2272,139 @@ const s16 gUnknown_0839AC78[][2] =
{256, 160}, {256, 160},
}; };
const union AnimCmd gSpriteAnim_839ACAC[] = void Bubbles_InitVars(void)
{
Fog1_InitVars();
if (!gWeatherPtr->bubblesSpritesCreated)
{
LoadSpriteSheet(&sWeatherBubbleSpriteSheet);
gWeatherPtr->bubblesDelayIndex = 0;
gWeatherPtr->bubblesDelayCounter = sBubbleStartDelays[0];
gWeatherPtr->bubblesCoordsIndex = 0;
gWeatherPtr->bubblesSpriteCount = 0;
}
}
void Bubbles_InitAll(void)
{
Bubbles_InitVars();
while (!gWeatherPtr->weatherGfxLoaded)
Bubbles_Main();
}
void Bubbles_Main(void)
{
Fog1_Main();
if (++gWeatherPtr->bubblesDelayCounter > sBubbleStartDelays[gWeatherPtr->bubblesDelayIndex])
{
gWeatherPtr->bubblesDelayCounter = 0;
if (++gWeatherPtr->bubblesDelayIndex > ARRAY_COUNT(sBubbleStartDelays) - 1)
gWeatherPtr->bubblesDelayIndex = 0;
CreateBubbleSprite(gWeatherPtr->bubblesCoordsIndex);
if (++gWeatherPtr->bubblesCoordsIndex > ARRAY_COUNT(sBubbleStartCoords) - 1)
gWeatherPtr->bubblesCoordsIndex = 0;
}
}
bool8 Bubbles_Finish(void)
{
if (!Fog1_Finish())
{
DestroyBubbleSprites();
return FALSE;
}
return TRUE;
}
static const union AnimCmd sBubbleSpriteAnimCmd0[] =
{ {
ANIMCMD_FRAME(0, 16), ANIMCMD_FRAME(0, 16),
ANIMCMD_FRAME(1, 16), ANIMCMD_FRAME(1, 16),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gSpriteAnimTable_839ACB8[] = static const union AnimCmd *const sBubbleSpriteAnimCmds[] =
{ {
gSpriteAnim_839ACAC, sBubbleSpriteAnimCmd0,
}; };
extern const struct OamData gUnknown_08524904; static const struct SpriteTemplate sBubbleSpriteTemplate =
void unc_0807DAB4(struct Sprite *);
const struct SpriteTemplate gSpriteTemplate_839ACBC =
{ {
.tileTag = 4613, .tileTag = 0x1205,
.paletteTag = 0x1200, .paletteTag = 0x1200,
.oam = &gUnknown_08524904, .oam = &gUnknown_08524904,
.anims = gSpriteAnimTable_839ACB8, .anims = sBubbleSpriteAnimCmds,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = unc_0807DAB4, .callback = UpdateBubbleSprite,
}; };
void sub_8080588(u16 a) #define tScrollXCounter data[0]
{ #define tScrollXDir data[1]
s16 x = gUnknown_0839AC78[a][0]; #define tCounter data[2]
s16 y = gUnknown_0839AC78[a][1] - gSpriteCoordOffsetY;
u8 spriteId = CreateSpriteAtEnd(
&gSpriteTemplate_839ACBC,
x,
y,
0);
static void CreateBubbleSprite(u16 coordsIndex)
{
s16 x = sBubbleStartCoords[coordsIndex][0];
s16 y = sBubbleStartCoords[coordsIndex][1] - gSpriteCoordOffsetY;
u8 spriteId = CreateSpriteAtEnd(&sBubbleSpriteTemplate, x, y, 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
gSprites[spriteId].oam.priority = 1; gSprites[spriteId].oam.priority = 1;
gSprites[spriteId].coordOffsetEnabled = TRUE; gSprites[spriteId].coordOffsetEnabled = TRUE;
gSprites[spriteId].data[0] = 0; gSprites[spriteId].tScrollXCounter = 0;
gSprites[spriteId].data[1] = 0; gSprites[spriteId].tScrollXDir = 0;
gSprites[spriteId].data[2] = 0; gSprites[spriteId].tCounter = 0;
gWeatherPtr->unknown_72C++; gWeatherPtr->bubblesSpriteCount++;
} }
} }
void sub_8080610(void) static void DestroyBubbleSprites(void)
{ {
u16 i; u16 i;
if (gWeatherPtr->unknown_72C != 0) if (gWeatherPtr->bubblesSpriteCount)
{ {
for (i = 0; i < 64; i++) for (i = 0; i < MAX_SPRITES; i++)
{ {
if (gSprites[i].template == &gSpriteTemplate_839ACBC) if (gSprites[i].template == &sBubbleSpriteTemplate)
DestroySprite(&gSprites[i]); DestroySprite(&gSprites[i]);
} }
FreeSpriteTilesByTag(0x1205); FreeSpriteTilesByTag(0x1205);
gWeatherPtr->unknown_72C = 0; gWeatherPtr->bubblesSpriteCount = 0;
} }
} }
void unc_0807DAB4(struct Sprite *sprite) static void UpdateBubbleSprite(struct Sprite *sprite)
{ {
++sprite->data[0]; ++sprite->tScrollXCounter;
if (++sprite->data[0] > 8) // double increment if (++sprite->tScrollXCounter > 8) // double increment
{ {
sprite->data[0] = 0; sprite->tScrollXCounter = 0;
if (sprite->data[1] == 0) if (sprite->tScrollXDir == 0)
{ {
if (++sprite->pos2.x > 4) if (++sprite->pos2.x > 4)
sprite->data[1] = 1; sprite->tScrollXDir = 1;
} }
else else
{ {
if (--sprite->pos2.x <= 0) if (--sprite->pos2.x <= 0)
sprite->data[1] = 0; sprite->tScrollXDir = 0;
} }
} }
sprite->pos1.y -= 3; sprite->pos1.y -= 3;
if (++sprite->data[2] > 0x77) if (++sprite->tCounter >= 120)
DestroySprite(sprite); DestroySprite(sprite);
} }
#undef tScrollXCounter
#undef tScrollXDir
#undef tCounter
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Unused function. // Unused function.