diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-12 10:12:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 10:12:37 -0400 |
| commit | 6001e107993d1da69decdf479abf8a661ad57dda (patch) | |
| tree | 9a430f0b70e0a24965378724f1bd28cd1a193dc1 /src/sound.c | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
| parent | 7a562d6bae78fd7c62ed2f804fd8dcc555d85d18 (diff) | |
Merge pull request #321 from PikalaxALT/modern_gcc
Get pokefirered_modern to build
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 ed3f368ad..7f93f7a59 100644 --- a/src/sound.c +++ b/src/sound.c @@ -23,11 +23,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; |