Merge pull request #229 from camthesaxman/field_map_obj

decompile more of field_map_obj

3 files changed, 23 insertions, 22 deletions

diff --git a/include/asm.inc.h b/include/asm.inc.h
index f556fe4e5..53b2f1cb8 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -53,12 +53,13 @@ u8 GetFieldObjectIdByLocalIdAndMap(u8, u8, u8);
 bool8 TryGetFieldObjectIdByLocalIdAndMap(u8, u8, u8, u8 *);
 u8 GetFieldObjectIdByXY(s16, s16);
 void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8);
-u8 SpawnSpecialFieldObject(struct UnknownStruct_FPA *);
+u8 SpawnSpecialFieldObject(struct MapObjectTemplate *);
 u8 show_sprite(u8, u8, u8);
-u8 AddPseudoFieldObject(u8 val, void (*player)(struct Sprite *), int i, int i1, int i2);
+u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 c, s16 d, u8 subpriority);
 u8 sub_805B410(u8, u8, s16, s16, u8, u8);
-void sub_805B55C(int i, int i1);
-void sub_805B710(int i, int i1);
+//void sub_805B55C(int i, int i1);
+void sub_805B55C(s16 a, s16 b);
+void sub_805B710(u16 i, u16 i1);
 void sub_805B980(struct MapObject *, u8);
 void FieldObjectTurn(struct MapObject *, u8);
 void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index d2e2b1bd0..e3ec39ed1 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -67,7 +67,7 @@ struct MapObjectTemplate
 {
     /*0x00*/ u8 localId;
     /*0x01*/ u8 graphicsId;
-    /*0x02*/ u8 filler_2[0x2];
+    /*0x02*/ u8 unk2;
     /*0x04*/ s16 x;
     /*0x06*/ s16 y;
     /*0x08*/ u8 elevation;
@@ -281,22 +281,22 @@ struct MapObject2
 
 struct MapObjectGraphicsInfo
 {
-    u16 tileTag;
-    u16 paletteTag1;
-    u16 paletteTag2;
-    u16 size;
-    s16 width;
-    s16 height;
-    u8 paletteSlot:4;
-    u8 shadowSize:2;
-    u8 inanimate:1;
-    u8 disableReflectionPaletteLoad:1;
-    u8 tracks;
-    struct OamData *oam;
-    struct SubspriteTable *subspriteTables;
-    union AnimCmd **anims;
-    struct SpriteFrameImage *images;
-    union AffineAnimCmd **affineAnims;
+    /*0x00*/ u16 tileTag;
+    /*0x02*/ u16 paletteTag1;
+    /*0x04*/ u16 paletteTag2;
+    /*0x06*/ u16 size;
+    /*0x08*/ s16 width;
+    /*0x0A*/ s16 height;
+    /*0x0C*/ u8 paletteSlot:4;
+             u8 shadowSize:2;
+             u8 inanimate:1;
+             u8 disableReflectionPaletteLoad:1;
+    /*0x0D*/ u8 tracks;
+    /*0x10*/ struct OamData *oam;
+    /*0x14*/ struct SubspriteTable *subspriteTables;
+    /*0x18*/ union AnimCmd **anims;
+    /*0x1C*/ struct SpriteFrameImage *images;
+    /*0x20*/ union AffineAnimCmd **affineAnims;
 };
 
 #define PLAYER_AVATAR_FLAG_ON_FOOT   (1 << 0)
diff --git a/include/sprite.h b/include/sprite.h
index 2725d0bab..4e3074ebb 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -209,7 +209,7 @@ void ResetSpriteData(void);
 void AnimateSprites(void);
 void BuildOamBuffer(void);
 u8 CreateSprite(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority);
-u8 CreateSpriteAtEnd(const struct SpriteTemplate *template, u16 x, u16 y, u8 subpriority);
+u8 CreateSpriteAtEnd(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority);
 u8 CreateInvisibleSprite(void (*callback)(struct Sprite *));
 u8 CreateSpriteAndAnimate(struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority);
 void DestroySprite(struct Sprite *sprite);