diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-02 17:32:34 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-02 17:32:34 +0200 |
| commit | 7ecdcc5ed89f7643f3845fea6ac668acbd1353d4 (patch) | |
| tree | d06a511545adfe1f1acd6a776f2689bde1c13cb6 /src | |
| parent | 591837e3c33837e72dd1282d59159999ba344ac3 (diff) | |
iwram and ewram vars to C
Diffstat (limited to 'src')
| -rw-r--r-- | src/sound.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/src/sound.c b/src/sound.c index 7b94a8027..a95511ece 100644 --- a/src/sound.c +++ b/src/sound.c @@ -8,40 +8,39 @@ #include "songs.h" #include "task.h" -extern u16 SpeciesToCryId(u16); - struct Fanfare { u16 songNum; u16 duration; }; -extern u32 gBattleTypeFlags; +// ewram +EWRAM_DATA struct MusicPlayerInfo* gMPlay_PokemonCry = NULL; +EWRAM_DATA u8 gPokemonCryBGMDuckingCounter = 0; -extern struct MusicPlayerInfo *gMPlay_PokemonCry; -extern u8 gPokemonCryBGMDuckingCounter; +// 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; -extern u16 sCurrentMapMusic; -extern u16 sNextMapMusic; -extern u8 sMapMusicState; -extern u8 sMapMusicFadeInSpeed; -extern u16 sFanfareCounter; - -extern bool8 gDisableMusic; +// iwram common +bool8 gDisableMusic; +extern u32 gBattleTypeFlags; extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlay_SE1; extern struct MusicPlayerInfo gMPlay_SE2; extern struct MusicPlayerInfo gMPlay_SE3; - extern struct ToneData gCryTable[]; extern struct ToneData gCryTable2[]; - extern const struct Fanfare sFanfares[]; +extern u16 SpeciesToCryId(u16); + static void Task_Fanfare(u8 taskId); static void CreateFanfareTask(void); -void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode); static void Task_DuckBGMForPokemonCry(u8 taskId); static void RestoreBGMVolumeAfterPokemonCry(void); |