Merge pull request #304 from PikalaxALT/field_map_obj

Field map obj

6 files changed, 119 insertions, 2 deletions

diff --git a/include/asm.inc.h b/include/asm.inc.h
index 3db79b128..9bd8324ad 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);
@@ -120,7 +128,7 @@ u8 sub_80608D0(u8);
 u8 GetStepInPlaceDelay32AnimId(u8 a);
 u8 GetStepInPlaceDelay16AnimId(u8);
 u8 GetStepInPlaceDelay8AnimId(u8 a);
-u8 FieldObjectFaceOppositeDirection(void *, u8);
+u8 FieldObjectFaceOppositeDirection(struct MapObject *, u8);
 u8 sub_80609D8(u8);
 u8 sub_8060A04(u8);
 u8 sub_8060A30(u8);
diff --git a/include/field_camera.h b/include/field_camera.h
index 51c370d0a..9021b579e 100644
--- a/include/field_camera.h
+++ b/include/field_camera.h
@@ -1,6 +1,16 @@
 #ifndef GUARD_FIELD_CAMERA_H
 #define GUARD_FIELD_CAMERA_H
 
+struct CameraSomething
+{
+    void (*callback)(struct CameraSomething *);
+    u32 unk4;
+    s32 unk8;
+    s32 unkC;
+    s32 unk10;
+    s32 unk14;
+};
+
 void move_tilemap_camera_to_upper_left_corner(void);
 void sub_8057A58(void);
 void sub_8057B14(u16 *a, u16 *b);
diff --git a/include/field_ground_effect.h b/include/field_ground_effect.h
new file mode 100644
index 000000000..8a69426b3
--- /dev/null
+++ b/include/field_ground_effect.h
@@ -0,0 +1,11 @@
+//
+// Created by Scott Norton on 5/22/17.
+//
+
+#ifndef POKERUBY_FIELD_GROUND_EFFECT_H
+#define POKERUBY_FIELD_GROUND_EFFECT_H
+
+bool8 IsZCoordMismatchAt(u8 z, s16 x, s16 y);
+bool8 AreZCoordsCompatible(u8 z1, u8 z2);
+
+#endif //POKERUBY_FIELD_GROUND_EFFECT_H
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index dfc41d38b..2bd875f17 100644..100755
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -3,9 +3,90 @@
 
 #include "sprite.h"
 
+#define fieldmap_object_cb(setup, callback, table) \
+extern u8 (*const table[])(struct MapObject *, struct Sprite *);\
+static u8 callback(struct MapObject *, struct Sprite *);\
+void setup(struct Sprite *sprite)\
+{\
+    meta_step(&gMapObjects[sprite->data0], sprite, callback);\
+}\
+static u8 callback(struct MapObject *mapObject, struct Sprite *sprite)\
+{\
+    return table[sprite->data1](mapObject, sprite);\
+}
+
+#define fieldmap_object_null_cb(setup, callback) \
+static u8 callback(struct MapObject *, struct Sprite *);\
+void setup(struct Sprite *sprite)\
+{\
+    meta_step(&gMapObjects[sprite->data0], sprite, callback);\
+}\
+static u8 callback(struct MapObject *mapObject, struct Sprite *sprite)\
+{\
+    return 0;\
+}
+
+
 void sub_805C058(struct MapObject *mapObject, s16 a, s16 b);
 void FieldObjectSetDirection(struct MapObject *pObject, u8 unk_18);
 void MoveCoords(u8 direction, s16 *x, s16 *y);
-void meta_step(struct MapObject *pObject,  struct Sprite *pSprite,  u32 (*d8)());
+void meta_step(struct MapObject *pObject,  struct Sprite *pSprite,  u8 (*d8)(struct MapObject *, struct Sprite *));
+void npc_reset(struct MapObject *mapObject, struct Sprite *sprite);
+
+extern const u8 gUnknown_08375240[4];
+extern u8 (*const gUnknown_08375244[])(s16 a0, s16 a1, s16 a2, s16 a3);
+extern bool8 (*const gUnknown_08375684[4])(u8);
+extern bool8 (*const gUnknown_08375694[4])(u8);
+
+extern const u8 gUnknown_083752A0[2];
+extern const u8 gUnknown_083752C0[2];
+extern const u8 gUnknown_08375320[2];
+extern const u8 gUnknown_08375338[2];
+extern const u8 gUnknown_08375350[2];
+extern const u8 gUnknown_08375368[2];
+extern const u8 gUnknown_08375380[2];
+extern const u8 gUnknown_08375398[2];
+extern const u8 gUnknown_083753B0[2];
+extern const u8 gUnknown_083753C8[2];
+extern const u8 gUnknown_083753DC[5];
+extern const u8 gUnknown_083753F4[5];
+extern const u8 gUnknown_08375418[4];
+extern const u8 gUnknown_08375428[4];
+extern const u8 gUnknown_08375438[4];
+extern const u8 gUnknown_08375448[4];
+extern const u8 gUnknown_08375458[4];
+extern const u8 gUnknown_08375468[4];
+extern const u8 gUnknown_08375240[4];
+extern const u8 gUnknown_08375484[4];
+extern const u8 gUnknown_08375494[4];
+extern const u8 gUnknown_083754A4[4];
+extern const u8 gUnknown_083754B4[4];
+extern const u8 gUnknown_083754C4[4];
+extern const u8 gUnknown_083754D4[4];
+extern const u8 gUnknown_083754E4[4];
+extern const u8 gUnknown_083754F4[4];
+extern const u8 gUnknown_08375504[4];
+extern const u8 gUnknown_08375514[4];
+extern const u8 gUnknown_08375524[4];
+extern const u8 gUnknown_08375534[4];
+extern const u8 gUnknown_08375544[4];
+extern const u8 gUnknown_08375554[4];
+extern const u8 gUnknown_08375564[4];
+extern const u8 gUnknown_08375574[4];
+extern const u8 gUnknown_08375584[4];
+
+extern const u8 gUnknown_0837567B[9];
+extern const u8 gUnknown_0837574F[8];
+
+extern const u8 gUnknown_08375757[4][4];
+extern const u8 gUnknown_08375767[4][4];
+
+extern const struct Coords16 gDirectionToVector[];
+
+extern u8 (**const gUnknown_08375778[])(struct MapObject *, struct Sprite *);
+
+extern struct CameraSomething gUnknown_03004880;
+extern u16 gUnknown_03004898;
+extern u16 gUnknown_0300489C;
 
 #endif // GUARD_FIELD_MAP_OBJ_H
diff --git a/include/field_map_obj_helpers.h b/include/field_map_obj_helpers.h
index daae74ae9..a61dcc63c 100644
--- a/include/field_map_obj_helpers.h
+++ b/include/field_map_obj_helpers.h
@@ -8,5 +8,8 @@ void UnfreezeMapObjects(void);
 void sub_806487C(struct Sprite *sprite, bool8 invisible);
 void sub_8064990(u8, u8);
 void UnfreezeMapObject(struct MapObject *mapObject);
+void oamt_npc_ministep_reset(struct Sprite *sprite, u8 a2, u8 a3);
+void sub_806467C(struct Sprite *sprite, u8 direction);
+bool8 sub_806468C(struct Sprite *sprite);
 
 #endif
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 936d27b4a..530e15798 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -1,6 +1,10 @@
 #ifndef GUARD_FIELDMAP2_H
 #define GUARD_FIELDMAP2_H
+#include "field_map_obj.h"
 
 struct MapHeader *mapconnection_get_mapheader(struct MapConnection *connection);
+int GetMapBorderIdAt(int x, int y);
+extern bool8 IsMetatileDirectionallyImpassable(struct MapObject *mapObject, s16 x, s16 y, u8 direction);
+int CanCameraMoveInDirection(int direction);
 
 #endif