dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pret/pokefirered into fix_mvmt_types

Browse Source
This commit is contained in:
PikalaxALT
2021-03-31 09:42:57 -04:00
parent f00b44699c d1afbf17bb
commit a704592eb7
9 changed files with 135 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/bike.h
+19 -5
View File
@@ -13,6 +13,20 @@ enum
SPEED_FASTEST,
};
enum {
BIKE_TRANS_FACE_DIRECTION,
BIKE_TRANS_TURNING,
BIKE_TRANS_MOVE,
BIKE_TRANS_DOWNHILL,
BIKE_TRANS_UPHILL
};
enum {
BIKE_STATE_NORMAL,
BIKE_STATE_TURNING,
BIKE_STATE_SLOPE
};
// Acro bike states
enum
{
@@ -25,15 +39,15 @@ enum
ACRO_STATE_TURN_JUMP,
};
void InitPlayerAvatarBikeState(u32 directionHistory, u32 abStartSelectHistory);
bool8 MetatileAtPlayerPositionForbidsBiking(void);
void StartTransitionToFlipBikeState(u8 flags);
void BikeClearState(u32 directionHistory, u32 abStartSelectHistory);
bool8 IsBikingDisallowedByPlayer(void);
void GetOnOffBike(u8 flags);
s16 GetPlayerSpeed(void);
bool8 sub_80BD460(u8);
bool8 RS_IsRunningDisallowed(u8 r0);
void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys);
bool32 IsRunningDisallowed(u8 metatileBehavior);
void Bike_HandleBumpySlopeJump(void);
void Bike_UpdateBikeCounterSpeed(u8 counter);
bool8 player_should_look_direction_be_enforced_upon_movement(void);
bool8 IsPlayerNotUsingAcroBikeOnBumpySlope(void);
#endif //GUARD_BIKE_H
include/constants/metatile_behaviors.h
+1 -1
View File
@@ -6,7 +6,7 @@
#define MB_01 0x01
#define MB_TALL_GRASS 0x02
#define MB_CAVE 0x08
#define MB_0A 0x0A
#define MB_RUNNING_DISALLOWED 0x0A
#define MB_0B 0x0B
#define MB_0C 0x0C
#define MB_POND_WATER 0x10
include/field_player_avatar.h
+1 -1
View File
@@ -61,7 +61,7 @@ void player_step(u8 direction, u16 newKeys, u16 heldKeys);
bool32 PlayerIsMovingOnRockStairs(u8 direction);
void UpdatePlayerAvatarTransitionState(void);
void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender);
void nullsub_24(u8 direction);
void PlayerUseAcroBikeOnBumpySlope(u8 direction);
u8 GetRSAvatarGraphicsIdByGender(u8 gender);
#endif //GUARD_FIELD_PLAYER_AVATAR_H
include/metatile_behavior.h
+2 -2
View File
@@ -77,7 +77,7 @@ bool8 MetatileBehavior_IsSouthBlocked(u8 metatileBehavior);
bool8 MetatileBehavior_IsShortGrass(u8 metatileBehavior);
bool8 MetatileBehavior_IsHotSprings(u8 metatileBehavior);
bool8 MetatileBehavior_IsWaterfall(u8 metatileBehavior);
bool8 MetatileBehavior_ReturnFalse_9(u8 metatileBehavior);
bool8 MetatileBehavior_IsFortreeBridge(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedReturnFalse(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedReturnFalse_2(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedReturnFalse_3(u8 metatileBehavior);
@@ -104,7 +104,7 @@ bool8 MetatileBehavior_IsIsolatedHorizontalRail(u8 metatileBehavior);
bool8 MetatileBehavior_IsVerticalRail(u8 metatileBehavior);
bool8 MetatileBehavior_IsHorizontalRail(u8 metatileBehavior);
bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior);
bool8 MetatileBehavior_IsMB0A(u8 metatileBehavior);
bool8 MetatileBehavior_IsRunningDisallowed(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedReturnFalse_9(u8 metatileBehavior);
bool8 MetatileBehavior_IsBookshelf(u8 metatileBehavior);
bool8 MetatileBehavior_IsPokeMartShelf(u8 metatileBehavior);