diff options
| author | Eduardo Quezada <eduardo602002@gmail.com> | 2020-07-12 01:49:32 -0400 |
|---|---|---|
| committer | Eduardo Quezada <eduardo602002@gmail.com> | 2020-07-12 01:49:32 -0400 |
| commit | b31efcd6e3da8fc303a19d9845ca5e9a7d294747 (patch) | |
| tree | 417e220ea8953dcd907c72963398c8f030472f1e | |
| parent | 7244b80fc6b19d7ae5d7b9d15ce6a70955696cc2 (diff) | |
Renamed constant,
| -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, 3 insertions, 3 deletions
diff --git a/include/constants/items.h b/include/constants/items.h index 071e7a3e9..ba4d3c49e 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -17,7 +17,7 @@ #define ITEM_LUXURY_BALL 11 #define ITEM_PREMIER_BALL 12 -#define END_BALLS ITEM_PREMIER_BALL +#define LAST_BALL ITEM_PREMIER_BALL // Pokemon Items #define ITEM_POTION 13 diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 031b3bdde..b933b4a60 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 <= END_BALLS) + if (itemId <= LAST_BALL) AddBagItem(itemId, 1); else return; diff --git a/src/battle_main.c b/src/battle_main.c index 805f1dcac..d6e3d5845 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 <= END_BALLS) // is ball + if (gLastUsedItem <= LAST_BALL) // is ball { gBattlescriptCurrInstr = gBattlescriptsForBallThrow[gLastUsedItem]; } |