ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-24 22:48:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

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;