summaryrefslogtreecommitdiff
path: root/src/battle/anim/flying_hearts.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-04-29 12:52:21 -0700
committerMarcus Huderle <huderlem@gmail.com>2018-04-29 12:52:21 -0700
commitc88cf196af0f099f4daa7cbc06b9b0df9a31c60c (patch)
treef90fb1f81857964a3bd24962a13573c7c74ca921 /src/battle/anim/flying_hearts.c
parentdb5067c512a33ef913bb3e2d4cbef589d32a48a6 (diff)
Move another chunk of battle anim .rodata
Diffstat (limited to 'src/battle/anim/flying_hearts.c')
-rw-r--r--src/battle/anim/flying_hearts.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/battle/anim/flying_hearts.c b/src/battle/anim/flying_hearts.c
index f20416535..2bba6c4cb 100644
--- a/src/battle/anim/flying_hearts.c
+++ b/src/battle/anim/flying_hearts.c
@@ -8,11 +8,23 @@ extern s16 gBattleAnimArgs[];
extern u8 gAnimBankAttacker;
extern u8 gAnimBankTarget;
+void sub_80D2064(struct Sprite* sprite);
static void sub_80D2094(struct Sprite* sprite);
// flying_hearts (hearts float upward from the bottom of the screen.)
// Used in Attract.
+const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7AE0 =
+{
+ .tileTag = 10216,
+ .paletteTag = 10216,
+ .oam = &gOamData_837DF2C,
+ .anims = gDummySpriteAnimTable,
+ .images = NULL,
+ .affineAnims = gDummySpriteAffineAnimTable,
+ .callback = sub_80D2064,
+};
+
void sub_80D2064(struct Sprite* sprite)
{
sprite->pos1.x = gBattleAnimArgs[0];
@@ -23,7 +35,7 @@ void sub_80D2064(struct Sprite* sprite)
StoreSpriteCallbackInData(sprite, sub_80D2094);
}
-void sub_80D2094(struct Sprite* sprite)
+static void sub_80D2094(struct Sprite* sprite)
{
s16 y;
sprite->data[2] += sprite->data[1];