From 87407dac42dd83d4d5977986a70b7b85a21e6a17 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 1 Jan 2024 21:46:23 -0500 Subject: [PATCH] pokecrystal 804fa846e0f9c6d70507b0c402e9b3f583030339 --- docs/bugs_and_glitches.md | 13 +++++++++++++ engine/battle/core.asm | 1 + 2 files changed, 14 insertions(+) diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 431edf257..2e638126a 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -84,6 +84,7 @@ Fixes in the [multi-player battle engine](#multi-player-battle-engine) category - [Team Rocket battle music is not used for Executives or Scientists](#team-rocket-battle-music-is-not-used-for-executives-or-scientists) - [No bump noise if standing on tile `$3E`](#no-bump-noise-if-standing-on-tile-3e) - [Playing Entei's Pokédex cry can distort Raikou's and Suicune's](#playing-enteis-pok%C3%A9dex-cry-can-distort-raikous-and-suicunes) + - [`SFX_RUN` does not play correctly when a wild Pokémon flees from battle](#sfx_run-does-not-play-correctly-when-a-wild-pok%C3%A9mon-flees-from-battle) - [Text](#text) - [Five-digit experience gain is printed incorrectly](#five-digit-experience-gain-is-printed-incorrectly) - [Only the first three evolution entries can have Stone compatibility reported correctly](#only-the-first-three-evolution-entries-can-have-stone-compatibility-reported-correctly) @@ -2743,3 +2744,15 @@ This bug allows all the options to be updated at once if the left or right butto ld a, [hl] push af ``` + + +### `SFX_RUN` does not play correctly when a wild Pokémon flees from battle + +**Fix:** Edit `WildFled_EnemyFled_LinkBattleCanceled` in [engine/battle/core.asm](https://github.com/pret/pokecrystal/blob/master/engine/battle/core.asm): + +```diff +-; BUG: SFX_RUN does not play correctly when a wild Pokemon flees from battle (see docs/bugs_and_glitches.md) + ld de, SFX_RUN +- call PlaySFX ++ call WaitPlaySFX +``` diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 3bb616fa1..1578b474a 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -136,6 +136,7 @@ WildFled_EnemyFled_LinkBattleCanceled: .skip_text call StopDangerSound +; BUG: SFX_RUN does not play correctly when a wild Pokémon flees from battle (see docs/bugs_and_glitches.md) ld de, SFX_RUN call PlaySFX