mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-02-21 11:43:37 +01:00
Merge pull request #2147 from Sneed69/r-ball-pike
Disable last used ball in battle pike
This commit is contained in:
commit
df55a185ae
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user