5 files changed, 21 insertions, 10 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h
index 53b2f1cb8..8189914fa 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -63,7 +63,7 @@ void sub_805B710(u16 i, u16 i1);
 void sub_805B980(struct MapObject *, u8);
 void FieldObjectTurn(struct MapObject *, u8);
 void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8);
-struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8);
+const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8);
 void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8);
 void FieldObjectGetLocalIdAndMap(struct MapObject *, u8 *, u8 *, u8 *);
 void sub_805BCF0(u8, u8, u8, u8);
@@ -73,7 +73,7 @@ void gpu_pal_allocator_reset__manage_upper_four(void);
 void npc_coords_shift(struct MapObject *pObject, s16 x, s16 y);
 void sub_805C0F8(u8, u8, u8, s16, s16);
 void npc_coords_shift_still(struct MapObject *pObject);
-u8 GetFieldObjectIdByXYZ(u16, u16, int);
+u8 GetFieldObjectIdByXYZ(u16, u16, u8);
 void UpdateFieldObjectsForCameraUpdate(s16, s16);
 u8 AddCameraObject(u8);
 u8 * GetFieldObjectScriptPointerByFieldObjectId(u8);
@@ -81,7 +81,7 @@ u8 FieldObjectGetBerryTreeId(u8);
 void sub_805C754(struct MapObject *pObject);
 void sub_805C774(struct MapObject *, u8);
 void sub_805C78C(u8, u8, u8);
-void sub_805C7C4(int i);
+void sub_805C7C4(u8 i);
 u8 FieldObjectDirectionToImageAnimId(u8);
 u8 get_go_image_anim_num(u8 unk_19);
 u8 sub_805FD98(u8);
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index c31b0fc2a..dfc41d38b 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -6,6 +6,6 @@
 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));
+void meta_step(struct MapObject *pObject,  struct Sprite *pSprite,  u32 (*d8)());
 
 #endif // GUARD_FIELD_MAP_OBJ_H
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index c273efb8b..3efca3af7 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -68,14 +68,14 @@ void sub_80597E8(void);
 void sub_80597F4(void);
 u8 GetRivalAvatarGraphicsIdByStateIdAndGender(u8 a, u8 b);
 u8 GetPlayerAvatarGraphicsIdByStateId(u8 a);
-// GetPlayerAvatarGenderByGraphicsId
+u8 GetPlayerAvatarGenderByGraphicsId(u8 gfxId);
 bool8 PartyHasMonWithSurf(void);
 bool8 IsPlayerSurfingNorth(void);
 bool8 IsPlayerFacingSurfableFishableWater(void);
 // ClearPlayerAvatarInfo
 void SetPlayerAvatarStateMask(u8 a);
 u8 GetPlayerAvatarGraphicsIdByCurrentState(void);
-// SetPlayerAvatarExtraStateTransition
+void SetPlayerAvatarExtraStateTransition(u8 a, u8 b);
 void InitPlayerAvatar(s16 a, s16 b, u8 c, u8 d);
 // sub_8059B88
 // sub_8059BF4
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index e3ec39ed1..3c6f4cf4e 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -78,7 +78,7 @@ struct MapObjectTemplate
     /*0x0C*/ u16 unkC;
     /*0x0E*/ u16 unkE;
     /*0x10*/ u8 *script;
-    /*0x14*/ u16 unk14;
+    /*0x14*/ u16 flagId;
     /*0x16*/ u8 filler_16[2];
 };  /*size = 0x18*/
 
@@ -294,9 +294,9 @@ struct MapObjectGraphicsInfo
     /*0x0D*/ u8 tracks;
     /*0x10*/ struct OamData *oam;
     /*0x14*/ struct SubspriteTable *subspriteTables;
-    /*0x18*/ union AnimCmd **anims;
+    /*0x18*/ const union AnimCmd *const *anims;
     /*0x1C*/ struct SpriteFrameImage *images;
-    /*0x20*/ union AffineAnimCmd **affineAnims;
+    /*0x20*/ const union AffineAnimCmd *const *affineAnims;
 };
 
 #define PLAYER_AVATAR_FLAG_ON_FOOT   (1 << 0)
@@ -354,6 +354,13 @@ struct PlayerAvatar /* 0x202E858 */
     // TODO: rest of struct
 };
 
+struct Camera
+{
+    bool8 field_0:1;
+    s32 x;
+    s32 y;
+};
+
 extern struct MapObject gMapObjects[];
 extern u8 gSelectedMapObject;
 extern struct MapHeader gMapHeader;
diff --git a/include/sprite.h b/include/sprite.h
index 4e3074ebb..42620c9e9 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -147,7 +147,7 @@ struct Sprite
 {
     /*0x00*/ struct OamData oam;
     /*0x08*/ const union AnimCmd *const *anims;
-    /*0x0C*/ struct SpriteFrameImage *images;
+    /*0x0C*/ const struct SpriteFrameImage *images;
     /*0x10*/ const union AffineAnimCmd *const *affineAnims;
     /*0x14*/ const struct SpriteTemplate *template;
     /*0x18*/ const struct SubspriteTable *subspriteTables;
@@ -200,6 +200,10 @@ struct Sprite
     /*0x43*/ u8 subpriority;
 };
 
+extern const struct OamData gDummyOamData;
+extern const union AnimCmd *const gDummySpriteAnimTable[];
+extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[];
+
 extern s16 gSpriteCoordOffsetX;
 extern s16 gSpriteCoordOffsetY;