From 1472a3a7d4f877657ee59d1c84e794d146bb6851 Mon Sep 17 00:00:00 2001 From: brain_face Date: Sun, 12 Apr 2020 14:38:18 +0200 Subject: [PATCH 1/5] Renamed sub_808B980 -> PlayerWheelieInPlace --- include/field_player_avatar.h | 2 +- src/bike.c | 4 ++-- src/field_player_avatar.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 1dbe171bc2..0a39a08953 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -52,7 +52,7 @@ u8 GetPlayerAvatarFlags(void); void sub_808B578(void); u8 GetFRLGAvatarGraphicsIdByGender(u8); u8 GetRSAvatarGraphicsIdByGender(u8); -void sub_808B980(u8 direction); +void PlayerWheelieInPlace(u8 direction); void sub_808B9BC(u8 direction); void sub_808B9A4(u8 direction); void sub_808C1B4(u8 direction); diff --git a/src/bike.c b/src/bike.c index 15857778cc..45598e83ca 100644 --- a/src/bike.c +++ b/src/bike.c @@ -696,7 +696,7 @@ static void AcroBikeTransition_WheelieMoving(u8 direction) if (MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) PlayerIdleWheelie(direction); else - sub_808B980(direction); //hit wall? + PlayerWheelieInPlace(direction); //hit wall? } return; } @@ -730,7 +730,7 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction) if (MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) PlayerIdleWheelie(direction); else - sub_808B980(direction); //hit wall? + PlayerWheelieInPlace(direction); //hit wall? } return; } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 35bbb1e036..40086eab7a 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1079,7 +1079,7 @@ void PlayerAcroTurnJump(u8 direction) PlayerSetAnimId(GetJumpInPlaceTurnAroundMovementAction(direction), 1); } -void sub_808B980(u8 direction) +void PlayerWheelieInPlace(u8 direction) { PlaySE(SE_WALL_HIT); PlayerSetAnimId(GetAcroWheelieInPlaceDirectionMovementAction(direction), 2); From 1be48a61c1a20b5c9087c1a68346c5efe33685c8 Mon Sep 17 00:00:00 2001 From: brain_face Date: Sun, 12 Apr 2020 15:31:11 +0200 Subject: [PATCH 2/5] Renamed sub_808B9BC -> PlayerWheelieMove --- include/field_player_avatar.h | 2 +- src/bike.c | 2 +- src/field_player_avatar.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 0a39a08953..45e0a6676e 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -53,7 +53,7 @@ void sub_808B578(void); u8 GetFRLGAvatarGraphicsIdByGender(u8); u8 GetRSAvatarGraphicsIdByGender(u8); void PlayerWheelieInPlace(u8 direction); -void sub_808B9BC(u8 direction); +void PlayerWheelieMove(u8 direction); void sub_808B9A4(u8 direction); void sub_808C1B4(u8 direction); void sub_808B9D4(u8 direction); diff --git a/src/bike.c b/src/bike.c index 45598e83ca..711c18cd7a 100644 --- a/src/bike.c +++ b/src/bike.c @@ -700,7 +700,7 @@ static void AcroBikeTransition_WheelieMoving(u8 direction) } return; } - sub_808B9BC(direction); + PlayerWheelieMove(direction); gPlayerAvatar.runningState = MOVING; } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 40086eab7a..4baf0c64f4 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -261,7 +261,7 @@ static const u8 sRSAvatarGfxIds[] = {OBJ_EVENT_GFX_LINK_RS_BRENDAN, OBJ_EVENT_GF static const u8 sPlayerAvatarGfxToStateFlag[2][5][2] = { - [MALE] = + [MALE] = { {OBJ_EVENT_GFX_BRENDAN_NORMAL, PLAYER_AVATAR_FLAG_ON_FOOT}, {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_UNDERWATER, PLAYER_AVATAR_FLAG_UNDERWATER}, }, - [FEMALE] = + [FEMALE] = { {OBJ_EVENT_GFX_MAY_NORMAL, PLAYER_AVATAR_FLAG_ON_FOOT}, {OBJ_EVENT_GFX_MAY_MACH_BIKE, PLAYER_AVATAR_FLAG_MACH_BIKE}, @@ -1090,7 +1090,7 @@ void sub_808B9A4(u8 direction) PlayerSetAnimId(GetAcroPopWheelieMoveDirectionMovementAction(direction), 2); } -void sub_808B9BC(u8 direction) +void PlayerWheelieMove(u8 direction) { PlayerSetAnimId(GetAcroWheelieMoveDirectionMovementAction(direction), 2); } From ce2fe10bec6c83c108ddf3034ecfb09beee5c198 Mon Sep 17 00:00:00 2001 From: brain_face Date: Sun, 12 Apr 2020 15:35:38 +0200 Subject: [PATCH 3/5] Renamed sub_808B9A4 -> PlayerPopWheelieWhileMoving --- include/field_player_avatar.h | 2 +- src/bike.c | 2 +- src/field_player_avatar.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 45e0a6676e..b79aed4ff3 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -54,7 +54,7 @@ u8 GetFRLGAvatarGraphicsIdByGender(u8); u8 GetRSAvatarGraphicsIdByGender(u8); void PlayerWheelieInPlace(u8 direction); void PlayerWheelieMove(u8 direction); -void sub_808B9A4(u8 direction); +void PlayerPopWheelieWhileMoving(u8 direction); void sub_808C1B4(u8 direction); void sub_808B9D4(u8 direction); void sub_808D194(void); diff --git a/src/bike.c b/src/bike.c index 711c18cd7a..6f758f803c 100644 --- a/src/bike.c +++ b/src/bike.c @@ -734,7 +734,7 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction) } return; } - sub_808B9A4(direction); + PlayerPopWheelieWhileMoving(direction); gPlayerAvatar.runningState = MOVING; } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 4baf0c64f4..fd17b08071 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1085,7 +1085,7 @@ void PlayerWheelieInPlace(u8 direction) PlayerSetAnimId(GetAcroWheelieInPlaceDirectionMovementAction(direction), 2); } -void sub_808B9A4(u8 direction) +void PlayerPopWheelieWhileMoving(u8 direction) { PlayerSetAnimId(GetAcroPopWheelieMoveDirectionMovementAction(direction), 2); } From 007a03803122b2605f089106c110a2f85e53f79d Mon Sep 17 00:00:00 2001 From: brain_face Date: Sun, 12 Apr 2020 15:43:45 +0200 Subject: [PATCH 4/5] Renamed sub_808B9D4 -> PlayerEndWheelieWhileMoving --- include/field_player_avatar.h | 2 +- src/bike.c | 2 +- src/field_player_avatar.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index b79aed4ff3..12f41c0f81 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -56,7 +56,7 @@ void PlayerWheelieInPlace(u8 direction); void PlayerWheelieMove(u8 direction); void PlayerPopWheelieWhileMoving(u8 direction); void sub_808C1B4(u8 direction); -void sub_808B9D4(u8 direction); +void PlayerEndWheelieWhileMoving(u8 direction); void sub_808D194(void); void sub_808D1C8(void); bool32 sub_808D1B4(void); diff --git a/src/bike.c b/src/bike.c index 6f758f803c..ebf2c7a50d 100644 --- a/src/bike.c +++ b/src/bike.c @@ -757,7 +757,7 @@ static void AcroBikeTransition_WheelieLoweringMoving(u8 direction) PlayerEndWheelie(direction); return; } - sub_808B9D4(direction); + PlayerEndWheelieWhileMoving(direction); } void Bike_TryAcroBikeHistoryUpdate(u16 newKeys, u16 heldKeys) diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index fd17b08071..9fef51bece 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1095,7 +1095,7 @@ void PlayerWheelieMove(u8 direction) PlayerSetAnimId(GetAcroWheelieMoveDirectionMovementAction(direction), 2); } -void sub_808B9D4(u8 direction) +void PlayerEndWheelieWhileMoving(u8 direction) { PlayerSetAnimId(GetAcroEndWheelieMoveDirectionMovementAction(direction), 2); } From 9abda59bd1e08ede1f6fce18d2f2f2bb230327f6 Mon Sep 17 00:00:00 2001 From: brain_face Date: Sun, 12 Apr 2020 16:22:03 +0200 Subject: [PATCH 5/5] Renamed sub_808C1B4 -> PlayerUseAcroBikeOnBumpySlope --- include/field_player_avatar.h | 2 +- src/bike.c | 2 +- src/field_player_avatar.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 12f41c0f81..bcee339d5f 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -55,7 +55,7 @@ u8 GetRSAvatarGraphicsIdByGender(u8); void PlayerWheelieInPlace(u8 direction); void PlayerWheelieMove(u8 direction); void PlayerPopWheelieWhileMoving(u8 direction); -void sub_808C1B4(u8 direction); +void PlayerUseAcroBikeOnBumpySlope(u8 direction); void PlayerEndWheelieWhileMoving(u8 direction); void sub_808D194(void); void sub_808D1C8(void); diff --git a/src/bike.c b/src/bike.c index ebf2c7a50d..e66d6b6e13 100644 --- a/src/bike.c +++ b/src/bike.c @@ -1049,7 +1049,7 @@ void Bike_HandleBumpySlopeJump(void) if (MetatileBehavior_IsBumpySlope(tileBehavior)) { gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING; - sub_808C1B4(GetPlayerMovementDirection()); + PlayerUseAcroBikeOnBumpySlope(GetPlayerMovementDirection()); } } } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 9fef51bece..6d44f4b514 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1415,7 +1415,7 @@ void sub_808C15C(u8 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)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetAcroWheelieDirectionAnimNum(direction));