diff options
| author | drifloony <drifloony@users.noreply.github.com> | 2017-07-15 18:48:46 -0700 |
|---|---|---|
| committer | drifloony <drifloony@users.noreply.github.com> | 2017-07-20 20:13:02 -0700 |
| commit | e4a72cbff306e805606c3d95e5192e535fcb0ca8 (patch) | |
| tree | 82d387a57efcb1867ce2dc7a73fb277b26d487c7 /src/sound.c | |
| parent | 7d960d219fae9d0a14ef1974c11231f8de55b89c (diff) | |
map out ram variables
Diffstat (limited to 'src/sound.c')
| -rw-r--r-- | src/sound.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/sound.c b/src/sound.c index c9c4916b0..8d23b7d7a 100644 --- a/src/sound.c +++ b/src/sound.c @@ -17,8 +17,9 @@ struct Fanfare u32 SpeciesToCryId(u32); extern u16 gBattleTypeFlags; -extern struct MusicPlayerInfo *gMPlay_PokemonCry; -extern u8 gPokemonCryBGMDuckingCounter; + +static EWRAM_DATA struct MusicPlayerInfo *gMPlay_PokemonCry = NULL; +static EWRAM_DATA u8 gPokemonCryBGMDuckingCounter = 0; static u16 sCurrentMapMusic; static u16 sNextMapMusic; @@ -26,7 +27,8 @@ static u8 sMapMusicState; static u8 sMapMusicFadeInSpeed; static u16 sFanfareCounter; -extern bool8 gDisableMusic; +bool8 gDisableMusic; + extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlay_SE1; extern struct MusicPlayerInfo gMPlay_SE2; |