From b40c75d9029306b77b83ac3bd2164fe48a03309b Mon Sep 17 00:00:00 2001 From: vulcandth Date: Mon, 1 Jan 2024 21:18:10 -0600 Subject: [PATCH] Document Tackle is missing part of its hit animation Co-Authored-By: SoupPotato <22991349+SoupPotato@users.noreply.github.com> --- data/moves/animations.asm | 1 + docs/bugs_and_glitches.md | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 5c2499016e4..46f0685f164 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -2082,6 +2082,7 @@ BattleAnim_Headbutt: anim_ret BattleAnim_Tackle: +; BUG: Tackle is missing part of its hit animation (see docs/bugs_and_glitches.md) anim_1gfx BATTLE_ANIM_GFX_HIT anim_call BattleAnim_TargetObj_2Row anim_bgeffect BATTLE_BG_EFFECT_TACKLE, $0, BG_EFFECT_USER, $0 diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 44ea96dd07f..049ca8543b1 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -78,6 +78,7 @@ Fixes in the [multi-player battle engine](#multi-player-battle-engine) category - [Using a Park Ball in non-Contest battles has a corrupt animation](#using-a-park-ball-in-non-contest-battles-has-a-corrupt-animation) - [Battle transitions fail to account for the enemy's level](#battle-transitions-fail-to-account-for-the-enemys-level) - [Some trainer NPCs have inconsistent overworld sprites](#some-trainer-npcs-have-inconsistent-overworld-sprites) + - [Tackle is missing part of its hit animation](#tackle-is-missing-part-of-its-hit-animation) - [Audio](#audio) - [Slot machine payout sound effects cut each other off](#slot-machine-payout-sound-effects-cut-each-other-off) - [Team Rocket battle music is not used for Executives or Scientists](#team-rocket-battle-music-is-not-used-for-executives-or-scientists) @@ -2065,6 +2066,22 @@ Most of the NPCs in [maps/NationalParkBugContest.asm](https://github.com/pret/po (The use of `SPRITE_ROCKER` instead of `SPRITE_COOLTRAINER_M` for `COOLTRAINERM NICK` may also be an intentional reference to the player's brother from the [Space World '97 beta](https://github.com/pret/pokegold-spaceworld).) +### Tackle is missing part of its hit animation + +Copying two rows causes `BATTLE_BG_EFFECT_TACKLE` to hit the horizontal sprite limit. This fix restores the animation to copy only one row like in Pokémon Gold and Silver. + +**Fix:** Edit `BattleAnim_Tackle` in [data/moves/animations.asm](https://github.com/pret/pokecrystal/blob/master/data/moves/animations.asm): + +```diff + BattleAnim_Tackle: +-; BUG: Tackle is missing part of its hit animation (see docs/bugs_and_glitches.md) + anim_1gfx BATTLE_ANIM_GFX_HIT +- anim_call BattleAnim_TargetObj_2Row ++ anim_call BattleAnim_TargetObj_1Row + anim_bgeffect BATTLE_BG_EFFECT_TACKLE, $0, BG_EFFECT_USER, $0 +``` + + ## Audio