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

Reworked Heavy Ball

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

30
src/battle_script_commands.c
View file

@ -9751,6 +9751,7 @@ static void Cmd_removelightscreenreflect(void) // brick break
static void Cmd_handleballthrow(void) static void Cmd_handleballthrow(void)
{ {
u8 ballMultiplier = 10; u8 ballMultiplier = 10;
s8 ballAddition = 0;
if (gBattleControllerExecFlags) if (gBattleControllerExecFlags)
return; return;
@ -9885,24 +9886,33 @@ static void Cmd_handleballthrow(void)
i = GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), 1); i = GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), 1);
#if I_HEAVY_BALL_MODIFIER >= GEN_7 #if I_HEAVY_BALL_MODIFIER >= GEN_7
if (i < 1000) if (i < 1000)
ballMultiplier = 5; ballAddition = -20;
else if (i < 2000) else if (i < 2000)
ballMultiplier = 10; ballAddition = 0;
else if (i < 3000) else if (i < 3000)
ballMultiplier = 20; ballAddition = 20;
else else
ballMultiplier = 30; ballAddition = 30;
#elif I_HEAVY_BALL_MODIFIER >= GEN_4
if (i < 2028)
ballAddition = -20;
else if (i < 3072)
ballAddition = 20;
else if (i < 4096)
ballAddition = 30;
else
ballAddition = 40;
#else #else
if (i < 1024) if (i < 1024)
ballMultiplier = 5; ballAddition = -20;
else if (i < 2048) else if (i < 2048)
ballMultiplier = 10; ballAddition = 0;
else if (i < 3072) else if (i < 3072)
ballMultiplier = 20; ballAddition = 20;
else if (i < 4096) else if (i < 4096)
ballMultiplier = 30; ballAddition = 30;
else else
ballMultiplier = 40; ballAddition = 40;
#endif #endif
break; break;
case ITEM_FAST_BALL: case ITEM_FAST_BALL:
@ -9939,7 +9949,7 @@ static void Cmd_handleballthrow(void)
else else
ballMultiplier = sBallCatchBonuses[gLastUsedItem - ITEM_ULTRA_BALL]; ballMultiplier = sBallCatchBonuses[gLastUsedItem - ITEM_ULTRA_BALL];
odds = (catchRate * 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);