fix merge conflicts

1 files changed, 6 insertions, 21 deletions

diff --git a/src/shop.c b/src/shop.c
index cd39b075a..d53646a88 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -1,9 +1,12 @@
 #include "global.h"
-#include "asm.h"
+#include "shop.h"
 #include "decompress.h"
+#include "field_fadetransition.h"
 #include "field_weather.h"
+#include "item_menu.h"
 #include "main.h"
 #include "menu.h"
+#include "menu_helpers.h"
 #include "money.h"
 #include "palette.h"
 #include "script.h"
@@ -11,6 +14,8 @@
 #include "sprite.h"
 #include "strings.h"
 #include "task.h"
+#include "tv.h"
+#include "unknown_task.h"
 
 struct UnknownShopStruct
 {
@@ -35,26 +40,6 @@ extern u16 gBuyMenuFrame_Tilemap[];
 extern u16 gMenuMoneyPal[16];
 extern u16 gUnknown_083CC710[2];
 
-extern void sub_80A6300(void);
-extern void sub_80BE3BC(void);
-extern void DisplayItemMessageOnField(u8, const u8*, TaskFunc, u16);
-extern u8 sub_807D770(void);
-extern void pal_fill_black(void);
-extern void sub_80B3764(int, int);
-extern void sub_80B37EC(void);
-extern void sub_80B40E8(u8);
-extern void BuyMenuDrawMapGraphics(void);
-extern void sub_80F944C(void);
-extern void CreateVerticalScrollIndicators(u32, u32, u32); // unknown args
-extern void sub_80F979C(u32, u32); // unknown args
-
-void sub_80B2E38(u8);
-void HandleShopMenuQuit(u8);
-void sub_80B2FA0(u8);
-void BuyMenuDrawGraphics(void);
-void sub_80B3240(void);
-void sub_80B3270(void);
-
 u8 CreateShopMenu(bool8 var)
 {
     ScriptContext2_Enable();