diff options
| author | U-Maria-PC\Maria <throwawaygolem@gmail.com> | 2017-07-29 11:35:23 -0400 |
|---|---|---|
| committer | U-Maria-PC\Maria <throwawaygolem@gmail.com> | 2017-07-29 11:35:23 -0400 |
| commit | e92408af0133974a769215a83500c965f8524724 (patch) | |
| tree | 9f1556b72ebb1a9f1b7f288ba4b8d23471a46608 /src/sound.c | |
| parent | a9da4340a3c91553d19afdcd07355c53d5157a3e (diff) | |
| parent | 8b39cdac9adb52a6e6abd03314056ee5d6003a1b (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
`:Q
B
A
B:`
r
A
r
D
D
C
D
D
r
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; |