summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/dark.c2
-rw-r--r--src/evolution_graphics.c638
-rw-r--r--src/ice.c2
-rw-r--r--src/new_menu_helpers.c50
-rw-r--r--src/poison.c2
5 files changed, 667 insertions, 27 deletions
diff --git a/src/dark.c b/src/dark.c
index b6d13afe3..368f5cbd5 100644
--- a/src/dark.c
+++ b/src/dark.c
@@ -82,7 +82,7 @@ static const union AffineAnimCmd gUnknown_83E7900[] =
AFFINEANIMCMD_END,
};
-static const union AffineAnimCmd *const gUnknown_83E7910[] =
+const union AffineAnimCmd *const gUnknown_83E7910[] =
{
gUnknown_83E7890,
gUnknown_83E78A0,
diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c
new file mode 100644
index 000000000..175ebf81e
--- /dev/null
+++ b/src/evolution_graphics.c
@@ -0,0 +1,638 @@
+#include "global.h"
+#include "trig.h"
+#include "random.h"
+#include "decompress.h"
+#include "palette.h"
+#include "sound.h"
+#include "task.h"
+#include "evolution_scene.h"
+#include "evolution_graphics.h"
+#include "constants/songs.h"
+
+static void SpriteCallbackDummy_EvoSparkles(struct Sprite * sprite);
+static void EvoTask_PreEvoSparkleSet1Init(u8 taskId);
+static void EvoTask_CreatePreEvoSparkleSet1(u8 taskId);
+static void EvoTask_WaitForPre1SparklesToGoUp(u8 taskId);
+static void EvoTask_PreEvoSparkleSet2Init(u8 taskId);
+static void EvoTask_CreatePreEvoSparklesSet2(u8 taskId);
+static void EvoTask_PreEvoSparkleSet2Teardown(u8 taskId);
+static void EvoTask_PostEvoSparklesSet1Init(u8 taskId);
+static void EvoTask_CreatePostEvoSparklesSet1(u8 taskId);
+static void EvoTask_PostEvoSparklesSet1Teardown(u8 taskId);
+static void EvoTask_PostEvoSparklesSet2Init(u8 taskId);
+static void EvoTask_CreatePostEvoSparklesSet2(u8 taskId);
+static void EvoTask_PostEvoSparklesSet2Teardown(u8 taskId);
+static void EvoTask_PostEvoSparklesSet2TradeInit(u8 taskId);
+static void EvoTask_CreatePostEvoSparklesSet2Trade(u8 taskId);
+static void EvoTask_PrePostEvoMonSpritesInit(u8 taskId);
+static void EvoTask_ChooseNextEvoSpriteAnim(u8 taskId);
+static void EvoTask_ShrinkOrExpandEvoSprites(u8 taskId);
+static void PreEvoInvisible_PostEvoVisible_KillTask(u8 taskId);
+static void PreEvoVisible_PostEvoInvisible_KillTask(u8 taskId);
+
+static const u16 sEvolutionSparklesPalData[] = INCBIN_U16("graphics/misc/evolution_sprite_841EEA4.gbapal");
+static const u32 sEvolutionSparklesTileData[] = INCBIN_U32("graphics/misc/evolution_sprite_841EEA4.4bpp.lz");
+
+static const struct CompressedSpriteSheet sSpriteSheet_EvolutionSparkles[] = {
+ { sEvolutionSparklesTileData, 0x20, 1001 },
+ {}
+};
+static const struct SpritePalette sSpritePalette_EvolutionSparkles[] = {
+ { sEvolutionSparklesPalData, 1001 },
+ {}
+};
+
+static const struct OamData sOamData_EvolutionSparkles = {
+ .y = 160,
+ .priority = 1
+};
+
+static const union AnimCmd sSpriteAnim_EvolutionSparkles_0[] = {
+ ANIMCMD_FRAME(0, 8),
+ ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_EvolutionSparkles[] = {
+ sSpriteAnim_EvolutionSparkles_0
+};
+
+static const struct SpriteTemplate sSpriteTemplate_EvolutionSparkles = {
+ .tileTag = 1001,
+ .paletteTag = 1001,
+ .oam = &sOamData_EvolutionSparkles,
+ .anims = sSpriteAnimTable_EvolutionSparkles,
+ .affineAnims = gDummySpriteAffineAnimTable,
+ .callback = SpriteCallbackDummy_EvoSparkles
+};
+
+static const u16 sEvolutionSparkleMatrixScales[12] = {
+ 0x3C0,
+ 0x380,
+ 0x340,
+ 0x300,
+ 0x2C0,
+ 0x280,
+ 0x240,
+ 0x200,
+ 0x1C0,
+ 0x180,
+ 0x140,
+ 0x100
+};
+
+static const s16 sUnref_841EF28[][2] = {
+ {-4, 0x10},
+ {-3, 0x30},
+ {-2, 0x50},
+ {-1, 0x70},
+ { 1, 0x70},
+ { 2, 0x50},
+ { 3, 0x30},
+ { 4, 0x10}
+};
+
+static void SpriteCallbackDummy_EvoSparkles(struct Sprite * sprite)
+{
+
+}
+
+static void SetEvoSparklesMatrices(void)
+{
+ u16 i;
+ for (i = 0; i < NELEMS(sEvolutionSparkleMatrixScales); i++)
+ SetOamMatrix(i + 20, sEvolutionSparkleMatrixScales[i], 0, 0, sEvolutionSparkleMatrixScales[i]);
+}
+
+static void SpriteCB_PreEvoSparkleSet1(struct Sprite * sprite)
+{
+ u8 mnum;
+ if (sprite->pos1.y > 8)
+ {
+ sprite->pos1.y = 88 - sprite->data[7] * sprite->data[7] / 80;
+ sprite->pos2.y = Sin((u8)sprite->data[6], sprite->data[5]) / 4;
+ sprite->pos2.x = Cos((u8) sprite->data[6], sprite->data[5]);
+ sprite->data[6] += 4;
+ if (sprite->data[7] & 1)
+ sprite->data[5]--;
+ sprite->data[7]++;
+ if (sprite->pos2.y > 0)
+ sprite->subpriority = 1;
+ else
+ sprite->subpriority = 20;
+ mnum = sprite->data[5] / 4 + 20;
+ if (mnum > 31)
+ mnum = 31;
+ sprite->oam.matrixNum = mnum;
+ }
+ else
+ {
+ DestroySprite(sprite);
+ }
+}
+
+static void CreatePreEvoSparkleSet1(u8 a0)
+{
+ u8 spriteId = CreateSprite(&sSpriteTemplate_EvolutionSparkles, 120, 88, 0);
+ if (spriteId != MAX_SPRITES)
+ {
+ gSprites[spriteId].data[5] = 48;
+ gSprites[spriteId].data[6] = a0;
+ gSprites[spriteId].data[7] = 0;
+ gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
+ gSprites[spriteId].oam.matrixNum = 31;
+ gSprites[spriteId].callback = SpriteCB_PreEvoSparkleSet1;
+ }
+}
+
+static void SpriteCB_PreEvoSparkleSet2(struct Sprite * sprite)
+{
+ if (sprite->pos1.y < 88)
+ {
+ sprite->pos1.y = 8 + sprite->data[7] * sprite->data[7] / 5;
+ sprite->pos2.y = Sin((u8)sprite->data[6], sprite->data[5]) / 4;
+ sprite->pos2.x = Cos((u8)sprite->data[6], sprite->data[5]);
+ sprite->data[5] = Sin((u8)(sprite->data[7] * 4), 40) + 8;
+ sprite->data[7]++;
+ }
+ else
+ {
+ DestroySprite(sprite);
+ }
+}
+
+static void CreatePreEvoSparkleSet2(u8 a0)
+{
+ u8 spriteId = CreateSprite(&sSpriteTemplate_EvolutionSparkles, 120, 8, 0);
+ if (spriteId != MAX_SPRITES)
+ {
+ gSprites[spriteId].data[5] = 8;
+ gSprites[spriteId].data[6] = a0;
+ 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_PreEvoSparkleSet2;
+ }
+}
+
+static void SpriteCB_PostEvoSparkleSet1(struct Sprite * sprite)
+{
+ if (sprite->data[5] > 8)
+ {
+ sprite->pos2.y = Sin((u8)sprite->data[6], sprite->data[5]);
+ sprite->pos2.x = Cos((u8)sprite->data[6], sprite->data[5]);
+ sprite->data[5] -= sprite->data[3];
+ sprite->data[6] += 4;
+ }
+ else
+ {
+ DestroySprite(sprite);
+ }
+}
+
+static void CreatePostEvoSparkleSet1(u8 a0, u8 a1)
+{
+ u8 spriteId = CreateSprite(&sSpriteTemplate_EvolutionSparkles, 120, 56, 0);
+ if (spriteId != MAX_SPRITES)
+ {
+ gSprites[spriteId].data[3] = a1;
+ gSprites[spriteId].data[5] = 120;
+ gSprites[spriteId].data[6] = a0;
+ 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_PostEvoSparkleSet1;
+ }
+}
+
+static void SpriteCB_PostEvoSparkleSet2(struct Sprite * sprite)
+{
+ u8 mnum;
+ if ((sprite->data[7] & 3) == 0)
+ sprite->pos1.y++;
+ if (sprite->data[6] < 128)
+ {
+ sprite->pos2.y = -Sin((u8)sprite->data[6], sprite->data[5]);
+ sprite->pos1.x = 120 + sprite->data[3] * sprite->data[7] / 3;
+ sprite->data[6]++;
+ mnum = 31 - sprite->data[6] * 12 / 128;
+ if (sprite->data[6] > 64)
+ {
+ sprite->subpriority = 1;
+ }
+ else
+ {
+ sprite->invisible = FALSE;
+ sprite->subpriority = 20;
+ if (sprite->data[6] > 112 && (sprite->data[6] & 1))
+ sprite->invisible = TRUE;
+ }
+ if (mnum < 20)
+ mnum = 20;
+ sprite->oam.matrixNum = mnum;
+ sprite->data[7]++;
+ }
+ else
+ {
+ DestroySprite(sprite);
+ }
+}
+
+static void CreatePostEvoSparkleSet2(u8 unused)
+{
+ u8 spriteId = CreateSprite(&sSpriteTemplate_EvolutionSparkles, 120, 56, 0);
+ if (spriteId != MAX_SPRITES)
+ {
+ gSprites[spriteId].data[3] = 3 - (Random() % 7);
+ gSprites[spriteId].data[5] = 48 + (Random() & 63);
+ 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_PostEvoSparkleSet2;
+ }
+}
+
+void LoadEvoSparkleSpriteAndPal(void)
+{
+ LoadCompressedSpriteSheetUsingHeap(sSpriteSheet_EvolutionSparkles);
+ LoadSpritePalettes(sSpritePalette_EvolutionSparkles);
+}
+
+u8 LaunchTask_PreEvoSparklesSet1(u16 a0)
+{
+ u8 taskId = CreateTask(EvoTask_PreEvoSparkleSet1Init, 0);
+ gTasks[taskId].data[1] = a0;
+ return taskId;
+}
+
+static void EvoTask_PreEvoSparkleSet1Init(u8 taskId)
+{
+ SetEvoSparklesMatrices();
+ gTasks[taskId].data[15] = 0;
+ BeginNormalPaletteFade(3 << gTasks[taskId].data[1], 10, 0, 16, RGB_WHITE);
+ gTasks[taskId].func = EvoTask_CreatePreEvoSparkleSet1;
+ PlaySE(SE_W025);
+}
+
+static void EvoTask_CreatePreEvoSparkleSet1(u8 taskId)
+{
+ u8 i;
+ if (gTasks[taskId].data[15] < 64)
+ {
+ if ((gTasks[taskId].data[15] & 7) == 0)
+ {
+ for (i = 0; i < 4; i++)
+ CreatePreEvoSparkleSet1(2 * (gTasks[taskId].data[15] & 0x78) + 64 * i);
+ }
+ gTasks[taskId].data[15]++;
+ }
+ else
+ {
+ gTasks[taskId].data[15] = 96;
+ gTasks[taskId].func = EvoTask_WaitForPre1SparklesToGoUp;
+ }
+}
+
+static void EvoTask_WaitForPre1SparklesToGoUp(u8 taskId)
+{
+ if (gTasks[taskId].data[15] != 0)
+ gTasks[taskId].data[15]--;
+ else
+ DestroyTask(taskId);
+}
+
+u8 LaunchTask_PreEvoSparklesSet2(void)
+{
+ u8 taskId = CreateTask(EvoTask_PreEvoSparkleSet2Init, 0);
+ return taskId;
+}
+
+static void EvoTask_PreEvoSparkleSet2Init(u8 taskId)
+{
+ SetEvoSparklesMatrices();
+ gTasks[taskId].data[15] = 0;
+ gTasks[taskId].func = EvoTask_CreatePreEvoSparklesSet2;
+ PlaySE(SE_W062B);
+}
+
+static void EvoTask_CreatePreEvoSparklesSet2(u8 taskId)
+{
+ u8 i;
+ if (gTasks[taskId].data[15] < 96)
+ {
+ if (gTasks[taskId].data[15] < 6)
+ {
+ for (i = 0; i < 9; i++)
+ CreatePreEvoSparkleSet2(16 * i);
+ }
+ gTasks[taskId].data[15]++;
+ }
+ else
+ {
+ gTasks[taskId].func = EvoTask_PreEvoSparkleSet2Teardown;
+ }
+}
+
+static void EvoTask_PreEvoSparkleSet2Teardown(u8 taskId)
+{
+ DestroyTask(taskId);
+}
+
+u8 LaunchTask_PostEvoSparklesSet1(void)
+{
+ u8 taskId = CreateTask(EvoTask_PostEvoSparklesSet1Init, 0);
+ return taskId;
+}
+
+static void EvoTask_PostEvoSparklesSet1Init(u8 taskId)
+{
+ SetEvoSparklesMatrices();
+ gTasks[taskId].data[15] = 0;
+ gTasks[taskId].func = EvoTask_CreatePostEvoSparklesSet1;
+ PlaySE(SE_REAPOKE);
+}
+
+static void EvoTask_CreatePostEvoSparklesSet1(u8 taskId)
+{
+ u8 i;
+ if (gTasks[taskId].data[15] < 48)
+ {
+ if (gTasks[taskId].data[15] == 0)
+ {
+ for (i = 0; i < 16; i++)
+ {
+ CreatePostEvoSparkleSet1(i * 16, 4);
+ }
+ }
+ if (gTasks[taskId].data[15] == 32)
+ {
+ for (i = 0; i < 16; i++)
+ {
+ CreatePostEvoSparkleSet1(i * 16, 8);
+ }
+ }
+ gTasks[taskId].data[15]++;
+ }
+ else
+ {
+ gTasks[taskId].func = EvoTask_PostEvoSparklesSet1Teardown;
+ }
+}
+
+static void EvoTask_PostEvoSparklesSet1Teardown(u8 taskId)
+{
+ DestroyTask(taskId);
+}
+
+u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 species)
+{
+ u8 taskId = CreateTask(EvoTask_PostEvoSparklesSet2Init, 0);
+ gTasks[taskId].data[2] = species;
+ return taskId;
+}
+
+static void EvoTask_PostEvoSparklesSet2Init(u8 taskId)
+{
+ SetEvoSparklesMatrices();
+ gTasks[taskId].data[15] = 0;
+ sub_80D0474();
+ CpuCopy16(&gPlttBufferFaded[32], &gPlttBufferUnfaded[32], 96);
+ BeginNormalPaletteFade(0xFFF90F1C, 0, 0, 16, RGB_WHITE);
+ gTasks[taskId].func = EvoTask_CreatePostEvoSparklesSet2;
+ PlaySE(SE_W080);
+}
+
+static void EvoTask_CreatePostEvoSparklesSet2(u8 taskId)
+{
+ u8 i;
+ if (gTasks[taskId].data[15] < 128)
+ {
+ switch (gTasks[taskId].data[15])
+ {
+ default:
+ if (gTasks[taskId].data[15] < 50)
+ CreatePostEvoSparkleSet2(Random() & 7);
+ break;
+ case 0:
+ for (i = 0; i < 8; i++)
+ CreatePostEvoSparkleSet2(i);
+ break;
+ case 32:
+ BeginNormalPaletteFade(0xFFFF0F1C, 16, 16, 0, RGB_WHITE);
+ break;
+ }
+ gTasks[taskId].data[15]++;
+ }
+ else
+ {
+ gTasks[taskId].func = EvoTask_PostEvoSparklesSet2Teardown;
+ }
+}
+
+static void EvoTask_PostEvoSparklesSet2Teardown(u8 taskId)
+{
+ if (!gPaletteFade.active)
+ DestroyTask(taskId);
+}
+
+u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 species)
+{
+ u8 taskId = CreateTask(EvoTask_PostEvoSparklesSet2TradeInit, 0);
+ gTasks[taskId].data[2] = species;
+ return taskId;
+}
+
+static void EvoTask_PostEvoSparklesSet2TradeInit(u8 taskId)
+{
+ SetEvoSparklesMatrices();
+ gTasks[taskId].data[15] = 0;
+ sub_80D0474();
+ CpuCopy16(&gPlttBufferFaded[32], &gPlttBufferUnfaded[32], 96);
+ BeginNormalPaletteFade(0xFFF90F00, 0, 0, 16, RGB_WHITE);
+ gTasks[taskId].func = EvoTask_CreatePostEvoSparklesSet2Trade;
+ PlaySE(SE_W080);
+}
+
+static void EvoTask_CreatePostEvoSparklesSet2Trade(u8 taskId)
+{
+ u8 i;
+ if (gTasks[taskId].data[15] < 128)
+ {
+ switch (gTasks[taskId].data[15])
+ {
+ default:
+ if (gTasks[taskId].data[15] < 50)
+ CreatePostEvoSparkleSet2(Random() & 7);
+ break;
+ case 0:
+ for (i = 0; i < 8; i++)
+ CreatePostEvoSparkleSet2(i);
+ break;
+ case 32:
+ BeginNormalPaletteFade(0xFFFF0F00, 16, 16, 0, RGB_WHITE);
+ break;
+ }
+ gTasks[taskId].data[15]++;
+ }
+ else
+ {
+ gTasks[taskId].func = EvoTask_PostEvoSparklesSet2Teardown;
+ }
+}
+
+static void SpriteCallbackDummy_MonSprites(struct Sprite * sprite)
+{
+
+}
+
+#define tPreEvoSpriteId data[1]
+#define tPostEvoSpriteId data[2]
+#define tPreEvoScale data[3]
+#define tPostEvoScale data[4]
+#define tDirection data[5]
+#define tSpeed data[6]
+
+u8 LaunchTask_PrePostEvoMonSprites(u8 preEvoSpriteId, u8 postEvoSpriteId)
+{
+ u16 i;
+ u8 taskId;
+ u16 palette[16];
+ for (i = 0; i < 16; i++)
+ palette[i] = RGB_WHITE;
+ taskId = CreateTask(EvoTask_PrePostEvoMonSpritesInit, 0);
+ gTasks[taskId].tPreEvoSpriteId = preEvoSpriteId;
+ gTasks[taskId].tPostEvoSpriteId = postEvoSpriteId;
+ gTasks[taskId].tPreEvoScale = 256;
+ gTasks[taskId].tPostEvoScale = 16;
+ SetOamMatrix(30, 0x10000 / gTasks[taskId].tPreEvoScale, 0, 0, 0x10000 / gTasks[taskId].tPreEvoScale);
+ SetOamMatrix(31, 0x10000 / gTasks[taskId].tPostEvoScale, 0, 0, 0x10000 / gTasks[taskId].tPostEvoScale);
+ gSprites[preEvoSpriteId].callback = SpriteCallbackDummy_MonSprites;
+ gSprites[preEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
+ gSprites[preEvoSpriteId].oam.matrixNum = 30;
+ gSprites[preEvoSpriteId].invisible = FALSE;
+ CpuCopy16(palette, &gPlttBufferFaded[256 + 16 * gSprites[preEvoSpriteId].oam.paletteNum], 32);
+ gSprites[postEvoSpriteId].callback = SpriteCallbackDummy_MonSprites;
+ gSprites[postEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
+ gSprites[postEvoSpriteId].oam.matrixNum = 31;
+ gSprites[postEvoSpriteId].invisible = FALSE;
+ CpuCopy16(palette, &gPlttBufferFaded[256 + 16 * gSprites[postEvoSpriteId].oam.paletteNum], 32);
+ gTasks[taskId].EvoGraphicsTaskEvoStop = FALSE;
+ return taskId;
+}
+
+static void EvoTask_PrePostEvoMonSpritesInit(u8 taskId)
+{
+ gTasks[taskId].tDirection = FALSE;
+ gTasks[taskId].tSpeed = 8;
+ gTasks[taskId].func = EvoTask_ChooseNextEvoSpriteAnim;
+}
+
+static void EvoTask_ChooseNextEvoSpriteAnim(u8 taskId)
+{
+ if (gTasks[taskId].EvoGraphicsTaskEvoStop)
+ {
+ PreEvoVisible_PostEvoInvisible_KillTask(taskId);
+ }
+ else if (gTasks[taskId].tSpeed == 128)
+ {
+ PreEvoInvisible_PostEvoVisible_KillTask(taskId);
+ }
+ else
+ {
+ gTasks[taskId].tSpeed += 2;
+ gTasks[taskId].tDirection ^= TRUE;
+ gTasks[taskId].func = EvoTask_ShrinkOrExpandEvoSprites;
+ }
+}
+
+static void EvoTask_ShrinkOrExpandEvoSprites(u8 taskId)
+{
+ u8 r6;
+ if (gTasks[taskId].EvoGraphicsTaskEvoStop)
+ {
+ gTasks[taskId].func = PreEvoVisible_PostEvoInvisible_KillTask;
+ }
+ else
+ {
+ r6 = 0;
+ if (!gTasks[taskId].tDirection)
+ {
+ if (gTasks[taskId].tPreEvoScale < 0x100 - gTasks[taskId].tSpeed)
+ {
+ gTasks[taskId].tPreEvoScale += gTasks[taskId].tSpeed;
+ }
+ else
+ {
+ gTasks[taskId].tPreEvoScale = 0x100;
+ r6 = 1;
+ }
+ if (gTasks[taskId].tPostEvoScale > 0x10 + gTasks[taskId].tSpeed)
+ {
+ gTasks[taskId].tPostEvoScale -= gTasks[taskId].tSpeed;
+ }
+ else
+ {
+ gTasks[taskId].tPostEvoScale = 0x10;
+ r6++;
+ }
+ }
+ else
+ {
+ if (gTasks[taskId].tPostEvoScale < 0x100 - gTasks[taskId].tSpeed)
+ {
+ gTasks[taskId].tPostEvoScale += gTasks[taskId].tSpeed;
+ }
+ else
+ {
+ gTasks[taskId].tPostEvoScale = 0x100;
+ r6 = 1;
+ }
+ if (gTasks[taskId].tPreEvoScale > 0x10 + gTasks[taskId].tSpeed)
+ {
+ gTasks[taskId].tPreEvoScale -= gTasks[taskId].tSpeed;
+ }
+ else
+ {
+ gTasks[taskId].tPreEvoScale = 0x10;
+ r6++;
+ }
+ }
+ SetOamMatrix(30, 0x10000 / gTasks[taskId].tPreEvoScale, 0, 0, 0x10000 / gTasks[taskId].tPreEvoScale);
+ SetOamMatrix(31, 0x10000 / gTasks[taskId].tPostEvoScale, 0, 0, 0x10000 / gTasks[taskId].tPostEvoScale);
+ if (r6 == 2)
+ {
+ gTasks[taskId].func = EvoTask_ChooseNextEvoSpriteAnim;
+ }
+ }
+}
+
+static void PreEvoInvisible_PostEvoVisible_KillTask(u8 taskId)
+{
+ gSprites[gTasks[taskId].tPreEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_OFF;
+ gSprites[gTasks[taskId].tPreEvoSpriteId].oam.matrixNum = 0;
+ gSprites[gTasks[taskId].tPreEvoSpriteId].invisible = TRUE;
+ gSprites[gTasks[taskId].tPostEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_OFF;
+ gSprites[gTasks[taskId].tPostEvoSpriteId].oam.matrixNum = 0;
+ gSprites[gTasks[taskId].tPostEvoSpriteId].invisible = FALSE;
+ DestroyTask(taskId);
+}
+
+static void PreEvoVisible_PostEvoInvisible_KillTask(u8 taskId)
+{
+ gSprites[gTasks[taskId].tPreEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_OFF;
+ gSprites[gTasks[taskId].tPreEvoSpriteId].oam.matrixNum = 0;
+ gSprites[gTasks[taskId].tPreEvoSpriteId].invisible = FALSE;
+ gSprites[gTasks[taskId].tPostEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_OFF;
+ gSprites[gTasks[taskId].tPostEvoSpriteId].oam.matrixNum = 0;
+ gSprites[gTasks[taskId].tPostEvoSpriteId].invisible = TRUE;
+ DestroyTask(taskId);
+}
+
+#undef tPreEvoSpriteId
+#undef tPostEvoSpriteId
+#undef tPreEvoScale
+#undef tPostEvoScale
+#undef tDirection
+#undef tSpeed
diff --git a/src/ice.c b/src/ice.c
index 9914a6992..79966e597 100644
--- a/src/ice.c
+++ b/src/ice.c
@@ -135,7 +135,7 @@ static const union AnimCmd *const gUnknown_83E632C[] =
gUnknown_83E6308,
};
-static const union AnimCmd *const gUnknown_83E6330[] =
+const union AnimCmd *const gUnknown_83E6330[] =
{
gUnknown_83E6310,
};
diff --git a/src/new_menu_helpers.c b/src/new_menu_helpers.c
index 84befe63e..f879e6810 100644
--- a/src/new_menu_helpers.c
+++ b/src/new_menu_helpers.c
@@ -21,11 +21,13 @@
#define STD_WINDOW_PALETTE_NUM 14
#define STD_WINDOW_BASE_TILE_NUM 0x214
-static EWRAM_DATA bool8 gUnknown_203AB58[4] = {FALSE}; // knizz: bgmaps_that_need_syncing
-static EWRAM_DATA u16 gUnknown_203AB5C = {0};
-static EWRAM_DATA void *gUnknown_203AB60[0x20] = {NULL};
+static EWRAM_DATA bool8 sScheduledBgCopiesToVram[4] = {FALSE};
+static EWRAM_DATA u16 sTempTileDataBufferCursor = {0};
+static EWRAM_DATA void *sTempTileDataBuffers[0x20] = {NULL};
static EWRAM_DATA u8 sStartMenuWindowId = {0};
+static const u16 gUnknown_841EF48[] = INCBIN_U16("graphics/unknown/unk_841EF48.4bpp");
+
const u16 gUnknown_841F1C8[] = INCBIN_U16("graphics/text_window/unk_841F1C8.4bpp");
const u16 gTMCaseMainWindowPalette[] = INCBIN_U16("graphics/tm_case/unk_841F408.gbapal");
@@ -169,35 +171,35 @@ static void TaskFreeBufAfterCopyingTileDataToVram(u8 taskId);
void ClearScheduledBgCopiesToVram(void)
{
- memset(gUnknown_203AB58, 0, sizeof(gUnknown_203AB58));
+ memset(sScheduledBgCopiesToVram, 0, sizeof(sScheduledBgCopiesToVram));
}
void ScheduleBgCopyTilemapToVram(u8 bgId)
{
- gUnknown_203AB58[bgId] = TRUE;
+ sScheduledBgCopiesToVram[bgId] = TRUE;
}
void DoScheduledBgTilemapCopiesToVram(void)
{
- if (gUnknown_203AB58[0] == TRUE)
+ if (sScheduledBgCopiesToVram[0] == TRUE)
{
CopyBgTilemapBufferToVram(0);
- gUnknown_203AB58[0] = FALSE;
+ sScheduledBgCopiesToVram[0] = FALSE;
}
- if (gUnknown_203AB58[1] == TRUE)
+ if (sScheduledBgCopiesToVram[1] == TRUE)
{
CopyBgTilemapBufferToVram(1);
- gUnknown_203AB58[1] = FALSE;
+ sScheduledBgCopiesToVram[1] = FALSE;
}
- if (gUnknown_203AB58[2] == TRUE)
+ if (sScheduledBgCopiesToVram[2] == TRUE)
{
CopyBgTilemapBufferToVram(2);
- gUnknown_203AB58[2] = FALSE;
+ sScheduledBgCopiesToVram[2] = FALSE;
}
- if (gUnknown_203AB58[3] == TRUE)
+ if (sScheduledBgCopiesToVram[3] == TRUE)
{
CopyBgTilemapBufferToVram(3);
- gUnknown_203AB58[3] = FALSE;
+ sScheduledBgCopiesToVram[3] = FALSE;
}
}
@@ -205,11 +207,11 @@ void ResetTempTileDataBuffers(void)
{
int i;
- for (i = 0; i < (s32)NELEMS(gUnknown_203AB60); i++)
+ for (i = 0; i < (s32)NELEMS(sTempTileDataBuffers); i++)
{
- gUnknown_203AB60[i] = NULL;
+ sTempTileDataBuffers[i] = NULL;
}
- gUnknown_203AB5C = 0;
+ sTempTileDataBufferCursor = 0;
}
bool8 FreeTempTileDataBuffersIfPossible(void)
@@ -218,13 +220,13 @@ bool8 FreeTempTileDataBuffersIfPossible(void)
if (!IsDma3ManagerBusyWithBgCopy())
{
- if (gUnknown_203AB5C)
+ if (sTempTileDataBufferCursor)
{
- for (i = 0; i < gUnknown_203AB5C; i++)
+ for (i = 0; i < sTempTileDataBufferCursor; i++)
{
- FREE_AND_SET_NULL(gUnknown_203AB60[i]);
+ FREE_AND_SET_NULL(sTempTileDataBuffers[i]);
}
- gUnknown_203AB5C = 0;
+ sTempTileDataBufferCursor = 0;
}
return FALSE;
}
@@ -238,7 +240,7 @@ void *DecompressAndCopyTileDataToVram(u8 bgId, const void *src, u32 size, u16 of
{
u32 sizeOut;
- if (gUnknown_203AB5C < NELEMS(gUnknown_203AB60))
+ if (sTempTileDataBufferCursor < NELEMS(sTempTileDataBuffers))
{
void *ptr = MallocAndDecompress(src, &sizeOut);
if (!size)
@@ -246,7 +248,7 @@ void *DecompressAndCopyTileDataToVram(u8 bgId, const void *src, u32 size, u16 of
if (ptr)
{
CopyDecompressedTileDataToVram(bgId, ptr, size, offset, mode);
- gUnknown_203AB60[gUnknown_203AB5C++] = ptr;
+ sTempTileDataBuffers[sTempTileDataBufferCursor++] = ptr;
}
return ptr;
}
@@ -257,7 +259,7 @@ void *DecompressAndCopyTileDataToVram2(u8 bgId, const void *src, u32 size, u16 o
{
u32 sizeOut;
- if (gUnknown_203AB5C < NELEMS(gUnknown_203AB60))
+ if (sTempTileDataBufferCursor < NELEMS(sTempTileDataBuffers))
{
void *ptr = MallocAndDecompress(src, &sizeOut);
if (sizeOut > size)
@@ -265,7 +267,7 @@ void *DecompressAndCopyTileDataToVram2(u8 bgId, const void *src, u32 size, u16 o
if (ptr)
{
CopyDecompressedTileDataToVram(bgId, ptr, sizeOut, offset, mode);
- gUnknown_203AB60[gUnknown_203AB5C++] = ptr;
+ sTempTileDataBuffers[sTempTileDataBufferCursor++] = ptr;
}
return ptr;
}
diff --git a/src/poison.c b/src/poison.c
index 004e9aa98..7a0788c29 100644
--- a/src/poison.c
+++ b/src/poison.c
@@ -134,7 +134,7 @@ static const union AffineAnimCmd gUnknown_83E6A68[] =
AFFINEANIMCMD_JUMP(0),
};
-static const union AffineAnimCmd *const gUnknown_83E6A80[] =
+const union AffineAnimCmd *const gUnknown_83E6A80[] =
{
gUnknown_83E6A68,
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 19:01:43 +0000