summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCameron Hall <cameronghall@cox.net>2019-08-01 23:00:58 -0500
committerCameron Hall <cameronghall@cox.net>2019-08-01 23:00:58 -0500
commit840dc3e1c2fee61ded7cbd88e6d8626bd4c14d8b (patch)
tree637fa2eab597e6da11c1fb5c5fd2aef61596ca6d /src
parentc04e14d2fe1bd7ca5b45f2b85db228fc35ad6b4f (diff)
define SoundMainRAM_Buffer
Diffstat (limited to 'src')
-rwxr-xr-xsrc/m4a_2.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/m4a_2.c b/src/m4a_2.c
index 0381b6a..3dd2ffc 100755
--- a/src/m4a_2.c
+++ b/src/m4a_2.c
@@ -1,6 +1,6 @@
#include "gba/m4a_internal.h"
-// #define BSS_CODE __attribute__((section(".bss.code")))
+#define BSS_CODE __attribute__((section(".bss.code")))
asm(".set gScaleTable, 0x0852D928"); // TODO:
asm(".set gFreqTable, 0x0852D9DC"); // TODO:
@@ -14,7 +14,8 @@ asm(".set gCgbScaleTable, 0x0852DA24"); // TODO:
asm(".set gCgbFreqTable, 0x0852DAA8"); // TODO:
asm(".set gNumMusicPlayers, 0x4"); // TODO:
-extern char SoundMainRAM_Buffer[0x800];
+BSS_CODE ALIGNED(4) char SoundMainRAM_Buffer[0x800] = {0};
+
struct SoundInfo gSoundInfo;
struct PokemonCrySong gPokemonCrySongs[MAX_POKEMON_CRIES];
struct MusicPlayerInfo gPokemonCryMusicPlayers[MAX_POKEMON_CRIES];
@@ -27,8 +28,6 @@ struct MusicPlayerInfo gMPlayInfo_SE1;
struct MusicPlayerInfo gMPlayInfo_SE2;
u8 gMPlayMemAccArea[0x10];
-// BSS_CODE ALIGNED(4) char SoundMainRAM_Buffer[0x800] = {0};
-
u32 MidiKeyToFreq(struct WaveData *wav, u8 key, u8 fineAdjust)
{
u32 val1;