fix merge conflicts

1 files changed, 6 insertions, 31 deletions

diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 26cd1de02..ade72923d 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -1,49 +1,24 @@
 #include "global.h"
 #include "field_map_obj.h"
-#include "field_map_obj_helpers.h"
-#include "fieldmap.h"
-#include "asm.h"
 #include "berry.h"
 #include "event_data.h"
-#include "field_player_avatar.h"
+#include "field_camera.h"
 #include "field_effect.h"
+#include "field_effect_helpers.h"
 #include "field_ground_effect.h"
+#include "field_map_obj_helpers.h"
+#include "field_player_avatar.h"
+#include "fieldmap.h"
 #include "palette.h"
-#include "rom4.h"
 #include "rng.h"
+#include "rom4.h"
 #include "sprite.h"
-#include "field_camera.h"
 #include "metatile_behavior.h"
 #include "map_constants.h"
 #include "trainer_see.h"
-#include "field_effect_helpers.h"
 
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[36];
 
-
-extern void strange_npc_table_clear(void);
-extern void ClearPlayerAvatarInfo(void);
-extern void npc_load_two_palettes__no_record(u16, u8);
-extern void npc_load_two_palettes__and_record(u16, u8);
-extern void sub_8060388(s16, s16, s16 *, s16 *);
-void sub_80634D0(struct MapObject *, struct Sprite *);
-extern void pal_patch_for_npc(u16, u16);
-extern void CameraObjectReset1(void);
-
-void sub_805AAB0(void);
-u8 GetFieldObjectIdByLocalId(u8);
-u8 GetFieldObjectIdByLocalIdAndMapInternal(u8, u8, u8);
-u8 GetAvailableFieldObjectSlot(u16, u8, u8, u8 *);
-void FieldObjectHandleDynamicGraphicsId(struct MapObject *);
-void RemoveFieldObjectInternal(struct MapObject *);
-u16 GetFieldObjectFlagIdByFieldObjectId(u8);
-void MakeObjectTemplateFromFieldObjectTemplate(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate *sprTemplate, struct SubspriteTable **subspriteTables);
-struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8, u8, u8);
-void GetFieldObjectMovingCameraOffset(s16 *, s16 *);
-void sub_805BDF8(u16);
-u8 sub_805BE58(const struct SpritePalette *);
-u8 FindFieldObjectPaletteIndexByTag(u16);
-
 struct PairedPalettes
 {
     u16 tag;