From 5d694edb18554468368be49944b9c5dc6865dd9e Mon Sep 17 00:00:00 2001 From: PokeCodec <67983839+PokeCodec@users.noreply.github.com> Date: Sat, 5 Sep 2020 17:31:10 -0400 Subject: [PATCH] Specify array size: 12 semitones --- src/m4a_1.s | 2 +- src/m4a_tables.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/m4a_1.s b/src/m4a_1.s index 290404ad0..ef6cb0ffd 100644 --- a/src/m4a_1.s +++ b/src/m4a_1.s @@ -20,7 +20,7 @@ __umul3232H32: thumb_func_start SoundMain SoundMain: ldr r0, lt_SOUND_INFO_PTR - ldr r0, [r0] + ldr r0, [r0] @ Set the SoundInfo pointer to sound area ldr r2, lt_ID_NUMBER ldr r3, [r0, #o_SoundInfo_ident] cmp r2, r3 diff --git a/src/m4a_tables.c b/src/m4a_tables.c index 9a4ea32e6..dfd285b1f 100644 --- a/src/m4a_tables.c +++ b/src/m4a_tables.c @@ -83,7 +83,7 @@ const u8 gScaleTable[] = 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, }; -const u32 gFreqTable[] = +const u32 gFreqTable[12] = { 2147483648u, 2275179671u, @@ -99,7 +99,7 @@ const u32 gFreqTable[] = 4053909305u, }; -const u16 gPcmSamplesPerVBlankTable[] = +const u16 gPcmSamplesPerVBlankTable[12] = { 96, 132, @@ -130,7 +130,7 @@ const u8 gCgbScaleTable[] = 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, }; -const s16 gCgbFreqTable[] = +const s16 gCgbFreqTable[12] = { -2004, -1891,