diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-16 09:53:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-16 09:53:08 -0500 |
| commit | fad367402892e1c25634c4448936d84a621c341c (patch) | |
| tree | b796aba2ae57729cae5f78767336082dd46a6b21 /src/battle_setup.c | |
| parent | 0bc479db34154988c6322bf5f2bb6d48556f62c3 (diff) | |
| parent | 884b46a5dc26ae9e0c0abcf7e0d69c1122a30e22 (diff) | |
Merge pull request #225 from GriffinRichards/doc-questlog
Document some quest log
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 056fe9273..994ed858a 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -997,8 +997,8 @@ void PlayTrainerEncounterMusic(void) { u16 music; - if (gUnknown_203ADFA != 2 - && gUnknown_203ADFA != 3 + if (gQuestLogState != 2 + && gQuestLogState != 3 && sTrainerBattleMode != TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC && sTrainerBattleMode != TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC) { |