diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 03:03:45 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-24 03:03:45 -0500 |
commit | 39556605cd27a567a45bfc2c46af745ac031ab90 (patch) | |
tree | c2ff7645625d62e94b369080ba37071eb98426d1 /include/global.fieldmap.h | |
parent | ef1f9ead0ba44c67185dccc616846646d7ce9257 (diff) | |
parent | 85e5c57e8c86cca00e8bfc7d54e21d08c9e62e69 (diff) |
Merge branch 'master' into doc-ttower
Diffstat (limited to 'include/global.fieldmap.h')
-rw-r--r-- | include/global.fieldmap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 4402d5042..01cd992ec 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -275,9 +275,9 @@ enum struct PlayerAvatar /* 0x202E858 */ { /*0x00*/ u8 flags; - /*0x01*/ u8 bike; - /*0x02*/ u8 running2; - /*0x03*/ u8 running1; + /*0x01*/ u8 unk1; // used to be bike, but it's not that in Emerald and probably isn't here either. maybe transition flags? + /*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving. + /*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning. /*0x04*/ u8 spriteId; /*0x05*/ u8 objectEventId; /*0x06*/ u8 unk6; |