Skip to content

Commit

Permalink
Document Tackle is missing part of its hit animation
Browse files Browse the repository at this point in the history
Co-Authored-By: SoupPotato <[email protected]>
  • Loading branch information
vulcandth and SoupPotato committed Jan 2, 2024
1 parent 804fa84 commit b40c75d
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
1 change: 1 addition & 0 deletions data/moves/animations.asm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 17 additions & 0 deletions docs/bugs_and_glitches.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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


Expand Down

0 comments on commit b40c75d

Please sign in to comment.