diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-10 12:48:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-10 12:48:58 -0400 |
| commit | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (patch) | |
| tree | 331837d61614da6f73e983a7230796ace13c9ea6 /src/quest_log_objects.c | |
| parent | a81edaba1d5e0f84336fd8a57a48b2a970171ba4 (diff) | |
| parent | 5f7ed93363db01da8667aadf47d78cb6515bb450 (diff) | |
Merge pull request #323 from PikalaxALT/various_documentation
Document various parts of the source tree
Diffstat (limited to 'src/quest_log_objects.c')
| -rw-r--r-- | src/quest_log_objects.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quest_log_objects.c b/src/quest_log_objects.c index 64b4b7fe5..fa3bbcce5 100644 --- a/src/quest_log_objects.c +++ b/src/quest_log_objects.c @@ -131,7 +131,7 @@ void SetSav1ObjectEventsFromQuestLog(const struct QuestLog * questLog, const str void sub_815A540(void) { - if (gQuestLogState == QL_STATE_2) + if (gQuestLogState == QL_STATE_PLAYBACK) { s16 x, y; @@ -139,7 +139,7 @@ void sub_815A540(void) if (!MetatileBehavior_IsSurfable(MapGridGetMetatileBehaviorAt(x, y)) && TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) { struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - SetPlayerAvatarTransitionFlags(0x01); + SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT); DestroySprite(&gSprites[objectEvent->fieldEffectSpriteId]); } } |