diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-22 20:17:47 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-22 20:17:47 -0400 |
| commit | dbac777d95875b49e98da94551a89616c2addf3c (patch) | |
| tree | 6ce006a7d498ec30ac5da9d95fa961109b5e74f7 /include | |
| parent | 4f65d54095908a1bcf068c7712bca9d4c34f10a3 (diff) | |
through CheckMovementInputNotOnBike
Diffstat (limited to 'include')
| -rw-r--r-- | include/bike.h | 3 | ||||
| -rw-r--r-- | include/event_object_movement.h | 3 | ||||
| -rw-r--r-- | include/global.fieldmap.h | 6 | ||||
| -rw-r--r-- | include/metatile_behavior.h | 8 |
4 files changed, 13 insertions, 7 deletions
diff --git a/include/bike.h b/include/bike.h index 30049ee8c..1ff1ed5a3 100644 --- a/include/bike.h +++ b/include/bike.h @@ -6,4 +6,7 @@ bool8 sub_80BD540(void); void StartTransitionToFlipBikeState(u8 flags); s16 GetPlayerSpeed(void); +void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys); +void MovePlayerNotOnBike(u8 direction, u16 heldKeys); + #endif //GUARD_BIKE_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index e01364e55..3d5ea03f1 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -26,6 +26,8 @@ struct UnkStruct_083A3698 u8 animPos[4]; }; +typedef void (*MovementAction)(u8 direction); + #define GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN (1 << 0) #define GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE (1 << 1) #define GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN (1 << 2) @@ -186,6 +188,7 @@ void sub_8068CA4(struct Sprite *, u8); bool8 sub_8068CB4(struct Sprite *sprite); void SetAndStartSpriteAnim(struct Sprite *, u8, u8); bool8 SpriteAnimEnded(struct Sprite *); +u8 ObjectEventGetHeldMovementActionId(struct ObjectEvent *objectEvent); // Exported data declarations diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 3c4b5f382..fe794a69e 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -283,8 +283,8 @@ struct ObjectEventGraphicsInfo #define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2) #define PLAYER_AVATAR_FLAG_SURFING (1 << 3) #define PLAYER_AVATAR_FLAG_4 (1 << 4) -#define PLAYER_AVATAR_FLAG_5 (1 << 5) -#define PLAYER_AVATAR_FLAG_6 (1 << 6) +#define PLAYER_AVATAR_FLAG_FORCED_MVMT_DISABLED (1 << 5) +#define PLAYER_AVATAR_FLAG_MVMT_IS_FORCED (1 << 6) #define PLAYER_AVATAR_FLAG_DASH (1 << 7) enum @@ -349,7 +349,7 @@ struct PlayerAvatar /* 0x202E858 */ u32 unkC; u32 unk10; u8 unk14[8]; - u8 unk1C[8]; + u16 unk1C; // TODO: rest of struct }; diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index ae3e6a01d..34f5bbd7b 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -115,10 +115,10 @@ bool8 MetatileBehavior_UnusedReturnFalse_11(u8 metatileBehavior); bool8 MetatileBehavior_UnusedReturnFalse_12(u8 metatileBehavior); bool8 MetatileBehavior_UnusedReturnFalse_13(u8 metatileBehavior); bool8 TestMetatileAttributeBit(u8 attr, u8 bitmask); -bool8 MetatileBehavior_UnusedIsSpinRight(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedIsSpinLeft(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedIsSpinUp(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedIsSpinDown(u8 metatileBehavior); +bool8 MetatileBehavior_IsSpinRight(u8 metatileBehavior); +bool8 MetatileBehavior_IsSpinLeft(u8 metatileBehavior); +bool8 MetatileBehavior_IsSpinUp(u8 metatileBehavior); +bool8 MetatileBehavior_IsSpinDown(u8 metatileBehavior); bool8 MetatileBehavior_IsStopSpinning(u8 metatileBehavior); bool8 MetatileBehavior_IsSpinTile(u8 metatileBehavior); bool8 MetatileBehavior_IsSignpost(u8 metatileBehavior); |