diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-26 06:45:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-26 06:45:00 -0400 |
| commit | eafb77fbb912d22294f168c1e6e89575b35f0d6c (patch) | |
| tree | 286f735ca16bd576926197f4f6a80ab6f0c24dc4 /src/berry.c | |
| parent | 7579fc65c12bd46c045d10eb8cd9a2320fd1f3f0 (diff) | |
| parent | 0ae4d58e985dcc3d265ea30505f439c34eab21ab (diff) | |
Merge pull request #125 from jiangzhengwenjz/battle
battle (3rd take)
Diffstat (limited to 'src/berry.c')
| -rw-r--r-- | src/berry.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/berry.c b/src/berry.c index 91d83f40c..d349109d2 100644 --- a/src/berry.c +++ b/src/berry.c @@ -134,7 +134,7 @@ bool32 IsEnigmaBerryValid(void) return TRUE; } -const struct Berry * sub_809C8A0(u8 berryIdx) +const struct Berry * GetBerryInfo(u8 berryIdx) { if (berryIdx == ITEM_TO_BERRY(ITEM_ENIGMA_BERRY) && IsEnigmaBerryValid()) return (struct Berry *)&gSaveBlock1Ptr->enigmaBerry.berry; @@ -163,7 +163,7 @@ u16 BerryTypeToItemId(u16 berryType) void GetBerryNameByBerryType(u8 berryType, u8 * dest) { - const struct Berry * berry = sub_809C8A0(berryType); + const struct Berry * berry = GetBerryInfo(berryType); memcpy(dest, berry->name, 6); dest[6] = EOS; } |