From b087d8a909925baf772aa0d631318fb17667067c Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 22 May 2017 19:31:47 -0400
Subject: IsCoordOutsideFieldObjectMovementRect and others

---
 include/asm.inc.h       | 8 ++++++++
 include/field_map_obj.h | 1 -
 include/fieldmap.h      | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/asm.inc.h b/include/asm.inc.h
index 3db79b128..8921d14cd 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -1,6 +1,14 @@
 // src/rom3.o
 void sub_800C35C(void);
 
+struct UnkStruct8060024 {
+    u8 outsideMovementRect:1;
+    u8 tileIsImpassable:1;
+    u8 elevationMismatch:1;
+    u8 pathBlockedByObject:1;
+    u8 pad_04:4;
+};
+
 // asm/battle_2.o
 void sub_800E7C4(void);
 u8 b_first_side(u8, u8, u8);
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 4f611aab2..c160f1c72 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -26,7 +26,6 @@ static u8 callback(struct MapObject *mapObject, struct Sprite *sprite)\
     return 0;\
 }
 
-bool8 CheckForCollisionBetweenFieldObjects(struct MapObject *mapObject, s16 x, s16 y);
 
 void sub_805C058(struct MapObject *mapObject, s16 a, s16 b);
 void FieldObjectSetDirection(struct MapObject *pObject, u8 unk_18);
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 87f113122..530e15798 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -4,7 +4,7 @@
 
 struct MapHeader *mapconnection_get_mapheader(struct MapConnection *connection);
 int GetMapBorderIdAt(int x, int y);
-bool8 IsMetatileDirectionallyImpassable(struct MapObject *mapObject, s16 x, s16 y, u8 direction);
+extern bool8 IsMetatileDirectionallyImpassable(struct MapObject *mapObject, s16 x, s16 y, u8 direction);
 int CanCameraMoveInDirection(int direction);
 
 #endif
-- 
cgit v1.2.3