atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2147 from Sneed69/r-ball-pike

Browse source 
Disable last used ball in battle pike
This commit is contained in:
Eduardo Quezada D'Ottone 2022-05-19 22:04:21 -04:00 committed by GitHub
commit df55a185ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/battle_interface.c
View file

@ -3309,7 +3309,7 @@ bool32 CanThrowLastUsedBall(void)
#else
if (!CanThrowBall())
return FALSE;
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER | BATTLE_TYPE_FRONTIER))
return FALSE;
if (!CheckBagHasItem(gLastThrownBall, 1))
return FALSE;