diff options
| -rw-r--r-- | include/berry.h | 5 | ||||
| -rw-r--r-- | src/berry.c | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/include/berry.h b/include/berry.h index cfd66c61e..bef56ae41 100644 --- a/include/berry.h +++ b/include/berry.h @@ -2,11 +2,6 @@ #define GUARD_BERRY_H #define BERRY_NONE 0 -#define FIRST_BERRY ITEM_CHERI_BERRY -#define LAST_BERRY ITEM_ENIGMA_BERRY - -#define GETBERRYID(berry) ((berry - FIRST_BERRY) + 1) -#define GETITEMID(berry) ((berry + FIRST_BERRY) - 1) enum { 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]; } } |