diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-05 17:48:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-05 17:48:21 -0400 |
| commit | 124e2eb02c4adc46265e5b34b47ac0c625a24ec3 (patch) | |
| tree | 5c0af98d9e49a767f455fff1ceec5d07cb8539b8 /include/global.fieldmap.h | |
| parent | 123d5cc8b26d2a93fa3981beaccb84377c6ae20f (diff) | |
| parent | 813c1846c94fa14b55bf75cf4c14465f1fb26635 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index b8bab45d8..7589de029 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -312,10 +312,10 @@ struct MapObjectGraphicsInfo u8 inanimate:1; u8 disableReflectionPaletteLoad:1; /*0x0D*/ u8 tracks; - /*0x10*/ struct OamData *oam; - /*0x14*/ struct SubspriteTable *subspriteTables; + /*0x10*/ const struct OamData *oam; + /*0x14*/ const struct SubspriteTable *subspriteTables; /*0x18*/ const union AnimCmd *const *anims; - /*0x1C*/ struct SpriteFrameImage *images; + /*0x1C*/ const struct SpriteFrameImage *images; /*0x20*/ const union AffineAnimCmd *const *affineAnims; }; |