diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-26 17:37:14 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-26 17:37:14 -0400 |
| commit | 9130579f1454c869e74ea8c953c0c778a4760396 (patch) | |
| tree | 95935cb5754f89ea78402cf4706830f71eb07e81 /include | |
| parent | b0878acc98761b6ce488289906cd44b334134f95 (diff) | |
Resolve off-by-one error in evobjmv.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_object_movement.h | 6 | ||||
| -rw-r--r-- | include/field_player_avatar.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 34247c3a5..792118c00 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -119,8 +119,8 @@ bool8 ObjectEventSetHeldMovement(struct ObjectEvent *, u8); void ShiftStillObjectEventCoords(struct ObjectEvent *); void OverrideMovementTypeForObjectEvent(const struct ObjectEvent *, u8); void SetTrainerMovementType(struct ObjectEvent *, u8); -u8 GetFishingNoCatchDirectionAnimNum(u8 direction); -u8 GetFishingBiteDirectionAnimNum(u8 a0); +u8 GetFishingDirectionAnimNum(u8 direction); +u8 GetFishingNoCatchDirectionAnimNum(u8 a0); void ObjectEventSetGraphicsId(struct ObjectEvent *objectEvent, u8 a1); u8 sub_805EB44(u8, u8, s16, s16); void InitObjectEventPalettes(u8 mode); @@ -220,6 +220,6 @@ u8 GetAcroWheelieInPlaceDirectionMovementAction(u32 direction); u8 GetAcroPopWheelieMoveDirectionMovementAction(u32 direction); u8 GetAcroWheelieMoveDirectionMovementAction(u32 direction); u8 sub_80641EC(u32 direction); -u8 sub_8063510(u8 direction); +u8 GetFishingBiteDirectionAnimNum(u8 direction); #endif // GUARD_EVENT_OBJECT_MOVEMENT_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index b88952038..73109ae1e 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -13,6 +13,7 @@ u8 GetPlayerMovementDirection(void); u8 PlayerGetCopyableMovement(void); void MovePlayerNotOnBike(u8 direction, u16 heldKeys); +void MovementType_Player(struct Sprite * sprite); void sub_805C270(void); void sub_805C780(void); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); |