summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/berry.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/berry.c b/src/berry.c
index 7b0b2cdb0..7cd28d69f 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -902,12 +902,12 @@ bool32 IsEnigmaBerryValid(void)
const struct Berry *GetBerryInfo(u8 berry)
{
- if (berry == GETBERRYID(ITEM_ENIGMA_BERRY) && IsEnigmaBerryValid())
+ if (berry == ITEM_TO_BERRY(ITEM_ENIGMA_BERRY) && IsEnigmaBerryValid())
return (struct Berry*)(&gSaveBlock1Ptr->enigmaBerry.berry);
else
{
- if (berry == BERRY_NONE || berry > GETBERRYID(LAST_BERRY))
- berry = GETBERRYID(FIRST_BERRY);
+ if (berry == BERRY_NONE || berry > ITEM_TO_BERRY(LAST_BERRY_INDEX))
+ berry = ITEM_TO_BERRY(FIRST_BERRY_INDEX);
return &gBerries[berry - 1];
}
}