From b6fa61a59a063f99b14ecf8311e87130efed61a3 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 15 Oct 2018 23:49:09 -0400 Subject: finish naming anim tags --- src/battle/anim/hidden_power_orbit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/battle/anim/hidden_power_orbit.c') diff --git a/src/battle/anim/hidden_power_orbit.c b/src/battle/anim/hidden_power_orbit.c index ed680b2bd..2fce2da37 100644 --- a/src/battle/anim/hidden_power_orbit.c +++ b/src/battle/anim/hidden_power_orbit.c @@ -27,8 +27,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7B10[] = const struct SpriteTemplate gHiddenPowerOrbSpriteTemplate = { - .tileTag = 10217, - .paletteTag = 10217, + .tileTag = ANIM_TAG_RED_ORB, + .paletteTag = ANIM_TAG_RED_ORB, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -38,8 +38,8 @@ const struct SpriteTemplate gHiddenPowerOrbSpriteTemplate = const struct SpriteTemplate gHiddenPowerOrbScatterSpriteTemplate = { - .tileTag = 10217, - .paletteTag = 10217, + .tileTag = ANIM_TAG_RED_ORB, + .paletteTag = ANIM_TAG_RED_ORB, .oam = &gOamData_837DFEC, .anims = gDummySpriteAnimTable, .images = NULL, -- cgit v1.2.3 From fb500f0da146fc7c13761f09c9a0fe067204163d Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 16 Oct 2018 11:10:12 -0400 Subject: document battle anim script commands --- src/battle/anim/hidden_power_orbit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle/anim/hidden_power_orbit.c') diff --git a/src/battle/anim/hidden_power_orbit.c b/src/battle/anim/hidden_power_orbit.c index 2fce2da37..3d1cd74c0 100644 --- a/src/battle/anim/hidden_power_orbit.c +++ b/src/battle/anim/hidden_power_orbit.c @@ -58,7 +58,7 @@ void AnimOrbitFast(struct Sprite* sprite) sprite->affineAnimPaused = 1; sprite->data[0] = gBattleAnimArgs[0]; sprite->data[1] = gBattleAnimArgs[1]; - sprite->data[7] = sub_8079E90(gAnimBankAttacker); + sprite->data[7] = GetBattlerSubpriority(gAnimBankAttacker); sprite->callback = AnimOrbitFastStep; sprite->callback(sprite); } -- cgit v1.2.3