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

2017-10-13 20:29:11 -05:00
parent 2852f4f1b8 f6af9e7013
commit 924c0c6b5a
106 changed files with 14610 additions and 25063 deletions
--- a/include/shop.h
+++ b/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 *);