dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pret/pokefirered into misc_doc

Browse Source
This commit is contained in:
PikalaxALT
2021-03-24 08:15:08 -04:00
parent a925d2b7b0 d8b76e6fb5
commit 6b64fbc522
23 changed files with 3255 additions and 4336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/global.fieldmap.h
+3 -10
View File
@@ -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;