diff --git a/asm/non_matchings/unknown_001050/func_800015F8.s b/asm/non_matchings/unknown_001050/func_800015F8.s index b2760604..ed4b0ed9 100644 --- a/asm/non_matchings/unknown_001050/func_800015F8.s +++ b/asm/non_matchings/unknown_001050/func_800015F8.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_800E49E0 +.float 46875.0 +glabel D_800E49E4 +.float 46875.0 +glabel D_800E49E8 +.float 120000.0 + +.text glabel func_800015F8 /* 0021F8 800015F8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0021FC 800015FC AFBF0014 */ sw $ra, 0x14($sp) diff --git a/include/types.h b/include/types.h index a6ff2f94..04b872e3 100644 --- a/include/types.h +++ b/include/types.h @@ -39,12 +39,4 @@ typedef s32 ptrdiff_t; //#include //#endif -// Temporary until all the appropriate functions are decompiled. -typedef struct FloatLiteral { - float floatLiteral; -} FloatLiteral; -typedef struct DoubleLiteral { - double doubleLiteral; -} DoubleLiteral; - #endif diff --git a/src/unknown_001050.c b/src/unknown_001050.c index af6dcb31..6c4e397e 100644 --- a/src/unknown_001050.c +++ b/src/unknown_001050.c @@ -43,11 +43,6 @@ 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 ************/ @@ -549,7 +544,7 @@ void func_800014BC(f32 arg0) { void musicSetTempo(s32 tempo){ if(tempo != 0){ f32 inv_tempo = (1.0f/tempo); - alCSPSetTempo(gMusicPlayer,(s32)(inv_tempo*D_800E49DC.floatLiteral)); + alCSPSetTempo(gMusicPlayer,(s32)(inv_tempo * 60000000.0f)); D_80115D30 = tempo; } } diff --git a/src/unknown_080500.c b/src/unknown_080500.c index 757c92af..51e3078a 100644 --- a/src/unknown_080500.c +++ b/src/unknown_080500.c @@ -739,8 +739,8 @@ s32 D_800E0968 = 0; s32 D_800E096C = 0; s32 D_800E0970 = 0; s32 D_800E0974 = 0; -const FloatLiteral D_800E7D04 = { 0.5f }; -f32* D_800E0978 = &D_800E7D04; +const f32 D_800E7D04[1] = { 0.5f }; // .rodata +f32* D_800E0978 = D_800E7D04; // .data s32 D_800E097C = 0; s32 D_800E0980 = 0; s32 D_800E0984 = 0; @@ -2174,7 +2174,7 @@ void func_80086A48(s32 arg0) { temp = D_80126BD4; temp2 = D_80126BE4; while (arg0 > 0) { - temp3 = D_800E8414.floatLiteral; + temp3 = 0.1f; if (D_80126A08 > 0) { D_80126BDC = D_80126BDC + temp3 * (temp - D_80126BDC); } diff --git a/src/unknown_0AEE70.c b/src/unknown_0AEE70.c index 13357142..813ec141 100644 --- a/src/unknown_0AEE70.c +++ b/src/unknown_0AEE70.c @@ -8,8 +8,8 @@ const char D_800E87F0[] = "\nMaximum limit of %d lens flare switches, per level, has been exceeded."; -// File Boundary! Not sure where the split occurs. Need to split when that gets figured out. -const DoubleLiteral D_800E8838 = { 0.0 }; +// File Boundary! Not sure where the split occurs though. +const int D_800E8838[2] = { 0, 0 }; const char D_800E8840[] = "\n\nUnknown trigger type in initParticleTrigger %d, Max %d.\n\n"; const char D_800E887C[] = "\n\nUnknown particle type in initParticleTrigger %d, Max %d.\n\n";