diff options
| author | yenatch <yenatch@gmail.com> | 2017-09-20 22:24:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-20 22:24:38 -0400 |
| commit | b35935e3ef117cd4b4925f6f349788225f0de22e (patch) | |
| tree | 3fae9c63d193668e60a8290ba6e3bb5671282821 /src/item.c | |
| parent | d485f17784eefd4cd965026c15cea9e065546627 (diff) | |
| parent | 9ed9f7de941d5b89a1c6d6241b3bbb5726aa99e8 (diff) | |
Merge pull request #39 from Diegoisawesome/master
Extract baserom calls from various battle data files and crt0.s
Diffstat (limited to 'src/item.c')
| -rw-r--r-- | src/item.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/item.c b/src/item.c index c85e2fe1f..0114676b6 100644 --- a/src/item.c +++ b/src/item.c @@ -8,9 +8,9 @@ extern void ApplyNewEncyprtionKeyToHword(u16* hword, u32 newKey); extern bool8 InBattlePyramid(void); -extern const u8 gOtherText_PokeBalls[]; -extern const u8 gOtherText_Berries[]; -extern const u8 gOtherText_Berry[]; +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); @@ -92,7 +92,7 @@ void CopyItemNameHandlePlural(u16 itemId, u8 *string, u32 quantity) if (quantity < 2) StringCopy(string, ItemId_GetItem(ITEM_POKE_BALL)->name); else - StringCopy(string, gOtherText_PokeBalls); + StringCopy(string, gText_PokeBalls); } else { @@ -109,9 +109,9 @@ void GetBerryCountString(u8* dst, const u8* berryName, u32 quantity) u8* txtPtr; if (quantity < 2) - berryString = gOtherText_Berry; + berryString = gText_Berry; else - berryString = gOtherText_Berries; + berryString = gText_Berries; txtPtr = StringCopy(dst, berryName); *txtPtr = CHAR_SPACE; StringCopy(txtPtr + 1, berryString); |