diff options
| author | garak <garakmon@gmail.com> | 2019-07-20 12:30:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-20 12:30:41 -0400 |
| commit | c39d25ff4d3cf6cb8b3a6fea208de0cc3c6a7c8c (patch) | |
| tree | bce0030d8901a6b84e705baca169989fff1a4f71 /src/sound.c | |
| parent | dfa3e079c0f55565fc60a6a1ba0ef04de9be94c2 (diff) | |
| parent | 4d5c1ca03b4e7db3c44c71afaa01b1549a282a19 (diff) | |
Merge branch 'master' into navdata
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; |