summaryrefslogtreecommitdiff
path: root/src/items.c
diff options
context:
space:
mode:
authorAnonymousRandomPerson <chenghanngan.us@gmail.com>2022-02-26 13:29:30 -0500
committerAnonymousRandomPerson <chenghanngan.us@gmail.com>2022-02-26 13:29:30 -0500
commita5296a2f994a0f8e4421c4afd6bac1cedcfb72be (patch)
tree1d3f29615f1683fae77ade7d8713e7bfe5a11c26 /src/items.c
parent6e56b9f0341be0a6c960ea9e8db0939e4fa3cdac (diff)
parent0dd38993f6a4383d6d5743fd0ae0abc01210ae25 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/items.c')
-rw-r--r--src/items.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/items.c b/src/items.c
index 4b5a710..d1cd07b 100644
--- a/src/items.c
+++ b/src/items.c
@@ -5,7 +5,9 @@
#include "team_inventory.h"
#include "random.h"
#include "pokemon.h"
+#include "random.h"
#include "subStruct_203B240.h"
+#include "team_inventory.h"
#include <stddef.h>
@@ -25,7 +27,7 @@ extern u8* gPtrPPD0Text; // ptr to "PP $d0 \0"
extern u32 gUnknown_810A3F0[100];
extern u32 gUnknown_81097E8[4]; // some sort of lookup table (16, 18, 20, 22)
extern u32 gUnknown_81097F8[4]; // some sort of lookup table (17, 19, 21, 23)
-extern u32 gUnknown_810AF50[];
+extern const char *gUnknown_810AF50[];
extern u8 gUnknown_8108F64[0x3f][32]; // some sort of bit lookup table
extern s16 gTypeGummiIQBoost[0x12][NUMBER_OF_GUMMIS];
extern u8 gInvalidItemIDs[0x10];
@@ -1232,7 +1234,7 @@ void SaveItemSlot(struct unkStruct_8094924 *a1, struct ItemSlot *slot)
SaveIntegerBits(a1, &slot->itemIndex, 8);
}
-u32 sub_8091E50(u8 index)
+const char *sub_8091E50(u8 index)
{
return gUnknown_810AF50[index];
}