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

remove 2nd case in CanThrowBall

Browse Source
This commit is contained in:
ghoulslash 2021-08-31 12:59:20 -04:00
parent e4fb9c4593
commit 88476e0ac2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/item_use.c
View File

@ -943,11 +943,14 @@ u32 CanThrowBall(void)
{
return 1; // There are two present pokemon.
}
else if (gBattlerInMenuId == GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT)
/*else if (gBattlerInMenuId == GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT)
&& IsBattlerAlive(GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)))
{
/* * this is removed. instead, selecting a ball to throw with the second mon just clears the action of your first mon.
* see the end of HandleTurnActionSelectionState in battle_main.c
*/
return 2; // Attempting to throw a ball with the second pokemon while both are alive.
}
}*/
else if (IsPlayerPartyAndPokemonStorageFull() == TRUE)
{
return 3; // No room for mon