diff options
| author | Eduardo Quezada <eduardo602002@gmail.com> | 2020-06-21 02:36:46 -0400 |
|---|---|---|
| committer | Eduardo Quezada <eduardo602002@gmail.com> | 2020-06-21 02:36:46 -0400 |
| commit | 7244b80fc6b19d7ae5d7b9d15ce6a70955696cc2 (patch) | |
| tree | c5e7df567a6b4e459758e958f7793c36842d6101 | |
| parent | 46f4a4bbf7239743c333cd32d30b74a7b3176acc (diff) | |
Created constant for easier Ball Expansion.
| -rw-r--r-- | include/constants/items.h | 2 | ||||
| -rw-r--r-- | src/battle_controller_player.c | 2 | ||||
| -rw-r--r-- | 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 fafcac8b1..071e7a3e9 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 6dd9cd2f4..031b3bdde 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 e3eea60d0..805f1dcac 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]; } |