Merge remote-tracking branch 'upstream/master' into pan-constants

1 files changed, 42 insertions, 1 deletions

diff --git a/include/shop.h b/include/shop.h
index 9b14a672e..7f2d877dc 100644
--- a/include/shop.h
+++ b/include/shop.h
@@ -1,7 +1,48 @@
 #ifndef GUARD_SHOP_H
 #define GUARD_SHOP_H
 
-extern EWRAM_DATA struct ItemSlot gUnknown_02039F80[3];
+extern EWRAM_DATA struct ItemSlot gMartPurchaseHistory[3];
+
+enum
+{
+    MART_TYPE_0, // normal mart
+    MART_TYPE_1,
+    MART_TYPE_2,
+};
+
+// shop view window NPC info enum
+enum
+{
+    EVENT_OBJ_ID,
+    X_COORD,
+    Y_COORD,
+    ANIM_NUM,
+	LAYER_TYPE
+};
+
+struct MartInfo
+{
+    /*0x0*/ void (*callback)(void);
+    /*0x4*/ const struct MenuAction *menuActions;
+    /*0x8*/ const u16 *itemList;
+    /*0xC*/ u16 itemCount;
+    /*0xE*/ u8 windowId;
+    /*0xF*/ u8 martType;
+};
+
+struct ShopData
+{
+	/*0x0000*/ u16 tilemapBuffers[4][0x400];
+	/*0x2000*/ u32 totalCost;
+	/*0x2004*/ u16 itemsShowed;
+	/*0x2006*/ u16 selectedRow;
+	/*0x2008*/ u16 scrollOffset;
+	/*0x200A*/ u8 maxQuantity;
+	/*0x200B*/ u8 scrollIndicatorsTaskId;
+	/*0x200C*/ u8 iconSlot;
+	/*0x200D*/ u8 itemSpriteIds[2];
+	/*0x2010*/ s16 viewportObjects[16][5];
+};
 
 void CreatePokemartMenu(const u16 *);
 void CreateDecorationShop1Menu(const u16 *);