diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-24 08:15:08 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-24 08:15:08 -0400 |
| commit | 6b64fbc5224293394cff282bb2aedcecfa56eceb (patch) | |
| tree | 648a5bf848957321a13d5a489692d3d33492359e /include/global.fieldmap.h | |
| parent | a925d2b7b0c1d6d4386d3f647a18f4f797dbeab7 (diff) | |
| parent | d8b76e6fb545efd69bfb18322a67243520e4d11d (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into misc_doc
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 6baa6a6bc..28737b520 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -82,14 +82,6 @@ struct BackupMapLayout u16 *map; }; -union __attribute__((packed)) ObjectEventRange { - u8 as_byte; - struct __attribute__((packed)) { - u8 x:4; - u8 y:4; - } __attribute__((aligned (1))) as_nybbles; -} __attribute__((aligned (1))); - struct ObjectEventTemplate { /*0x00*/ u8 localId; @@ -239,8 +231,9 @@ struct ObjectEvent /*0x10*/ struct Coords16 currentCoords; /*0x14*/ struct Coords16 previousCoords; /*0x18*/ u8 facingDirection:4; - /*0x18*/ u8 movementDirection:4; - /*0x19*/ union ObjectEventRange range; + u8 movementDirection:4; + u16 rangeX:4; + u16 rangeY:4; /*0x1A*/ u8 fieldEffectSpriteId; /*0x1B*/ u8 warpArrowSpriteId; /*0x1C*/ u8 movementActionId; |