fix merge conflicts

1 files changed, 18 insertions, 0 deletions

diff --git a/include/shop.h b/include/shop.h
new file mode 100644
index 000000000..cca6091c9
--- /dev/null
+++ b/include/shop.h
@@ -0,0 +1,18 @@
+#ifndef GUARD_SHOP_H
+#define GUARD_SHOP_H
+
+void sub_80B2E38(u8);
+void HandleShopMenuQuit(u8);
+void sub_80B2FA0(u8);
+void BuyMenuDrawGraphics(void);
+void sub_80B3240(void);
+void sub_80B3270(void);
+void BuyMenuDrawMapGraphics(void);
+void sub_80B3764(int, int);
+void sub_80B37EC(void);
+void sub_80B40E8(u8);
+void CreatePokemartMenu(void *);
+void CreateDecorationShop1Menu(void *);
+void CreateDecorationShop2Menu(void *);
+
+#endif // GUARD_SHOP_H