Created constant for easier Ball Expansion.

TheXaman · Jun 21, 2020 · 7244b80 · 7244b80
1 parent 46f4a4b
commit 7244b80
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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];
     }