From 3a3ef1a369176ba85cc0e376b535b9cc0dcc0521 Mon Sep 17 00:00:00 2001
From: Eduardo Quezada <eduardo602002@gmail.com>
Date: Fri, 23 Oct 2020 23:12:22 -0300
Subject: [PATCH] Reworked Heavy Ball

---
 src/battle_script_commands.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

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