summaryrefslogtreecommitdiff
path: root/src/battle/anim/wisp_orb.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-04-30 13:42:55 -0700
committerGitHub <noreply@github.com>2018-04-30 13:42:55 -0700
commit74f9ec9464e5346ae277c9c929ef4b965276fc02 (patch)
tree6e12c5e3f456ad444d37853f0bb8e0a03bd85003 /src/battle/anim/wisp_orb.c
parente437b10eee6f843e1898ce9b0302afb17f8b81e9 (diff)
parentd68e8b09eecd136fc0dcc32c1e08b946b8981adc (diff)
Merge pull request #608 from huderlem/anim_rodata
Move battle anim .rodata
Diffstat (limited to 'src/battle/anim/wisp_orb.c')
-rw-r--r--src/battle/anim/wisp_orb.c47
1 files changed, 47 insertions, 0 deletions
diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c
index 90b90acb7..32373ca2a 100644
--- a/src/battle/anim/wisp_orb.c
+++ b/src/battle/anim/wisp_orb.c
@@ -11,11 +11,58 @@ extern u8 gAnimBankTarget;
extern u16 gBattleTypeFlags;
extern u8 gUnknown_0202F7D2;
+void sub_80D5B0C(struct Sprite *sprite);
static void sub_80D5C5C(struct Sprite *);
// wisp_orb (animates the wisp orbs)
// Used in Will-O-Wisp
+const union AnimCmd gSpriteAnim_83D9710[] =
+{
+ ANIMCMD_FRAME(0, 5),
+ ANIMCMD_FRAME(4, 5),
+ ANIMCMD_FRAME(8, 5),
+ ANIMCMD_FRAME(12, 5),
+ ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gSpriteAnim_83D9724[] =
+{
+ ANIMCMD_FRAME(16, 5),
+ ANIMCMD_END,
+};
+
+const union AnimCmd gSpriteAnim_83D972C[] =
+{
+ ANIMCMD_FRAME(20, 5),
+ ANIMCMD_END,
+};
+
+const union AnimCmd gSpriteAnim_83D9734[] =
+{
+ ANIMCMD_FRAME(20, 5),
+ ANIMCMD_END,
+};
+
+const union AnimCmd *const gSpriteAnimTable_83D973C[] =
+{
+ gSpriteAnim_83D9710,
+ gSpriteAnim_83D9724,
+ gSpriteAnim_83D972C,
+ gSpriteAnim_83D9734,
+};
+
+const struct SpriteTemplate gBattleAnimSpriteTemplate_83D974C =
+{
+ .tileTag = 10231,
+ .paletteTag = 10231,
+ .oam = &gOamData_837DF2C,
+ .anims = gSpriteAnimTable_83D973C,
+ .images = NULL,
+ .affineAnims = gDummySpriteAffineAnimTable,
+ .callback = sub_80D5B0C,
+};
+
void sub_80D5B0C(struct Sprite *sprite)
{
switch (sprite->data[0])