fix merge conflicts

1 files changed, 4 insertions, 13 deletions

diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 4a2313499..e837dbd45 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -1,17 +1,20 @@
 #include "global.h"
-#include "asm.h"
+#include "fldeff_cut.h"
 #include "field_camera.h"
 #include "field_effect.h"
 #include "field_player_avatar.h"
+#include "fieldmap.h"
 #include "map_obj_lock.h"
 #include "metatile_behavior.h"
 #include "metatile_behaviors.h"
+#include "pokemon_menu.h"
 #include "rom4.h"
 #include "rom6.h"
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
 #include "sprite.h"
+#include "task.h"
 #include "trig.h"
 
 extern u8 gCutGrassSpriteArray[8]; // seems to be an array of 8 sprite IDs
@@ -28,18 +31,6 @@ extern u32 gUnknown_0202FF84[];
 
 extern u8 UseCutScript;
 
-extern void sub_808AB90(void); // unknown args
-extern void sub_805BCC0(s16 x, s16 y);
-
-void sub_80A2634(void);
-void sub_80A25E8(void);
-void sub_80A2684(void);
-void sub_80A27A8(s16, s16);
-void sub_80A28F4(s16, s16);
-void objc_8097BBC(struct Sprite *sprite);
-void sub_80A2AB8(void);
-void sub_80A2B00(void); // unknown args
-
 bool8 SetUpFieldMove_Cut(void)
 {
     s16 x, y;