From 3342fdafc2f51825e7b05ae48aed3663eefc5f48 Mon Sep 17 00:00:00 2001 From: Kurausukun Date: Sat, 10 Feb 2024 05:32:03 -0500 Subject: [PATCH 1/2] add missing constant --- src/pokedex_cry_screen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c index 2c352c67a0..437ef8cf5a 100644 --- a/src/pokedex_cry_screen.c +++ b/src/pokedex_cry_screen.c @@ -362,7 +362,7 @@ static void BufferCryWaveformSegment(void) else baseBuffer = gSoundInfo.pcmBuffer + (gSoundInfo.pcmDmaPeriod + 1 - gPcmDmaCounter) * gSoundInfo.pcmSamplesPerVBlank; - buffer = baseBuffer + 0x630; + buffer = baseBuffer + PCM_DMA_BUF_SIZE; for (i = 0; i < ARRAY_COUNT(sDexCryScreen->cryWaveformBuffer); i++) sDexCryScreen->cryWaveformBuffer[i] = buffer[i * 2] * 2; } From 7da5cb421ecd65d5b607158feebde53728e1171c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 6 Mar 2024 16:13:06 +0100 Subject: [PATCH 2/2] Make sure gHeap is always aligned --- gflib/malloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gflib/malloc.c b/gflib/malloc.c index 829877d892..8573611bb9 100644 --- a/gflib/malloc.c +++ b/gflib/malloc.c @@ -4,7 +4,7 @@ static void *sHeapStart; static u32 sHeapSize; -EWRAM_DATA u8 gHeap[HEAP_SIZE] = {0}; +ALIGNED(4) EWRAM_DATA u8 gHeap[HEAP_SIZE] = {0}; #define MALLOC_SYSTEM_ID 0xA3A3