diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm.inc.h | 2 | ||||
| -rw-r--r-- | include/sprite.h | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index 5ec19b81e..0e45c3174 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -446,7 +446,7 @@ void sub_813CE30(u16, u16, u16, u16); u8 sub_813CE88(u16, s16, u16, u16, u8); u8 sub_813CFA8(u16, u16, u16, u16); void sub_813D084(u8); -u8 sub_813D584(/*TODO: arg types*/); +u8 sub_813D584(u16, s16, u16, u16, u16, u8); void sub_813D788(struct Sprite *); void sub_813D880(struct Sprite *); void sub_813D954(/*TODO: arg types*/); diff --git a/include/sprite.h b/include/sprite.h index 57926fc68..3c8da394f 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -130,13 +130,13 @@ struct SpriteTemplate struct Sprite { - struct OamData oam; - union AnimCmd **anims; - struct SpriteFrameImage *images; - union AffineAnimCmd **affineAnims; - const struct SpriteTemplate *template; - struct SubspriteTable *subspriteTables; - void (*callback)(struct Sprite *); + /*0x00*/ struct OamData oam; + /*0x08*/ union AnimCmd **anims; + /*0x0C*/ struct SpriteFrameImage *images; + /*0x10*/ union AffineAnimCmd **affineAnims; + /*0x14*/ const struct SpriteTemplate *template; + /*0x18*/ struct SubspriteTable *subspriteTables; + /*0x1C*/ void (*callback)(struct Sprite *); /*0x20*/ struct Coords16 pos1; /*0x24*/ struct Coords16 pos2; |