diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-01-19 12:49:08 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-01-19 12:49:08 -0600 |
| commit | c74334c26a1565b3cae586efd2f8a07a8bb0f912 (patch) | |
| tree | c4ce2aad0f40f772bd1443bac3d419db188f9bcb | |
| parent | 4c6511c8f991e583c64ac0aa8912285600161b51 (diff) | |
Fix address of berry struct in item.c
| -rw-r--r-- | data/contest.s | 6 | ||||
| -rw-r--r-- | src/item.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/data/contest.s b/data/contest.s index 4bb54bd00..0db64b13a 100644 --- a/data/contest.s +++ b/data/contest.s @@ -303,11 +303,7 @@ gUnknown_08587FA4:: @ 8587FA4 .align 2 gUnknown_085880A4:: @ 85880A4 - .incbin "baserom.gba", 0x5880a4, 0x1740 - - .align 2 -gUnknown_085897E4:: @ 85897E4 - .incbin "baserom.gba", 0x5897e4, 0xc0 + .incbin "baserom.gba", 0x5880a4, 0x1800 gUnknown_085898A4:: @ 85898A4 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/src/item.c b/src/item.c index 931027e25..a17599db9 100644 --- a/src/item.c +++ b/src/item.c @@ -1,5 +1,6 @@ #include "global.h" #include "item.h" +#include "berry.h" #include "constants/items.h" #include "string_util.h" #include "text.h" @@ -11,7 +12,6 @@ extern bool8 InBattlePyramid(void); extern const u8 gText_PokeBalls[]; extern const u8 gText_Berries[]; extern const u8 gText_Berry[]; -extern const u8 gUnknown_085897E4[][28]; // not sure what this one is bool8 CheckPyramidBagHasItem(u16 itemId, u16 count); bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count); @@ -96,8 +96,8 @@ void CopyItemNameHandlePlural(u16 itemId, u8 *string, u32 quantity) } else { - if (itemId >= 0x85 && itemId <= 0xAF) - GetBerryCountString(string, gUnknown_085897E4[itemId], quantity); + if (itemId >= ITEM_CHERI_BERRY && itemId <= ITEM_ENIGMA_BERRY) + GetBerryCountString(string, gBerries[itemId - ITEM_CHERI_BERRY].name, quantity); else StringCopy(string, ItemId_GetItem(itemId)->name); } |