Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd

include/shop.h

@@ -1,6 +1,8 @@
 #ifndef GUARD_SHOP_H
 #define GUARD_SHOP_H
 
+extern EWRAM_DATA struct ItemSlot gUnknown_02039F80[3];
+
 void CreatePokemartMenu(const u16 *);
 void CreateDecorationShop1Menu(const u16 *);
 void CreateDecorationShop2Menu(const u16 *);