diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-19 11:00:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-19 11:00:32 -0400 |
| commit | 33b65b547000387fcdce9fe497da9b217544ece6 (patch) | |
| tree | 0c1754c67d188776ee1942fcca503ad8e1e19f05 /include/global.fieldmap.h | |
| parent | 715c2ff3ad3a7842a97a2b221f4c02135a813139 (diff) | |
| parent | a8403c07790b1031c96ff35a1701e1684919ed95 (diff) | |
Merge pull request #307 from PikalaxALT/field_control_avatar
Field control avatar
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index e1998afdf..3c4b5f382 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -110,20 +110,18 @@ struct ObjectEventTemplate struct WarpEvent { s16 x, y; - s8 warpId; - u8 mapGroup; + u8 elevation; + u8 warpId; u8 mapNum; - u8 unk7; + u8 mapGroup; }; struct CoordEvent { - s16 x, y; - u8 unk4; - u8 filler_5; + u16 x, y; + u8 elevation; u16 trigger; u16 index; - u8 filler_A[0x2]; u8 *script; }; @@ -152,7 +150,7 @@ union BgUnion struct BgEvent { u16 x, y; - u8 unk4; + u8 elevation; u8 kind; // 0x2 padding for the union beginning. union BgUnion bgUnion; @@ -318,6 +316,14 @@ enum COLLISION_HORIZONTAL_RAIL, }; +// player running states +enum +{ + NOT_MOVING, + TURN_DIRECTION, // not the same as turning! turns your avatar without moving. also known as a turn frame in some circles + MOVING, +}; + // player tile transition states enum { |