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

Document some generic argument names

Browse Source
This commit is contained in:
GriffinR
2022-05-21 15:21:50 -04:00
parent ef4d99c87e
commit 5e6d8a77e4
35 changed files with 445 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
src/evolution_graphics.c
View File

@@ -92,11 +92,22 @@ static const struct SpriteTemplate sEvoSparkleSpriteTemplate =
.callback = SpriteCB_Sparkle_Dummy
};
static const s16 sEvoSparkleMatrices[] =
static const u16 sEvoSparkleMatrices[] =
{
0x3C0, 0x380, 0x340, 0x300, 0x2C0, 0x280, 0x240, 0x200, 0x1C0,
0x180, 0x140, 0x100, -4, 0x10, -3, 0x30, -2, 0x50,
-1, 0x70, 0x1, 0x70, 0x2, 0x50, 0x3, 0x30, 0x4, 0x10
0x3C0, 0x380, 0x340, 0x300, 0x2C0, 0x280,
0x240, 0x200, 0x1C0, 0x180, 0x140, 0x100
};
static const s16 sUnused[] =
{
-4, 0x10,
-3, 0x30,
-2, 0x50,
-1, 0x70,
1, 0x70,
2, 0x50,
3, 0x30,
4, 0x10
};
static void SpriteCB_Sparkle_Dummy(struct Sprite *sprite)
@@ -107,30 +118,33 @@ static void SpriteCB_Sparkle_Dummy(struct Sprite *sprite)
static void SetEvoSparklesMatrices(void)
{
u16 i;
for (i = 0; i < 12; i++)
{
for (i = 0; i < ARRAY_COUNT(sEvoSparkleMatrices); i++)
SetOamMatrix(20 + i, sEvoSparkleMatrices[i], 0, 0, sEvoSparkleMatrices[i]);
}
}
#define sSpeed data[3]
#define sAmplitude data[5]
#define sTrigIdx data[6]
#define sTimer data[7]
static void SpriteCB_Sparkle_SpiralUpward(struct Sprite* sprite)
{
if (sprite->y > 8)
{
u8 matrixNum;
sprite->y = 88 - (sprite->data[7] * sprite->data[7]) / 80;
sprite->y2 = Sin((u8)(sprite->data[6]), sprite->data[5]) / 4;
sprite->x2 = Cos((u8)(sprite->data[6]), sprite->data[5]);
sprite->data[6] += 4;
if (sprite->data[7] & 1)
sprite->data[5]--;
sprite->data[7]++;
sprite->y = 88 - (sprite->sTimer * sprite->sTimer) / 80;
sprite->y2 = Sin((u8)sprite->sTrigIdx, sprite->sAmplitude) / 4;
sprite->x2 = Cos((u8)sprite->sTrigIdx, sprite->sAmplitude);
sprite->sTrigIdx += 4;
if (sprite->sTimer & 1)
sprite->sAmplitude--;
sprite->sTimer++;
if (sprite->y2 > 0)
sprite->subpriority = 1;
else
sprite->subpriority = 20;
matrixNum = sprite->data[5] / 4 + 20;
matrixNum = sprite->sAmplitude / 4 + 20;
if (matrixNum > 31)
matrixNum = 31;
sprite->oam.matrixNum = matrixNum;
@@ -139,17 +153,17 @@ static void SpriteCB_Sparkle_SpiralUpward(struct Sprite* sprite)
DestroySprite(sprite);
}
static void CreateSparkle_SpiralUpward(u8 arg0)
static void CreateSparkle_SpiralUpward(u8 trigIdx)
{
u8 spriteID = CreateSprite(&sEvoSparkleSpriteTemplate, 120, 88, 0);
if (spriteID != MAX_SPRITES)
u8 spriteId = CreateSprite(&sEvoSparkleSpriteTemplate, DISPLAY_WIDTH / 2, 88, 0);
if (spriteId != MAX_SPRITES)
{
gSprites[spriteID].data[5] = 48;
gSprites[spriteID].data[6] = arg0;
gSprites[spriteID].data[7] = 0;
gSprites[spriteID].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteID].oam.matrixNum = 31;
gSprites[spriteID].callback = SpriteCB_Sparkle_SpiralUpward;
gSprites[spriteId].sAmplitude = 48;
gSprites[spriteId].sTrigIdx = trigIdx;
gSprites[spriteId].sTimer = 0;
gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteId].oam.matrixNum = 31;
gSprites[spriteId].callback = SpriteCB_Sparkle_SpiralUpward;
}
}
@@ -157,85 +171,85 @@ static void SpriteCB_Sparkle_ArcDown(struct Sprite* sprite)
{
if (sprite->y < 88)
{
sprite->y = 8 + (sprite->data[7] * sprite->data[7]) / 5;
sprite->y2 = Sin((u8)(sprite->data[6]), sprite->data[5]) / 4;
sprite->x2 = Cos((u8)(sprite->data[6]), sprite->data[5]);
sprite->data[5] = 8 + Sin((u8)(sprite->data[7] * 4), 40);
sprite->data[7]++;
sprite->y = 8 + (sprite->sTimer * sprite->sTimer) / 5;
sprite->y2 = Sin((u8)sprite->sTrigIdx, sprite->sAmplitude) / 4;
sprite->x2 = Cos((u8)sprite->sTrigIdx, sprite->sAmplitude);
sprite->sAmplitude = 8 + Sin((u8)(sprite->sTimer * 4), 40);
sprite->sTimer++;
}
else
DestroySprite(sprite);
}
static void CreateSparkle_ArcDown(u8 arg0)
static void CreateSparkle_ArcDown(u8 trigIdx)
{
u8 spriteID = CreateSprite(&sEvoSparkleSpriteTemplate, 120, 8, 0);
if (spriteID != MAX_SPRITES)
u8 spriteId = CreateSprite(&sEvoSparkleSpriteTemplate, DISPLAY_WIDTH / 2, 8, 0);
if (spriteId != MAX_SPRITES)
{
gSprites[spriteID].data[5] = 8;
gSprites[spriteID].data[6] = arg0;
gSprites[spriteID].data[7] = 0;
gSprites[spriteID].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteID].oam.matrixNum = 25;
gSprites[spriteID].subpriority = 1;
gSprites[spriteID].callback = SpriteCB_Sparkle_ArcDown;
gSprites[spriteId].sAmplitude = 8;
gSprites[spriteId].sTrigIdx = trigIdx;
gSprites[spriteId].sTimer = 0;
gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteId].oam.matrixNum = 25;
gSprites[spriteId].subpriority = 1;
gSprites[spriteId].callback = SpriteCB_Sparkle_ArcDown;
}
}
static void SpriteCB_Sparkle_CircleInward(struct Sprite* sprite)
{
if (sprite->data[5] > 8)
if (sprite->sAmplitude > 8)
{
sprite->y2 = Sin((u8)(sprite->data[6]), sprite->data[5]);
sprite->x2 = Cos((u8)(sprite->data[6]), sprite->data[5]);
sprite->data[5] -= sprite->data[3];
sprite->data[6] += 4;
sprite->y2 = Sin((u8)sprite->sTrigIdx, sprite->sAmplitude);
sprite->x2 = Cos((u8)sprite->sTrigIdx, sprite->sAmplitude);
sprite->sAmplitude -= sprite->sSpeed;
sprite->sTrigIdx += 4;
}
else
DestroySprite(sprite);
}
static void CreateSparkle_CircleInward(u8 arg0, u8 arg1)
static void CreateSparkle_CircleInward(u8 trigIdx, u8 speed)
{
u8 spriteID = CreateSprite(&sEvoSparkleSpriteTemplate, 120, 56, 0);
if (spriteID != MAX_SPRITES)
u8 spriteId = CreateSprite(&sEvoSparkleSpriteTemplate, DISPLAY_WIDTH / 2, 56, 0);
if (spriteId != MAX_SPRITES)
{
gSprites[spriteID].data[3] = arg1;
gSprites[spriteID].data[5] = 120;
gSprites[spriteID].data[6] = arg0;
gSprites[spriteID].data[7] = 0;
gSprites[spriteID].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteID].oam.matrixNum = 31;
gSprites[spriteID].subpriority = 1;
gSprites[spriteID].callback = SpriteCB_Sparkle_CircleInward;
gSprites[spriteId].sSpeed = speed;
gSprites[spriteId].sAmplitude = 120;
gSprites[spriteId].sTrigIdx = trigIdx;
gSprites[spriteId].sTimer = 0;
gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteId].oam.matrixNum = 31;
gSprites[spriteId].subpriority = 1;
gSprites[spriteId].callback = SpriteCB_Sparkle_CircleInward;
}
}
static void SpriteCB_Sparkle_Spray(struct Sprite* sprite)
{
if (!(sprite->data[7] & 3))
if (!(sprite->sTimer & 3))
sprite->y++;
if (sprite->data[6] < 128)
if (sprite->sTrigIdx < 128)
{
u8 matrixNum;
sprite->y2 = -Sin((u8)(sprite->data[6]), sprite->data[5]);
sprite->x = 120 + (sprite->data[3] * sprite->data[7]) / 3;
sprite->data[6]++;
matrixNum = 31 - (sprite->data[6] * 12 / 128);
if (sprite->data[6] > 64)
sprite->y2 = -Sin((u8)sprite->sTrigIdx, sprite->sAmplitude);
sprite->x = (DISPLAY_WIDTH / 2) + (sprite->sSpeed * sprite->sTimer) / 3;
sprite->sTrigIdx++;
matrixNum = 31 - (sprite->sTrigIdx * 12 / 128);
if (sprite->sTrigIdx > 64)
sprite->subpriority = 1;
else
{
sprite->invisible = FALSE;
sprite->subpriority = 20;
if (sprite->data[6] > 112 && sprite->data[6] & 1)
if (sprite->sTrigIdx > 112 && sprite->sTrigIdx & 1)
sprite->invisible = TRUE;
}
if (matrixNum < 20)
matrixNum = 20;
sprite->oam.matrixNum = matrixNum;
sprite->data[7]++;
sprite->sTimer++;
}
else
DestroySprite(sprite);
@@ -243,16 +257,16 @@ static void SpriteCB_Sparkle_Spray(struct Sprite* sprite)
static void CreateSparkle_Spray(u8 id)
{
u8 spriteID = CreateSprite(&sEvoSparkleSpriteTemplate, 120, 56, 0);
if (spriteID != MAX_SPRITES)
u8 spriteId = CreateSprite(&sEvoSparkleSpriteTemplate, DISPLAY_WIDTH / 2, 56, 0);
if (spriteId != MAX_SPRITES)
{
gSprites[spriteID].data[3] = 3 - (Random() % 7);
gSprites[spriteID].data[5] = 48 + (Random() & 0x3F);
gSprites[spriteID].data[7] = 0;
gSprites[spriteID].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteID].oam.matrixNum = 31;
gSprites[spriteID].subpriority = 20;
gSprites[spriteID].callback = SpriteCB_Sparkle_Spray;
gSprites[spriteId].sSpeed = 3 - (Random() % 7);
gSprites[spriteId].sAmplitude = 48 + (Random() & 0x3F);
gSprites[spriteId].sTimer = 0;
gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteId].oam.matrixNum = 31;
gSprites[spriteId].subpriority = 20;
gSprites[spriteId].callback = SpriteCB_Sparkle_Spray;
}
}
@@ -289,7 +303,7 @@ static void Task_Sparkles_SpiralUpward(u8 taskId)
{
u8 i;
for (i = 0; i < 4; i++)
CreateSparkle_SpiralUpward((0x78 & gTasks[taskId].tTimer) * 2 + i * 64);
CreateSparkle_SpiralUpward((gTasks[taskId].tTimer & 120) * 2 + i * 64);
}
gTasks[taskId].tTimer++;
}