diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-27 10:11:29 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-27 10:11:29 -0600 |
| commit | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (patch) | |
| tree | 99bc2544695e94e72417138648ed9744e37698fe /include/global.fieldmap.h | |
| parent | 977e0bc34514244d4afc35bb1edece166386f051 (diff) | |
| parent | 556bdd52e1ba5bf1c1cc3b00baab3bf7fc60d9f9 (diff) | |
Merge pull request #403 from nullableVoidPtr/master
Clean up aligned variables in src/
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index f6273e80d..1f14880f0 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -192,8 +192,8 @@ struct EventObject struct __attribute__((packed)) { u8 x:4; u8 y:4; - } __attribute__((aligned (1))) as_nybbles; - } __attribute__((aligned (1))) range; + } ALIGNED(1) as_nybbles; + } ALIGNED(1) range; /*0x1A*/ u8 fieldEffectSpriteId; /*0x1B*/ u8 warpArrowSpriteId; /*0x1C*/ u8 movementActionId; |