diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-01-21 22:04:49 -0600 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-01-21 20:04:49 -0800 |
| commit | ef82a98a1525f58d3a6c56194a42f7660cfc923b (patch) | |
| tree | df3160b491cdc5081b57eefed93aa2fc1eada989 /include/global.fieldmap.h | |
| parent | bcaab977727ded65c9eeaef9dbef9e9441d26fb7 (diff) | |
label a few things and put data in field_player_avatar.c (#212)
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index eac2c0cf1..5c498de49 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -196,7 +196,7 @@ struct MapObject /*0x0C*/ struct Coords16 coords1; /*0x10*/ struct Coords16 coords2; /*0x14*/ struct Coords16 coords3; - /*0x18*/ u8 mapobj_unk_18:4; + /*0x18*/ u8 mapobj_unk_18:4; //current direction? /*0x18*/ u8 placeholder18:4; /*0x19*/ u8 mapobj_unk_19; /*0x1A*/ u8 mapobj_unk_1A; @@ -207,7 +207,7 @@ struct MapObject /*0x1F*/ u8 mapobj_unk_1F; /*0x20*/ u8 mapobj_unk_20; /*0x21*/ u8 mapobj_unk_21; - /*0x22*/ u8 mapobj_unk_22; + /*0x22*/ u8 animId; /*size = 0x24*/ }; @@ -302,6 +302,31 @@ struct MapObjectGraphicsInfo #define PLAYER_AVATAR_FLAG_6 (1 << 6) #define PLAYER_AVATAR_FLAG_DASH (1 << 7) +enum +{ + ACRO_BIKE_NORMAL, + ACRO_BIKE_TURNING, + ACRO_BIKE_WHEELIE_STANDING, + ACRO_BIKE_BUNNY_HOP, + ACRO_BIKE_WHEELIE_MOVING, + ACRO_BIKE_STATE5, + ACRO_BIKE_STATE6, +}; + +enum +{ + DIR_NONE, + DIR_SOUTH, + DIR_NORTH, + DIR_WEST, + DIR_EAST, +}; + +enum +{ + COLLISION_LEDGE_JUMP = 6 +}; + struct PlayerAvatar /* 0x202E858 */ { /*0x00*/ u8 flags; @@ -312,9 +337,9 @@ struct PlayerAvatar /* 0x202E858 */ /*0x05*/ u8 mapObjectId; /*0x06*/ u8 unk6; /*0x07*/ u8 gender; - u8 unk8; + u8 acroBikeState; u8 unk9; - u8 unkA; + u8 bikeFrameCounter; u8 unkB; u32 unkC; u32 unk10; |