diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-23 08:54:37 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-23 08:54:37 -0400 |
| commit | f9a3607824d00f17999288e241fc3ad339716279 (patch) | |
| tree | f0ff09a0f64e2dbeaf41fef43f0f73f3553152cb /include | |
| parent | dbac777d95875b49e98da94551a89616c2addf3c (diff) | |
through CheckForObjectEventCollision
Diffstat (limited to 'include')
| -rw-r--r-- | include/bike.h | 2 | ||||
| -rw-r--r-- | include/constants/flags.h | 2 | ||||
| -rw-r--r-- | include/field_player_avatar.h | 1 | ||||
| -rw-r--r-- | include/global.fieldmap.h | 7 |
4 files changed, 4 insertions, 8 deletions
diff --git a/include/bike.h b/include/bike.h index 1ff1ed5a3..154ffeeee 100644 --- a/include/bike.h +++ b/include/bike.h @@ -7,6 +7,6 @@ void StartTransitionToFlipBikeState(u8 flags); s16 GetPlayerSpeed(void); void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys); -void MovePlayerNotOnBike(u8 direction, u16 heldKeys); +bool32 IsRunningDisallowed(u8 metatileBehavior); #endif //GUARD_BIKE_H diff --git a/include/constants/flags.h b/include/constants/flags.h index ccac1da3b..417e68255 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1345,7 +1345,7 @@ #define FLAG_SYS_GAME_CLEAR (SYS_FLAGS + 0x2C) #define FLAG_SYS_SET_TRAINER_CARD_PROFILE (SYS_FLAGS + 0x2D) #define FLAG_0x82E (SYS_FLAGS + 0x2E) -#define FLAG_SYS_RUNNING_SHOES (SYS_FLAGS + 0x2F) +#define FLAG_SYS_B_DASH (SYS_FLAGS + 0x2F) #define FLAG_SYS_ON_CYCLING_ROAD (SYS_FLAGS + 0x30) #define FLAG_0x831 (SYS_FLAGS + 0x31) #define FLAG_0x832 (SYS_FLAGS + 0x32) diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 51ae9905f..76271b5cf 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -11,6 +11,7 @@ void PlayerGetDestCoords(s16 *, s16 *); u8 GetPlayerFacingDirection(void); u8 GetPlayerMovementDirection(void); u8 PlayerGetCopyableMovement(void); +void MovePlayerNotOnBike(u8 direction, u16 heldKeys); void sub_808D074(u8); void sub_805C270(void); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index fe794a69e..658ad7393 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -308,12 +308,7 @@ enum COLLISION_STOP_SURFING, COLLISION_LEDGE_JUMP, COLLISION_PUSHED_BOULDER, - COLLISION_ROTATING_GATE, - COLLISION_WHEELIE_HOP, - COLLISION_ISOLATED_VERTICAL_RAIL, - COLLISION_ISOLATED_HORIZONTAL_RAIL, - COLLISION_VERTICAL_RAIL, - COLLISION_HORIZONTAL_RAIL, + COLLISION_UNKNOWN_WARP_6C_6D_6E_6F, }; // player running states |