diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-05-21 13:18:45 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2018-05-21 13:18:45 -0700 |
commit | 612f62725a2ed3be07f688f867aca3eb7579ab19 (patch) | |
tree | fad83c1f8a7150e2c2e44e392adf3043acb9ea31 /include | |
parent | eb31d1f861c20fa720c8bf0f253ba53500807144 (diff) |
Fix map object range union, and remove the obsolete alt struct
Diffstat (limited to 'include')
-rw-r--r-- | include/global.fieldmap.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 30047c677..7260118a9 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -226,10 +226,10 @@ struct MapObject /*0x19*/ union __attribute__((packed)) { u8 as_byte; struct __attribute__((packed)) { - u8 x:4; - u8 y:4; - } __attribute((aligned (1))) as_nybbles; - } __attribute((aligned (1))) range; + u16 x:4; + u16 y:4; + } as_nybbles; + } range; // /*0x19*/ u8 mapobj_unk_19; /*0x1A*/ u8 mapobj_unk_1A; /*0x1B*/ u8 mapobj_unk_1B; |