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

Beast ball effect.

Browse source
This commit is contained in:
Eduardo Quezada 2020-10-23 23:43:07 -03:00
parent 3a3ef1a369
commit 14f3d69c83
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/battle_script_commands.c
View file

@ -9781,6 +9781,19 @@ static void Cmd_handleballthrow(void)
else else
catchRate = gBaseStats[gBattleMons[gBattlerTarget].species].catchRate; catchRate = gBaseStats[gBattleMons[gBattlerTarget].species].catchRate;
#ifdef POKEMON_EXPANSION
if (IS_ULTRA_BEAST(gBattleMons[gBattlerTarget].species))
{
if (gLastUsedItem == ITEM_BEAST_BALL)
ballMultiplier = 50;
else
ballMultiplier = 1;
}
else
{
#endif
if (gLastUsedItem > ITEM_SAFARI_BALL) if (gLastUsedItem > ITEM_SAFARI_BALL)
{ {
switch (gLastUsedItem) switch (gLastUsedItem)
@ -9944,11 +9957,18 @@ static void Cmd_handleballthrow(void)
ballMultiplier = 10; ballMultiplier = 10;
#endif #endif
break; break;
case ITEM_BEAST_BALL:
ballMultiplier = 1;
break;
} }
} }
else else
ballMultiplier = sBallCatchBonuses[gLastUsedItem - ITEM_ULTRA_BALL]; ballMultiplier = sBallCatchBonuses[gLastUsedItem - ITEM_ULTRA_BALL];
#ifdef POKEMON_EXPANSION
}
#endif
odds = ((catchRate + ballAddition) * ballMultiplier / 10) odds = ((catchRate + ballAddition) * ballMultiplier / 10)
* (gBattleMons[gBattlerTarget].maxHP * 3 - gBattleMons[gBattlerTarget].hp * 2) * (gBattleMons[gBattlerTarget].maxHP * 3 - gBattleMons[gBattlerTarget].hp * 2)
/ (3 * gBattleMons[gBattlerTarget].maxHP); / (3 * gBattleMons[gBattlerTarget].maxHP);