From 7244b80fc6b19d7ae5d7b9d15ce6a70955696cc2 Mon Sep 17 00:00:00 2001
From: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun, 21 Jun 2020 02:36:46 -0400
Subject: [PATCH] Created constant for easier Ball Expansion.

---
 include/constants/items.h      | 2 ++
 src/battle_controller_player.c | 2 +-
 src/battle_main.c              | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/constants/items.h b/include/constants/items.h
index fafcac8b18..071e7a3e98 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -17,6 +17,8 @@
 #define ITEM_LUXURY_BALL 11
 #define ITEM_PREMIER_BALL 12
 
+#define END_BALLS ITEM_PREMIER_BALL
+
 // Pokemon Items
 #define ITEM_POTION 13
 #define ITEM_ANTIDOTE 14
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 6dd9cd2f48..031b3bdde8 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -316,7 +316,7 @@ static void HandleInputChooseAction(void)
             if (gBattleBufferA[gActiveBattler][1] == B_ACTION_USE_ITEM)
             {
                 // Add item to bag if it is a ball
-                if (itemId <= ITEM_PREMIER_BALL)
+                if (itemId <= END_BALLS)
                     AddBagItem(itemId, 1);
                 else
                     return;
diff --git a/src/battle_main.c b/src/battle_main.c
index e3eea60d0d..805f1dcacf 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -5547,7 +5547,7 @@ static void HandleAction_UseItem(void)
     ClearFuryCutterDestinyBondGrudge(gBattlerAttacker);
     gLastUsedItem = gBattleBufferB[gBattlerAttacker][1] | (gBattleBufferB[gBattlerAttacker][2] << 8);
 
-    if (gLastUsedItem <= ITEM_PREMIER_BALL) // is ball
+    if (gLastUsedItem <= END_BALLS) // is ball
     {
         gBattlescriptCurrInstr = gBattlescriptsForBallThrow[gLastUsedItem];
     }