From afc89f53b065ac6f1d5fae79e9ee403f5d9f1ba3 Mon Sep 17 00:00:00 2001 From: RavePossum <145081120+ravepossum@users.noreply.github.com> Date: Tue, 22 Oct 2024 10:27:10 -0400 Subject: [PATCH] Fix weather genie move anims and springtide storm targets (#5553) --- src/battle_anim_flying.c | 8 ++++++-- src/data/moves_info.h | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/battle_anim_flying.c b/src/battle_anim_flying.c index 1fd587fa4cdf..159188785536 100644 --- a/src/battle_anim_flying.c +++ b/src/battle_anim_flying.c @@ -356,10 +356,14 @@ const struct SpriteTemplate gSkyAttackBirdSpriteTemplate = .callback = AnimSkyAttackBird, }; -// same as AnimEllipticalGust but centered on targets +// same as AnimEllipticalGust but centered on targets in a double battle static void AnimEllipticalGustCentered(struct Sprite *sprite) { - InitSpritePosToAnimTargetsCentre(sprite, FALSE); + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) + InitSpritePosToAnimTargetsCentre(sprite, FALSE); + else + InitSpritePosToAnimTarget(sprite, FALSE); + sprite->y += 20; sprite->data[1] = 191; sprite->callback = AnimEllipticalGust_Step; diff --git a/src/data/moves_info.h b/src/data/moves_info.h index 22ca581df4c9..4eee90a8025e 100644 --- a/src/data/moves_info.h +++ b/src/data/moves_info.h @@ -18800,7 +18800,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .type = TYPE_FAIRY, .accuracy = 80, .pp = 5, - .target = MOVE_TARGET_SELECTED, + .target = MOVE_TARGET_BOTH, .priority = 0, .category = DAMAGE_CATEGORY_SPECIAL, .windMove = TRUE,