From 4d2b22a899c11dfcacfec6889968ab01655a3fe3 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 14:53:51 +0200
Subject: Add headers

---
 src/field_map_obj.c | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

(limited to 'src/field_map_obj.c')

diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 8c85e7b6d..1314cbc2c 100755
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -1,8 +1,8 @@
+#include "field_effect_helpers.h"
 #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"
@@ -16,30 +16,6 @@
 
 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 *);
-extern 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;
-- 
cgit v1.2.3


From f26daa3d6954d2db3a7c44b79d319a7a084462c2 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 15:01:42 +0200
Subject: Sort includes

---
 src/field_map_obj.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 src/field_map_obj.c

(limited to 'src/field_map_obj.c')

diff --git a/src/field_map_obj.c b/src/field_map_obj.c
old mode 100755
new mode 100644
index 1314cbc2c..3530f5579
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -1,18 +1,18 @@
-#include "field_effect_helpers.h"
 #include "global.h"
 #include "field_map_obj.h"
-#include "field_map_obj_helpers.h"
-#include "fieldmap.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"
 
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[36];
 
-- 
cgit v1.2.3