mirror of
https://github.com/thornAvery/jep-hack.git
synced 2025-09-16 18:20:50 +12:00
Tossing balls lag back to Crystal levels (#73)
Co-authored-by: Thorn Avery <thorn@avery.garden>
This commit is contained in:
parent
2755b8e6c1
commit
ebaeaa8ca7
4
.gitignore
vendored
4
.gitignore
vendored
|
@ -1,3 +1,7 @@
|
||||||
|
# BGB
|
||||||
|
|
||||||
|
bgb
|
||||||
|
|
||||||
# compiled objects
|
# compiled objects
|
||||||
*.o
|
*.o
|
||||||
|
|
||||||
|
|
|
@ -239,10 +239,12 @@ PokeBallEffect:
|
||||||
ld [wWildMon], a
|
ld [wWildMon], a
|
||||||
ld a, [wBattleType]
|
ld a, [wBattleType]
|
||||||
cp BATTLETYPE_CONTEST ; Fixes the Park Ball corrupting graphics when used outside of a Contest
|
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
|
cp BATTLETYPE_SAFARI
|
||||||
call nz, ReturnToBattle_UseBall
|
jp z, .skip_return_to_battle
|
||||||
|
call ReturnToBattle_UseBall
|
||||||
|
|
||||||
|
.skip_return_to_battle
|
||||||
ld hl, wOptions
|
ld hl, wOptions
|
||||||
res NO_TEXT_SCROLL, [hl]
|
res NO_TEXT_SCROLL, [hl]
|
||||||
ld hl, ItemUsedText
|
ld hl, ItemUsedText
|
||||||
|
|
Loading…
Reference in a new issue