through CheckForObjectEventCollision

This commit is contained in:
PikalaxALT
2020-03-23 08:54:37 -04:00
parent dbac777d95
commit f9a3607824
8 changed files with 152 additions and 377 deletions
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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)
+1
View File
@@ -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);
+1 -6
View File
@@ -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