diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-23 22:06:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-23 22:06:08 -0400 |
| commit | d8b76e6fb545efd69bfb18322a67243520e4d11d (patch) | |
| tree | 12deeb8f5f21707819f36fa1e86aa73c255b8f65 /include/global.fieldmap.h | |
| parent | ed16a7409ae9c808a110975dec1930f9f949a6d6 (diff) | |
| parent | b280105f527f9cbb1bed2fde5ae006a87b697e23 (diff) | |
Merge pull request #405 from Kurausukun/port_matchings
[PARTIALLY LEAK-INFORMED] Port Matchings from Emerald and Fix Other Nonmatchings
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 c481968cf..202ff6bd6 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; |