diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-16 07:51:21 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-16 07:51:21 -0400 |
| commit | 0367cc7d7884ff4100b90832ac000a3e415d2896 (patch) | |
| tree | a06d1aa77e267d20d0d925477fc27ffb303594a8 /src/quest_log_player.c | |
| parent | 9c2e157123903ba18ee51655c42c7304517b37cc (diff) | |
| parent | f44f89a463d7280a95094e8f37a56873a90da843 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into pokemon_storage_system
Diffstat (limited to 'src/quest_log_player.c')
| -rw-r--r-- | src/quest_log_player.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quest_log_player.c b/src/quest_log_player.c index b57e3930c..be40042b3 100644 --- a/src/quest_log_player.c +++ b/src/quest_log_player.c @@ -87,7 +87,7 @@ static void sub_8150530(void) else { sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(4)); - StartSpriteAnim(sprite, sub_80634F0(objectEvent->facingDirection)); + StartSpriteAnim(sprite, GetFishingNoCatchDirectionAnimNum(objectEvent->facingDirection)); } } @@ -99,10 +99,10 @@ static void sub_81505C4(u8 taskId) switch (gTasks[taskId].data[0]) { case 0: - ObjectEventClearAnimIfSpecialAnimActive(objectEvent); + ObjectEventClearHeldMovementIfActive(objectEvent); objectEvent->enableAnim = TRUE; sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(4)); - StartSpriteAnim(sprite, sub_80634F0(objectEvent->facingDirection)); + StartSpriteAnim(sprite, GetFishingNoCatchDirectionAnimNum(objectEvent->facingDirection)); gTasks[taskId].data[0]++; gTasks[taskId].data[1] = 0; break; @@ -114,7 +114,7 @@ static void sub_81505C4(u8 taskId) gTasks[taskId].data[0]++; break; case 2: - StartSpriteAnim(sprite, sub_8063500(GetPlayerFacingDirection())); + StartSpriteAnim(sprite, GetFishingBiteDirectionAnimNum(GetPlayerFacingDirection())); gTasks[taskId].data[0]++; break; case 3: |