diff --git a/data/battle_anims/framesets.asm b/data/battle_anims/framesets.asm index 10355e4e6..f851f3623 100644 --- a/data/battle_anims/framesets.asm +++ b/data/battle_anims/framesets.asm @@ -192,8 +192,8 @@ BattleAnimFrameData: dw .Frameset_BubbleSplash ; BATTLE_ANIM_FRAMESET_BUBBLE_SPLASH dw .Frameset_SmokePuff ; BATTLE_ANIM_FRAMESET_SMOKE_PUFF dw .Frameset_InkSplash ; BATTLE_ANIM_FRAMESET_INK_SPLASH - dw .Frameset_SpinningTriangle ; BATTLE_ANIM_FRAMESET_SPINNING_TRIANGLE - dw .Frameset_SpinningTriangleSlow ; BATTLE_ANIM_FRAMESET_SPINNING_SLOW + dw .Frameset_SpinningTriangle ; BATTLE_ANIM_FRAMESET_SHOOTING_TRIANGLE + dw .Frameset_SpinningTriangleSlow ; BATTLE_ANIM_FRAMESET_SPINNING_TRIANGLE dw .Frameset_BouncingMushroom ; BATTLE_ANIM_FRAMESET_BOUNCING_MUSHROOM assert_table_length NUM_BATTLE_ANIM_FRAMESETS diff --git a/data/battle_anims/objects.asm b/data/battle_anims/objects.asm index 805b95764..e41cd9e4a 100644 --- a/data/battle_anims/objects.asm +++ b/data/battle_anims/objects.asm @@ -413,7 +413,7 @@ BattleAnimObjects: battleanimobj RELATIVE_X, $90, BATTLE_ANIM_FRAMESET_INK_SPLASH, BATTLE_ANIM_FUNC_BUBBLE_SPLASH, PAL_BATTLE_OB_GRAY, BATTLE_ANIM_GFX_POISON ; BATTLE_ANIM_OBJ_DAZZLE battleanimobj RELATIVE_X, $88, BATTLE_ANIM_FRAMESET_SPARKLE, BATTLE_ANIM_FUNC_HIDDEN_POWER, PAL_BATTLE_OB_YELLOW, BATTLE_ANIM_GFX_SPEED -; BATTLE_ANIM_OBJ_SHOOTING_TRIANGLE +; BATTLE_ANIM_OBJ_SPINNING_TRIANGLE battleanimobj RELATIVE_X, $90, BATTLE_ANIM_FRAMESET_SPINNING_TRIANGLE, BATTLE_ANIM_FUNC_USER_TO_TARGET_DISAPPEAR, PAL_BATTLE_OB_GRAY, BATTLE_ANIM_GFX_TRIANGLE ; BATTLE_ANIM_OBJ_SHOOTING_TRIANGLE battleanimobj RELATIVE_X, $90, BATTLE_ANIM_FRAMESET_SPINNING_TRIANGLE_SLOW, BATTLE_ANIM_FUNC_NULL, PAL_BATTLE_OB_GRAY, BATTLE_ANIM_GFX_TRIANGLE