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/sound.c | |
| parent | 0bc479db34154988c6322bf5f2bb6d48556f62c3 (diff) | |
| parent | 884b46a5dc26ae9e0c0abcf7e0d69c1122a30e22 (diff) | |
Merge pull request #225 from GriffinRichards/doc-questlog
Document some quest log
Diffstat (limited to 'src/sound.c')
| -rw-r--r-- | src/sound.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sound.c b/src/sound.c index 325ff783a..ebd755838 100644 --- a/src/sound.c +++ b/src/sound.c @@ -2,6 +2,7 @@ #include "gba/m4a_internal.h" #include "sound.h" #include "battle.h" +#include "quest_log.h" #include "m4a.h" #include "main.h" #include "pokemon.h" @@ -16,7 +17,6 @@ struct Fanfare // TODO: what are these extern u8 gDisableMapMusicChangeOnMapLoad; -extern u8 gUnknown_203ADFA; extern u8 gUnknown_203F174; // ewram @@ -193,7 +193,7 @@ void PlayFanfareByFanfareNum(u8 fanfareNum) { u16 songNum; - if(gUnknown_203ADFA == 2) + if(gQuestLogState == 2) { sFanfareCounter = 0xFF; } @@ -362,7 +362,7 @@ void PlayCry4(u16 species, s8 pan, u8 mode) void PlayCry7(u16 species, u8 mode) // exclusive to FR/LG { - if((u8)(gUnknown_203ADFA - 2) >= 2) + if (gQuestLogState != 2 && gQuestLogState != 3) { m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85); PlayCryInternal(species, 0, CRY_VOLUME, 10, mode); @@ -571,7 +571,7 @@ void PlayBGM(u16 songNum) void PlaySE(u16 songNum) { - if(gDisableMapMusicChangeOnMapLoad == 0 && gUnknown_203ADFA != 2) + if(gDisableMapMusicChangeOnMapLoad == 0 && gQuestLogState != 2) m4aSongNumStart(songNum); } |