summaryrefslogtreecommitdiff
path: root/src/battle/anim/unused_3.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-04-28 19:11:47 -0700
committerMarcus Huderle <huderlem@gmail.com>2018-04-28 19:11:47 -0700
commitdb5067c512a33ef913bb3e2d4cbef589d32a48a6 (patch)
tree94b50831d41c29064c31a7149a6f1c9e7fc24acb /src/battle/anim/unused_3.c
parentbceafd3a21512167deb76fb46c3f5c4499361409 (diff)
Move more .rodata into battle anim files
Diffstat (limited to 'src/battle/anim/unused_3.c')
-rw-r--r--src/battle/anim/unused_3.c47
1 files changed, 45 insertions, 2 deletions
diff --git a/src/battle/anim/unused_3.c b/src/battle/anim/unused_3.c
index a89ed0246..1c3ab978e 100644
--- a/src/battle/anim/unused_3.c
+++ b/src/battle/anim/unused_3.c
@@ -8,10 +8,53 @@ extern s16 gBattleAnimArgs[];
extern u8 gAnimBankAttacker;
extern u8 gAnimBankTarget;
+void sub_80CD274(struct Sprite* sprite);
static void sub_80CD2D4(struct Sprite* sprite);
// unused_3 (seems to be some sort of popping effect with a growing diamond shape)
-// yet another unused effect...
+
+const union AnimCmd gSpriteAnim_83D6CB8[] =
+{
+ ANIMCMD_FRAME(0, 10),
+ ANIMCMD_FRAME(4, 10),
+ ANIMCMD_FRAME(8, 10),
+ ANIMCMD_FRAME(12, 10),
+ ANIMCMD_FRAME(16, 26),
+ ANIMCMD_FRAME(16, 5),
+ ANIMCMD_FRAME(20, 5),
+ ANIMCMD_FRAME(24, 15),
+ ANIMCMD_END,
+};
+
+const union AnimCmd gSpriteAnim_83D6CDC[] =
+{
+ ANIMCMD_FRAME(0, 10, .hFlip = TRUE),
+ ANIMCMD_FRAME(4, 10, .hFlip = TRUE),
+ ANIMCMD_FRAME(8, 10, .hFlip = TRUE),
+ ANIMCMD_FRAME(12, 10, .hFlip = TRUE),
+ ANIMCMD_FRAME(16, 26, .hFlip = TRUE),
+ ANIMCMD_FRAME(16, 5, .hFlip = TRUE),
+ ANIMCMD_FRAME(20, 5, .hFlip = TRUE),
+ ANIMCMD_FRAME(24, 15, .hFlip = TRUE),
+ ANIMCMD_END,
+};
+
+const union AnimCmd *const gSpriteAnimTable_83D6D00[] =
+{
+ gSpriteAnim_83D6CB8,
+ gSpriteAnim_83D6CDC,
+};
+
+const struct SpriteTemplate gSpriteTemplate_83D6D08 =
+{
+ .tileTag = 10032,
+ .paletteTag = 10032,
+ .oam = &gOamData_837DF2C,
+ .anims = gSpriteAnimTable_83D6D00,
+ .images = NULL,
+ .affineAnims = gDummySpriteAffineAnimTable,
+ .callback = sub_80CD274,
+};
void sub_80CD274(struct Sprite* sprite)
{
@@ -31,7 +74,7 @@ void sub_80CD274(struct Sprite* sprite)
sprite->callback = sub_80CD2D4;
}
-void sub_80CD2D4(struct Sprite* sprite)
+static void sub_80CD2D4(struct Sprite* sprite)
{
if (++sprite->data[0] > 30)
{