summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSlawter666 <38655737+Slawter666@users.noreply.github.com>2018-11-06 23:15:57 +0000
committerSlawter666 <38655737+Slawter666@users.noreply.github.com>2018-11-06 23:15:57 +0000
commit15117a8d09743141595b3a8a1075b2fb74ccc8f7 (patch)
tree7a5af12f4950c16ce201aa5c5dc52d685cc78f24 /src
parentbd766b90491909b6bdd4c47a1cbd526f22bdc9c3 (diff)
Remove redundancy in berry.c
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];
}
}