diff options
Diffstat (limited to 'include/global.fieldmap.h')
-rw-r--r-- | include/global.fieldmap.h | 13 |
1 files changed, 10 insertions, 3 deletions
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; |