From ebaeaa8ca77bd3550d88d7227a1b92335215df9d Mon Sep 17 00:00:00 2001 From: thornAvery <145814585+thornAvery@users.noreply.github.com> Date: Mon, 1 Sep 2025 12:56:04 +1000 Subject: [PATCH] Tossing balls lag back to Crystal levels (#73) Co-authored-by: Thorn Avery --- .gitignore | 4 ++++ engine/items/item_effects.asm | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 586d447..c63e2dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +# BGB + +bgb + # compiled objects *.o diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index cd4d2d2..51c3b0f 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -239,10 +239,12 @@ PokeBallEffect: ld [wWildMon], a ld a, [wBattleType] cp BATTLETYPE_CONTEST ; Fixes the Park Ball corrupting graphics when used outside of a Contest - call nz, ReturnToBattle_UseBall + jp z, .skip_return_to_battle cp BATTLETYPE_SAFARI - call nz, ReturnToBattle_UseBall + jp z, .skip_return_to_battle + call ReturnToBattle_UseBall +.skip_return_to_battle ld hl, wOptions res NO_TEXT_SCROLL, [hl] ld hl, ItemUsedText