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

Fix typos

Browse Source
This commit is contained in:
PikalaxALT
2021-03-30 16:07:18 -04:00
parent 8e82c291fd
commit d9234adb00
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/bike.h
+1 -1
View File
@@ -41,7 +41,7 @@ enum
void BikeClearState(u32 directionHistory, u32 abStartSelectHistory); void BikeClearState(u32 directionHistory, u32 abStartSelectHistory);
bool8 IsBikingDisallowedByPlayer(void); bool8 IsBikingDisallowedByPlayer(void);
void GoOnOffBike(u8 flags); void GetOnOffBike(u8 flags);
s16 GetPlayerSpeed(void); s16 GetPlayerSpeed(void);
bool8 RS_IsRunningDisallowed(u8 r0); bool8 RS_IsRunningDisallowed(u8 r0);
void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys); void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys);
src/bike.c
+5 -5
View File
@@ -11,7 +11,7 @@
static u8 GetBikeTransitionId(u8 *, u16, u16); static u8 GetBikeTransitionId(u8 *, u16, u16);
static void Bike_SetBikeStill(void); static void Bike_SetBikeStill(void);
static u8 CanBikeFaceDIrectionOnRail(u8 direction, u8 metatileBehavior); static u8 CanBikeFaceDirectionOnRail(u8 direction, u8 metatileBehavior);
static u8 GetBikeCollision(u8); static u8 GetBikeCollision(u8);
static u8 GetBikeCollisionAt(struct ObjectEvent *playerObjEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior); static u8 GetBikeCollisionAt(struct ObjectEvent *playerObjEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior);
static bool8 MetatileBehaviorForbidsBiking(u8); static bool8 MetatileBehaviorForbidsBiking(u8);
@@ -155,7 +155,7 @@ static void BikeTransition_TurnDirection(u8 direction)
{ {
struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
if (!CanBikeFaceDIrectionOnRail(direction, playerObjEvent->currentMetatileBehavior)) if (!CanBikeFaceDirectionOnRail(direction, playerObjEvent->currentMetatileBehavior))
direction = playerObjEvent->movementDirection; direction = playerObjEvent->movementDirection;
PlayerFaceDirection(direction); PlayerFaceDirection(direction);
} }
@@ -165,7 +165,7 @@ static void BikeTransition_MoveDirection(u8 direction)
struct ObjectEvent *playerObjEvent; struct ObjectEvent *playerObjEvent;
playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
if (!CanBikeFaceDIrectionOnRail(direction, playerObjEvent->currentMetatileBehavior)) if (!CanBikeFaceDirectionOnRail(direction, playerObjEvent->currentMetatileBehavior))
{ {
BikeTransition_FaceDirection(playerObjEvent->movementDirection); BikeTransition_FaceDirection(playerObjEvent->movementDirection);
} }
@@ -268,7 +268,7 @@ static bool8 MetatileBehaviorForbidsBiking(u8 metatileBehavior)
return TRUE; return TRUE;
} }
static bool8 CanBikeFaceDIrectionOnRail(u8 direction, u8 metatileBehavior) static bool8 CanBikeFaceDirectionOnRail(u8 direction, u8 metatileBehavior)
{ {
if (direction == DIR_EAST || direction == DIR_WEST) if (direction == DIR_EAST || direction == DIR_WEST)
{ {
@@ -308,7 +308,7 @@ bool8 IsPlayerNotUsingAcroBikeOnBumpySlope(void)
return TRUE; return TRUE;
} }
void GoOnOffBike(u8 flags) void GetOnOffBike(u8 flags)
{ {
gBikeCameraAheadPanback = FALSE; gBikeCameraAheadPanback = FALSE;
if (gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE)) if (gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
src/item_use.c
+1 -1
View File
@@ -276,7 +276,7 @@ static void ItemUseOnFieldCB_Bicycle(u8 taskId)
{ {
if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE)) if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
PlaySE(SE_BIKE_BELL); PlaySE(SE_BIKE_BELL);
GoOnOffBike(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE); GetOnOffBike(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE);
ClearPlayerHeldMovementAndUnfreezeObjectEvents(); ClearPlayerHeldMovementAndUnfreezeObjectEvents();
ScriptContext2_Disable(); ScriptContext2_Disable();
DestroyTask(taskId); DestroyTask(taskId);