diff options
| author | YamaArashi <shadow962@live.com> | 2016-05-15 16:43:56 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-05-15 16:43:56 -0700 |
| commit | 147c8672c3be861fa9229c775c37933a39900b9c (patch) | |
| tree | 9b99fe61d63633717fb2682bcf3eb81442824bad /src | |
| parent | 91b1aab02668e4671a01854db28e093d9cacc1c8 (diff) | |
new macros for declaring uninitialized IWRAM data
Diffstat (limited to 'src')
| -rw-r--r-- | src/m4a_2.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/m4a_2.c b/src/m4a_2.c index 56487808c..2056f805a 100644 --- a/src/m4a_2.c +++ b/src/m4a_2.c @@ -4,14 +4,13 @@ BSS_CODE ALIGNED(4) char SoundMainRAM_Buffer[0x800] = {0}; -IWRAM_DATA struct SoundInfo gSoundInfo = {0}; -IWRAM_DATA struct PokemonCrySong gPokemonCrySongs[MAX_POKEMON_CRIES] = {0}; -IWRAM_DATA u8 gUnused_3006FE8[8] = {0}; // padding for alignment -IWRAM_DATA struct MusicPlayerInfo gPokemonCryMusicPlayers[MAX_POKEMON_CRIES] = {0}; -IWRAM_DATA void *gMPlayJumpTable[36] = {0}; -IWRAM_DATA struct CgbChannel gCgbChans[4] = {0}; -IWRAM_DATA struct MusicPlayerTrack gPokemonCryTracks[MAX_POKEMON_CRIES * 2] = {0}; -IWRAM_DATA struct PokemonCrySong gPokemonCrySong = {0}; +COMM_4(struct SoundInfo gSoundInfo) +COMM_4(struct PokemonCrySong gPokemonCrySongs[MAX_POKEMON_CRIES]) +COMM_4(struct MusicPlayerInfo gPokemonCryMusicPlayers[MAX_POKEMON_CRIES]) +COMM_4(void *gMPlayJumpTable[36]) +COMM_4(struct CgbChannel gCgbChans[4]) +COMM_4(struct MusicPlayerTrack gPokemonCryTracks[MAX_POKEMON_CRIES * 2]) +COMM_4(struct PokemonCrySong gPokemonCrySong) u32 MidiKeyToFreq(struct WaveData *wav, u8 key, u8 fineAdjust) { |