diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-27 09:48:16 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-27 09:48:16 -0400 |
| commit | 08c23fb1c483ffcf7c17b8ac061ad4ff77318625 (patch) | |
| tree | 65bfdd399541ebd4f558614fd566aa92cfb94422 /include/global.fieldmap.h | |
| parent | 41cc0382a43161c0c66ddaf73742ecec8dcbdcc6 (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' into field_tasks
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; }; |