Moved .rodata in unknown_003260 from asm to C.

This commit is contained in:
David Benepe
2021-05-29 16:51:57 -05:00
parent d1c9ed7580
commit cbe0160136
4 changed files with 29 additions and 41 deletions
-40
View File
@@ -1,40 +0,0 @@
.include "macros.inc"
.macro .aligned_text ascii
.asciz "\ascii"
.balign 4
.endm
.section .rodata
.aligned_text "audio manager: RCP audio interface bug caused DMA from bad address - move audiomgr.c in the makelist!\n"
.aligned_text "audio: ai out of samples\n"
.aligned_text "OH DEAR - No audio DMA buffers left\n"
.aligned_text "Dma not done\n"
.word 0x00000000
.aligned_text "Bad soundState: voices =%d, states free =%d, states busy =%d, type %d data %x\n"
.aligned_text "playing a playing sound\n"
.aligned_text "Nonsense sndp event\n"
.aligned_text "Sound state allocate failed - sndId %d\n"
.aligned_text "Don't worry - game should cope OK\n"
.aligned_text "WARNING: Attempt to stop NULL sound aborted\n"
glabel D_800E4BB0
.word 0x800035C4
.word 0x80003A0C
.word 0x80004090
.word 0x80003B2C
.word 0x80004090
.word 0x80004090
.word 0x80004090
.word 0x80003C8C
.word 0x80004090
.word 0x80004090
.word 0x80004090
.word 0x80004090
.word 0x80004090
.word 0x80004090
.word 0x80004090
.word 0x80003BA4
+3
View File
@@ -43,5 +43,8 @@ typedef s32 ptrdiff_t;
typedef struct FloatLiteral {
float floatLiteral;
} FloatLiteral;
typedef struct DoubleLiteral {
double doubleLiteral;
} DoubleLiteral;
#endif
+1 -1
View File
@@ -38,7 +38,7 @@ u8 D_800DC670 = 0;
/************ .rodata ************/
// Unused debug strings?
// Debug strings
const char D_800E4950[] = "amSndPlay: Illegal sound effects table index\n";
const char D_800E4980[] = "amSndPlayDirect: Somebody tried to play illegal sound %d\n";
const char D_800E49BC[] = "Invalid midi sequence index\n";
+25
View File
@@ -98,6 +98,31 @@ s32 D_800DC6C4 = 0; // Currently unknown, might be a different type.
/*******************************/
/************ .rodata ************/
// Debug strings
const char D_800E49F0[] = "audio manager: RCP audio interface bug caused DMA from bad address - move audiomgr.c in the makelist!\n";
const char D_800E4A58[] = "audio: ai out of samples\n";
const char D_800E4A74[] = "OH DEAR - No audio DMA buffers left\n";
const char D_800E4A9C[] = "Dma not done\n";
const char D_800E4AAC[] = "";
const char D_800E49B0[] = "Bad soundState: voices =%d, states free =%d, states busy =%d, type %d data %x\n";
const char D_800E4B00[] = "playing a playing sound\n";
const char D_800E4B1C[] = "Nonsense sndp event\n";
const char D_800E4B34[] = "Sound state allocate failed - sndId %d\n";
const char D_800E4B5C[] = "Don't worry - game should cope OK\n";
const char D_800E4B80[] = "WARNING: Attempt to stop NULL sound aborted\n";
// Jump table for _handleEvent
const u32 D_800E4BB0[] = {
0x800035C4, 0x80003A0C, 0x80004090, 0x80003B2C,
0x80004090, 0x80004090, 0x80004090, 0x80003C8C,
0x80004090, 0x80004090, 0x80004090, 0x80004090,
0x80004090, 0x80004090, 0x80004090, 0x80003BA4
};
/*******************************/
/************ .bss ************/
extern s32 D_80115F90;