diff options
| author | SatoMew <SatoMew@users.noreply.github.com> | 2019-08-04 20:35:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-04 20:35:38 +0100 |
| commit | 667f0837e2c0fecb03e4198a182cf04624a47fbd (patch) | |
| tree | 4f11ff910478fdb34a4c40c465b30be2ac1a22da /src/sound.c | |
| parent | 89da828794d036e33ef313ab95868c8be6bb039f (diff) | |
| parent | ce941e6f56803b389c20a52c0a5b89f5ade12b7a (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'src/sound.c')
| -rw-r--r-- | src/sound.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sound.c b/src/sound.c index 16f024858..dba4354df 100644 --- a/src/sound.c +++ b/src/sound.c @@ -19,11 +19,11 @@ EWRAM_DATA struct MusicPlayerInfo* gMPlay_PokemonCry = NULL; EWRAM_DATA u8 gPokemonCryBGMDuckingCounter = 0; // iwram bss -IWRAM_DATA static u16 sCurrentMapMusic; -IWRAM_DATA static u16 sNextMapMusic; -IWRAM_DATA static u8 sMapMusicState; -IWRAM_DATA static u8 sMapMusicFadeInSpeed; -IWRAM_DATA static u16 sFanfareCounter; +static u16 sCurrentMapMusic; +static u16 sNextMapMusic; +static u8 sMapMusicState; +static u8 sMapMusicFadeInSpeed; +static u16 sFanfareCounter; // iwram common bool8 gDisableMusic; |