diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
| commit | b22d3a821d8656d9fb88000ce02e5b885a59e1c3 (patch) | |
| tree | 7d4054b0df9f5746b3e31623868bf7d604ae7328 /src/sound.c | |
| parent | 8626240b54d87449e5db70345840ccf20717d8c7 (diff) | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into modern_gcc
Diffstat (limited to 'src/sound.c')
| -rw-r--r-- | src/sound.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/sound.c b/src/sound.c index 99e9a162e..ed3f368ad 100644 --- a/src/sound.c +++ b/src/sound.c @@ -1,10 +1,9 @@ #include "global.h" #include "gba/m4a_internal.h" -#include "sound.h" +#include "gflib.h" #include "battle.h" #include "quest_log.h" #include "m4a.h" -#include "main.h" #include "constants/songs.h" #include "constants/fanfares.h" #include "task.h" @@ -193,7 +192,7 @@ void PlayFanfareByFanfareNum(u8 fanfareNum) { u16 songNum; - if(gQuestLogState == 2) + if(gQuestLogState == QL_STATE_PLAYBACK) { sFanfareCounter = 0xFF; } @@ -362,7 +361,7 @@ void PlayCry4(u16 species, s8 pan, u8 mode) void PlayCry7(u16 species, u8 mode) // exclusive to FR/LG { - if (gQuestLogState != 2 && gQuestLogState != 3) + if (!QL_IS_PLAYBACK_STATE) { m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85); PlayCryInternal(species, 0, CRY_VOLUME, 10, mode); @@ -571,7 +570,7 @@ void PlayBGM(u16 songNum) void PlaySE(u16 songNum) { - if(gDisableMapMusicChangeOnMapLoad == 0 && gQuestLogState != 2) + if(gDisableMapMusicChangeOnMapLoad == 0 && gQuestLogState != QL_STATE_PLAYBACK) m4aSongNumStart(songNum); } |