Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1021 from Brainface1/master 

Named some bike-related functions
This commit is contained in:
PikalaxALT 2020-04-12 13:30:04 -04:00 committed by GitHub
parent ee1744865e 9abda59bd1
commit 8a31778733
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/field_player_avatar.h
View File

@ -52,11 +52,11 @@ u8 GetPlayerAvatarFlags(void);
void sub_808B578(void); void sub_808B578(void);
u8 GetFRLGAvatarGraphicsIdByGender(u8); u8 GetFRLGAvatarGraphicsIdByGender(u8);
u8 GetRSAvatarGraphicsIdByGender(u8); u8 GetRSAvatarGraphicsIdByGender(u8);
void sub_808B980(u8 direction); void PlayerWheelieInPlace(u8 direction);
void sub_808B9BC(u8 direction); void PlayerWheelieMove(u8 direction);
void sub_808B9A4(u8 direction); void PlayerPopWheelieWhileMoving(u8 direction);
void sub_808C1B4(u8 direction); void PlayerUseAcroBikeOnBumpySlope(u8 direction);
void sub_808B9D4(u8 direction); void PlayerEndWheelieWhileMoving(u8 direction);
void sub_808D194(void); void sub_808D194(void);
void sub_808D1C8(void); void sub_808D1C8(void);
bool32 sub_808D1B4(void); bool32 sub_808D1B4(void);

12
src/bike.c
View File

@ -696,11 +696,11 @@ static void AcroBikeTransition_WheelieMoving(u8 direction)
if (MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) if (MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior))
PlayerIdleWheelie(direction); PlayerIdleWheelie(direction);
else else
sub_808B980(direction); //hit wall? PlayerWheelieInPlace(direction); //hit wall?
} }
return; return;
} }
sub_808B9BC(direction); PlayerWheelieMove(direction);
gPlayerAvatar.runningState = MOVING; gPlayerAvatar.runningState = MOVING;
} }
@ -730,11 +730,11 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction)
if (MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) if (MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior))
PlayerIdleWheelie(direction); PlayerIdleWheelie(direction);
else else
sub_808B980(direction); //hit wall? PlayerWheelieInPlace(direction); //hit wall?
} }
return; return;
} }
sub_808B9A4(direction); PlayerPopWheelieWhileMoving(direction);
gPlayerAvatar.runningState = MOVING; gPlayerAvatar.runningState = MOVING;
} }
@ -757,7 +757,7 @@ static void AcroBikeTransition_WheelieLoweringMoving(u8 direction)
PlayerEndWheelie(direction); PlayerEndWheelie(direction);
return; return;
} }
sub_808B9D4(direction); PlayerEndWheelieWhileMoving(direction);
} }
void Bike_TryAcroBikeHistoryUpdate(u16 newKeys, u16 heldKeys) void Bike_TryAcroBikeHistoryUpdate(u16 newKeys, u16 heldKeys)
@ -1049,7 +1049,7 @@ void Bike_HandleBumpySlopeJump(void)
if (MetatileBehavior_IsBumpySlope(tileBehavior)) if (MetatileBehavior_IsBumpySlope(tileBehavior))
{ {
gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING; gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING;
sub_808C1B4(GetPlayerMovementDirection()); PlayerUseAcroBikeOnBumpySlope(GetPlayerMovementDirection());
} }
} }
} }

14
src/field_player_avatar.c
View File

@ -261,7 +261,7 @@ static const u8 sRSAvatarGfxIds[] = {OBJ_EVENT_GFX_LINK_RS_BRENDAN, OBJ_EVENT_GF
static const u8 sPlayerAvatarGfxToStateFlag[2][5][2] = static const u8 sPlayerAvatarGfxToStateFlag[2][5][2] =
{ {
[MALE] = [MALE] =
{ {
{OBJ_EVENT_GFX_BRENDAN_NORMAL, PLAYER_AVATAR_FLAG_ON_FOOT}, {OBJ_EVENT_GFX_BRENDAN_NORMAL, PLAYER_AVATAR_FLAG_ON_FOOT},
{OBJ_EVENT_GFX_BRENDAN_MACH_BIKE, PLAYER_AVATAR_FLAG_MACH_BIKE}, {OBJ_EVENT_GFX_BRENDAN_MACH_BIKE, PLAYER_AVATAR_FLAG_MACH_BIKE},
@ -269,7 +269,7 @@ static const u8 sPlayerAvatarGfxToStateFlag[2][5][2] =
{OBJ_EVENT_GFX_BRENDAN_SURFING, PLAYER_AVATAR_FLAG_SURFING}, {OBJ_EVENT_GFX_BRENDAN_SURFING, PLAYER_AVATAR_FLAG_SURFING},
{OBJ_EVENT_GFX_BRENDAN_UNDERWATER, PLAYER_AVATAR_FLAG_UNDERWATER}, {OBJ_EVENT_GFX_BRENDAN_UNDERWATER, PLAYER_AVATAR_FLAG_UNDERWATER},
}, },
[FEMALE] = [FEMALE] =
{ {
{OBJ_EVENT_GFX_MAY_NORMAL, PLAYER_AVATAR_FLAG_ON_FOOT}, {OBJ_EVENT_GFX_MAY_NORMAL, PLAYER_AVATAR_FLAG_ON_FOOT},
{OBJ_EVENT_GFX_MAY_MACH_BIKE, PLAYER_AVATAR_FLAG_MACH_BIKE}, {OBJ_EVENT_GFX_MAY_MACH_BIKE, PLAYER_AVATAR_FLAG_MACH_BIKE},
@ -1079,23 +1079,23 @@ void PlayerAcroTurnJump(u8 direction)
PlayerSetAnimId(GetJumpInPlaceTurnAroundMovementAction(direction), 1); PlayerSetAnimId(GetJumpInPlaceTurnAroundMovementAction(direction), 1);
} }
void sub_808B980(u8 direction) void PlayerWheelieInPlace(u8 direction)
{ {
PlaySE(SE_WALL_HIT); PlaySE(SE_WALL_HIT);
PlayerSetAnimId(GetAcroWheelieInPlaceDirectionMovementAction(direction), 2); PlayerSetAnimId(GetAcroWheelieInPlaceDirectionMovementAction(direction), 2);
} }
void sub_808B9A4(u8 direction) void PlayerPopWheelieWhileMoving(u8 direction)
{ {
PlayerSetAnimId(GetAcroPopWheelieMoveDirectionMovementAction(direction), 2); PlayerSetAnimId(GetAcroPopWheelieMoveDirectionMovementAction(direction), 2);
} }
void sub_808B9BC(u8 direction) void PlayerWheelieMove(u8 direction)
{ {
PlayerSetAnimId(GetAcroWheelieMoveDirectionMovementAction(direction), 2); PlayerSetAnimId(GetAcroWheelieMoveDirectionMovementAction(direction), 2);
} }
void sub_808B9D4(u8 direction) void PlayerEndWheelieWhileMoving(u8 direction)
{ {
PlayerSetAnimId(GetAcroEndWheelieMoveDirectionMovementAction(direction), 2); PlayerSetAnimId(GetAcroEndWheelieMoveDirectionMovementAction(direction), 2);
} }
@ -1415,7 +1415,7 @@ void sub_808C15C(u8 direction)
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingDirectionAnimNum(direction)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingDirectionAnimNum(direction));
} }
void sub_808C1B4(u8 direction) void PlayerUseAcroBikeOnBumpySlope(u8 direction)
{ {
ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE));
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetAcroWheelieDirectionAnimNum(direction)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetAcroWheelieDirectionAnimNum(direction));