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

last ball defaults to first bag pocket item

Browse source
This commit is contained in:
ghoulslash 2021-10-06 13:56:04 -04:00
parent ee3a2c97ee
commit 3d24fd5f30
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/battle_interface.c
View file

@ -3206,10 +3206,8 @@ bool32 CanThrowLastUsedBall(void)
void TryAddLastUsedBallItemSprites(void) void TryAddLastUsedBallItemSprites(void)
{ {
#if B_LAST_USED_BALL == TRUE #if B_LAST_USED_BALL == TRUE
if (gLastThrownBall == 0) if ((gLastThrownBall == 0
gLastThrownBall = ITEM_POKE_BALL; || (gLastThrownBall != 0 && !CheckBagHasItem(gLastThrownBall, 1)))
if (gLastThrownBall != 0 && !CheckBagHasItem(gLastThrownBall, 1))
{ {
// we're out of the last used ball, so just set it to the first ball in the bag // we're out of the last used ball, so just set it to the first ball in the bag
// we have to compact the bag first bc it is typically only compacted when you open it // we have to compact the bag first bc it is typically only compacted when you open it