ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renamed constant,

Browse Source
This commit is contained in:
Eduardo Quezada 2020-07-12 01:49:32 -04:00
parent 7244b80fc6
commit b31efcd6e3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/constants/items.h
View File

@ -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

2
src/battle_controller_player.c
View File

@ -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;

2
src/battle_main.c
View File

@ -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];
}