From 9776f51f0643a8d988fcd5fc2ac404a7ea285235 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 3 Feb 2018 09:18:12 -0500
Subject: Declare gBagPockets as non-const in item.c for the sake of getting
 AddBagItem to match without the NONMATCHING define

---
 include/item.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'include/item.h')

diff --git a/include/item.h b/include/item.h
index 8f6cc883b..bafa8a3fd 100644
--- a/include/item.h
+++ b/include/item.h
@@ -30,8 +30,6 @@ struct BagPocket
 
 #define NUM_BAG_POCKETS 5
 
-extern const struct BagPocket gBagPockets[NUM_BAG_POCKETS];
-
 void CopyItemName(u16 itemId, u8 *string);
 bool8 IsBagPocketNonEmpty(u8 pocket);
 bool8 CheckBagHasItem(u16 itemId, u16 count);
-- 
cgit v1.2.3


From e58c4ac922c10a2e7c06e1c3d27a95cf51361cb5 Mon Sep 17 00:00:00 2001
From: Cameron Hall <cameronghall@cox.net>
Date: Thu, 15 Feb 2018 01:36:03 -0600
Subject: ItemId_GetItem -> ItemId_GetName

---
 include/item.h | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

(limited to 'include/item.h')

diff --git a/include/item.h b/include/item.h
index bafa8a3fd..57aebf88e 100644
--- a/include/item.h
+++ b/include/item.h
@@ -1,27 +1,8 @@
 #ifndef GUARD_ITEM_H
 #define GUARD_ITEM_H
 
-
 typedef void (*ItemUseFunc)(u8);
 
-struct Item
-{
-    u8 name[14];
-    u16 itemId;
-    u16 price;
-    u8 holdEffect;
-    u8 holdEffectParam;
-    const u8 *description;
-    u8 importance;
-    u8 unk19;
-    u8 pocket;
-    u8 type;
-    ItemUseFunc fieldUseFunc;
-    u8 battleUsage;
-    ItemUseFunc battleUseFunc;
-    u8 secondaryId;
-};
-
 struct BagPocket
 {
     struct ItemSlot *itemSlots;
@@ -43,7 +24,7 @@ bool8 CheckPCHasItem(u16 itemId, u16 count);
 bool8 AddPCItem(u16 itemId, u16 count);
 void RemovePCItem(u8 index, u16 count);
 void SwapRegisteredBike(void);
-const struct Item *ItemId_GetItem(u16 itemId);
+const u8 *ItemId_GetName(u16 itemId);
 u16 ItemId_GetId(u16 itemId);
 u16 ItemId_GetPrice(u16 itemId);
 u8 ItemId_GetHoldEffect(u16 itemId);
-- 
cgit v1.2.3