dun

pmret · Sep 12, 2024 · 3fb322b · 3fb322b
1 parent 0ba75da
commit 3fb322b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
diff --git a/src/heaps.c b/src/heaps.c
@@ -8,7 +8,7 @@ typedef TlbEntry TlbMappablePage[15];
 BSS TlbMappablePage D_80197000 ALIGNED(0x1000);
 BSS u8 D_801A6000[0x1000] ALIGNED(0x1000);
 BSS u8 BattleEntityHeapBottom[0x3000] ALIGNED(0x1000);
-BSS u8 AuHeapBase[AUDIO_HEAP_SIZE];
+BSS u8 AuHeapBase[AUDIO_HEAP_SIZE] ALIGNED(0x1000);
 BSS u8 D_80200000[0x4000] ALIGNED(0x1000);
 BSS u8 D_80204000[0x3000] ALIGNED(0x1000);
 BSS u8 D_80207000[0x3000] ALIGNED(0x1000);

diff --git a/src/msg.c b/src/msg.c
@@ -632,8 +632,8 @@ void msg_play_speech_sound(MessagePrintState* printer, u8 character) {
 
 extern s32 gItemIconRasterOffsets[];
 extern s32 gItemIconPaletteOffsets[];
-extern u8* MsgLetterRasterOffsets[];
-extern u16* MsgLetterPaletteOffsets[];
+extern IMG_PTR MsgLetterRasterOffsets[];
+extern PAL_PTR MsgLetterPaletteOffsets[];
 extern MsgVoice MsgVoices[];
 
 #if VERSION_PAL

diff --git a/src/msg_data.c b/src/msg_data.c
@@ -875,7 +875,7 @@ MessageCharset* MsgCharsets[] = {
     NULL
 };
 
-u8* MsgLetterRasterOffsets[] = {
+IMG_PTR MsgLetterRasterOffsets[] = {
     charset_letter_content_1_OFFSET,
     charset_letter_content_2_OFFSET,
     charset_letter_content_3_OFFSET,
@@ -890,7 +890,7 @@ u8* MsgLetterRasterOffsets[] = {
     charset_letter_content_12_OFFSET,
 };
 
-u16* MsgLetterPaletteOffsets[] = {
+PAL_PTR MsgLetterPaletteOffsets[] = {
     charset_letter_content_1_pal_OFFSET,
     charset_letter_content_2_pal_OFFSET,
     charset_letter_content_3_pal_OFFSET,

diff --git a/src/world/area_kmr/kmr_20/documents.c b/src/world/area_kmr/kmr_20/documents.c
@@ -99,20 +99,21 @@ s32 N(LetterBodyStringIDs)[] = {
     MSG_Document_Letter_Mario12_Body,
 };
 
-u8* N(LetterDmaOffsets)[] = {
-    charset_postcard_OFFSET, (u8*) charset_postcard_pal_OFFSET,
-    charset_letter_content_1_OFFSET, (u8*) charset_letter_content_1_pal_OFFSET,
-    charset_letter_content_2_OFFSET, (u8*) charset_letter_content_2_pal_OFFSET,
-    charset_letter_content_3_OFFSET, (u8*) charset_letter_content_3_pal_OFFSET,
-    charset_letter_content_4_OFFSET, (u8*) charset_letter_content_4_pal_OFFSET,
-    charset_letter_content_5_OFFSET, (u8*) charset_letter_content_5_pal_OFFSET,
-    charset_letter_content_6_OFFSET, (u8*) charset_letter_content_6_pal_OFFSET,
-    charset_letter_content_7_OFFSET, (u8*) charset_letter_content_7_pal_OFFSET,
-    charset_letter_content_8_OFFSET, (u8*) charset_letter_content_8_pal_OFFSET,
-    charset_letter_content_9_OFFSET, (u8*) charset_letter_content_9_pal_OFFSET,
-    charset_letter_content_10_OFFSET, (u8*) charset_letter_content_10_pal_OFFSET,
-    charset_letter_content_11_OFFSET, (u8*) charset_letter_content_11_pal_OFFSET,
-    charset_letter_content_12_OFFSET, (u8*) charset_letter_content_12_pal_OFFSET,
+// TODO mix of image / palette pointers
+IMG_PTR N(LetterDmaOffsets)[] = {
+    charset_postcard_OFFSET, (IMG_PTR) charset_postcard_pal_OFFSET,
+    charset_letter_content_1_OFFSET, (IMG_PTR) charset_letter_content_1_pal_OFFSET,
+    charset_letter_content_2_OFFSET, (IMG_PTR) charset_letter_content_2_pal_OFFSET,
+    charset_letter_content_3_OFFSET, (IMG_PTR) charset_letter_content_3_pal_OFFSET,
+    charset_letter_content_4_OFFSET, (IMG_PTR) charset_letter_content_4_pal_OFFSET,
+    charset_letter_content_5_OFFSET, (IMG_PTR) charset_letter_content_5_pal_OFFSET,
+    charset_letter_content_6_OFFSET, (IMG_PTR) charset_letter_content_6_pal_OFFSET,
+    charset_letter_content_7_OFFSET, (IMG_PTR) charset_letter_content_7_pal_OFFSET,
+    charset_letter_content_8_OFFSET, (IMG_PTR) charset_letter_content_8_pal_OFFSET,
+    charset_letter_content_9_OFFSET, (IMG_PTR) charset_letter_content_9_pal_OFFSET,
+    charset_letter_content_10_OFFSET, (IMG_PTR) charset_letter_content_10_pal_OFFSET,
+    charset_letter_content_11_OFFSET, (IMG_PTR) charset_letter_content_11_pal_OFFSET,
+    charset_letter_content_12_OFFSET, (IMG_PTR) charset_letter_content_12_pal_OFFSET,
 };
 
 API_CALLABLE(N(InitLetters)){