diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-07-21 17:31:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-21 17:31:28 -0500 |
| commit | 68e47a6fa0b56451223c22dc9a759534c988db5b (patch) | |
| tree | 75ce6402ba5af694c533f2aa1ae7e4b92a63725f /src/sound.c | |
| parent | c1a82f1aabc93e5b3c5f2729f70f4a11fc8a5748 (diff) | |
| parent | 4b3cdd869264ed2705558a7c74d521e2a290a86e (diff) | |
Merge pull request #370 from drifloony/ram_variables
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; |