diff options
| author | U-Maria-PC\Maria <throwawaygolem@gmail.com> | 2017-07-29 11:35:23 -0400 |
|---|---|---|
| committer | U-Maria-PC\Maria <throwawaygolem@gmail.com> | 2017-07-29 11:35:23 -0400 |
| commit | e92408af0133974a769215a83500c965f8524724 (patch) | |
| tree | 9f1556b72ebb1a9f1b7f288ba4b8d23471a46608 /src/item.c | |
| parent | a9da4340a3c91553d19afdcd07355c53d5157a3e (diff) | |
| parent | 8b39cdac9adb52a6e6abd03314056ee5d6003a1b (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
`:Q
B
A
B:`
r
A
r
D
D
C
D
D
r
Diffstat (limited to 'src/item.c')
| -rw-r--r-- | src/item.c | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/src/item.c b/src/item.c index 22ac6e7cd..36871285a 100644 --- a/src/item.c +++ b/src/item.c @@ -1,12 +1,24 @@ #include "global.h" +#include "hold_effects.h" #include "item.h" #include "items.h" +#include "item_use.h" #include "berry.h" #include "string_util.h" #include "strings.h" extern u8 gUnknown_02038560; -extern struct Item gItems[]; + +// These constants are used in gItems +enum +{ + POCKET_NONE, + POCKET_ITEMS, + POCKET_POKE_BALLS, + POCKET_TM_HM, + POCKET_BERRIES, + POCKET_KEY_ITEMS, +}; enum { @@ -17,6 +29,14 @@ enum KEYITEMS_POCKET }; +#if ENGLISH +#include "data/item_descriptions_en.h" +#include "data/items_en.h" +#elif GERMAN +#include "data/item_descriptions_de.h" +#include "data/items_de.h" +#endif + static void CompactPCItems(void); void CopyItemName(u16 itemId, u8 *string) @@ -557,7 +577,7 @@ static u16 SanitizeItemId(u16 itemId) return itemId; } -struct Item *ItemId_GetItem(u16 itemId) +const struct Item *ItemId_GetItem(u16 itemId) { return &gItems[SanitizeItemId(itemId)]; } @@ -582,7 +602,7 @@ u8 ItemId_GetHoldEffectParam(u16 itemId) return gItems[SanitizeItemId(itemId)].holdEffectParam; } -u8 *ItemId_GetDescription(u16 itemId) +const u8 *ItemId_GetDescription(u16 itemId) { return gItems[SanitizeItemId(itemId)].description; } @@ -590,7 +610,7 @@ u8 *ItemId_GetDescription(u16 itemId) bool32 ItemId_CopyDescription(u8 *a, u32 itemId, u32 c) { u32 r5 = c + 1; - u8 *description = gItems[SanitizeItemId(itemId)].description; + const u8 *description = gItems[SanitizeItemId(itemId)].description; u8 *str = a; for (;;) |