diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-12-14 23:22:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-14 23:22:41 -0500 |
| commit | 15c2856b24c91d1fe4c3d5f3fe4d84d87827f386 (patch) | |
| tree | 3367bb9a7ae8b701acf43cb8df6e137cf94f72bb /include | |
| parent | c61142188292a0edfe9154a93e440739560490cf (diff) | |
| parent | 69cfe5ad01f135e16c330891d3b6d9fc7853e632 (diff) | |
Merge pull request #1265 from Kurausukun/berry_crush
fakematch fixes, begin documenting Berry Crush (based on #1187)
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 6 | ||||
| -rw-r--r-- | include/global.fieldmap.h | 13 |
2 files changed, 9 insertions, 10 deletions
diff --git a/include/battle.h b/include/battle.h index 820684a69..53a78024a 100644 --- a/include/battle.h +++ b/include/battle.h @@ -585,7 +585,11 @@ struct BattleSpriteData struct MonSpritesGfx { void* firstDecompressed; // ptr to the decompressed sprite of the first pokemon - void* sprites[4]; + union + { + void* ptr[4]; + u8* byte[4]; + } sprites; struct SpriteTemplate templates[4]; struct SpriteFrameImage field_74[4][4]; u8 field_F4[0x80]; diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 83123c834..c4d7be35d 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -195,15 +195,10 @@ struct ObjectEvent /*0x0C*/ struct Coords16 initialCoords; /*0x10*/ struct Coords16 currentCoords; /*0x14*/ struct Coords16 previousCoords; - /*0x18*/ u8 facingDirection:4; // current direction? - /*0x18*/ u8 movementDirection:4; - /*0x19*/ union __attribute__((packed)) { - u8 as_byte; - struct __attribute__((packed)) { - u8 x:4; - u8 y:4; - } ALIGNED(1) as_nybbles; - } ALIGNED(1) range; + /*0x18*/ u16 facingDirection:4; // current direction? + u16 movementDirection:4; + u16 rangeX:4; + u16 rangeY:4; /*0x1A*/ u8 fieldEffectSpriteId; /*0x1B*/ u8 warpArrowSpriteId; /*0x1C*/ u8 movementActionId; |