Merge pull request #308 from PikalaxALT/master

Field Map Objects

6 files changed, 22 insertions, 3 deletions

diff --git a/include/asm.inc.h b/include/asm.inc.h
index 9bd8324ad..dbd3f0820 100644..100755
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -128,6 +128,7 @@ u8 sub_80608D0(u8);
 u8 GetStepInPlaceDelay32AnimId(u8 a);
 u8 GetStepInPlaceDelay16AnimId(u8);
 u8 GetStepInPlaceDelay8AnimId(u8 a);
+u8 GetStepInPlaceDelay4AnimId(u8 a);
 u8 FieldObjectFaceOppositeDirection(struct MapObject *, u8);
 u8 sub_80609D8(u8);
 u8 sub_8060A04(u8);
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
new file mode 100755
index 000000000..62f492bdc
--- /dev/null
+++ b/include/field_effect_helpers.h
@@ -0,0 +1,11 @@
+//
+// Created by scott on 5/25/2017.
+//
+
+#ifndef POKERUBY_FIELD_EFFECT_HELPERS_H
+#define POKERUBY_FIELD_EFFECT_HELPERS_H
+
+void sub_812869C(struct MapObject *);
+bool8 sub_81286C4(struct MapObject *);
+
+#endif //POKERUBY_FIELD_EFFECT_HELPERS_H
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 2bd875f17..0347b90d4 100755
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -89,4 +89,7 @@ extern struct CameraSomething gUnknown_03004880;
 extern u16 gUnknown_03004898;
 extern u16 gUnknown_0300489C;
 
+extern u32 gUnknown_0202FF84[];
+
+int state_to_direction(u8, u8, u8);
 #endif // GUARD_FIELD_MAP_OBJ_H
diff --git a/include/field_map_obj_helpers.h b/include/field_map_obj_helpers.h
index a61dcc63c..5dceec595 100644
--- a/include/field_map_obj_helpers.h
+++ b/include/field_map_obj_helpers.h
@@ -11,5 +11,9 @@ 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);
-
+void sub_80646E4(struct Sprite *sprite, u8 a2, u8 a3, u8 a4);
+void DoShadowFieldEffect(struct MapObject *mapObject);
+u8 sub_8064704(struct Sprite *);
+u8 sub_806478C(struct Sprite *);
+void obj_anim_image_set_and_seek(struct Sprite *sprite, u8 a2, u8 a3);
 #endif
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index d3e4b9132..fc21c4e3c 100644..100755
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -33,7 +33,7 @@ void SetPlayerAvatarTransitionFlags(u16 a);
 // PlayerAvatarTransition_Underwater
 // sub_80591F4
 void sub_8059204(void);
-// player_get_x22
+u8 player_get_x22(void);
 void PlayerSetAnimId(u8 a, u8 b);
 void PlayerGoSpeed0(u8 a);
 void sub_80593C4(u8 a);
diff --git a/include/trainer_see.h b/include/trainer_see.h
index 0113143b6..b80a41641 100644..100755
--- a/include/trainer_see.h
+++ b/include/trainer_see.h
@@ -28,7 +28,7 @@ s8 sub_80845FC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
 s8 sub_8084654(u8 taskId, struct Task *task, struct MapObject *trainerObj);
 s8 sub_80846C8(u8 taskId, struct Task *task, struct MapObject *trainerObj);
 void sub_80846E4(u8 taskId);
-void sub_8084794(u32 var);
+void sub_8084794(struct MapObject *var);
 void sub_80847C8(void);
 void sub_80847D8(u8);
 void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3);