izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'DavidSM64:master' into glabels

Browse Source
This commit is contained in:
AntonioCastelli
2021-05-30 15:42:51 -07:00
parent e4707e4598 0d68d845bf
commit 512c9d883f
9 changed files with 169 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/unknown_001050.c
+12 -8
View File
@@ -38,14 +38,21 @@ u8 D_800DC670 = 0;
/************ .rodata ************/
extern f32 D_800E49DC;
extern f32 D_800E49EC;
extern u8 D_800EBF60;
// 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";
const FloatLiteral D_800E49DC = { 60000000.0f };
const FloatLiteral D_800E49E0 = { 46875.0f };
const FloatLiteral D_800E49E4 = { 46875.0f };
const FloatLiteral D_800E49E8 = { 120000.0f };
/*********************************/
/************ .bss ************/
extern u8 D_800EBF60;
extern ALHeap gALHeap;
/* Unknown size */
@@ -539,11 +546,10 @@ void func_800014BC(f32 arg0) {
musicSetTempo((s32)((f32)(u32)(musicGetTempo() & 0xFF) * arg0));
}
void musicSetTempo(s32 tempo){
if(tempo != 0){
f32 inv_tempo = (1.0f/tempo);
alCSPSetTempo(gMusicPlayer,(s32)(inv_tempo*D_800E49DC));
alCSPSetTempo(gMusicPlayer,(s32)(inv_tempo*D_800E49DC.floatLiteral));
D_80115D30 = tempo;
}
}
@@ -557,8 +563,6 @@ u8 musicIsPlaying(void) {
}
extern f32 D_800E49E0;
extern f32 D_800E49E8;
extern f32 D_80115D34;
#if 1
@@ -617,7 +621,7 @@ void func_80001784(u8 a0){
void sfxSetTempo(s32 tempo){
f32 inv_tempo = (1.0f/tempo);
alCSPSetTempo(gSndFxPlayer,(s32)(inv_tempo*D_800E49EC));
alCSPSetTempo(gSndFxPlayer,(s32)(inv_tempo * 60000000.0f));
}
src/unknown_003260.c
+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;