diff --git a/data/unknown_0CA9A0.rodata.s b/data/unknown_0CA9A0.rodata.s deleted file mode 100644 index cee78d89..00000000 --- a/data/unknown_0CA9A0.rodata.s +++ /dev/null @@ -1,73 +0,0 @@ -.include "macros.inc" - -.macro .aligned_text ascii - .asciz "\ascii" - .balign 4 -.endm - -.section .rodata - -glabel D_800E9560 -.aligned_text "samples >= 0" - -glabel D_800E9570 -.aligned_text "env.c" - -glabel D_800E9578 -.aligned_text "samples <= AL_MAX_RSP_SAMPLES" - -glabel D_800E9598 -.aligned_text "env.c" - -glabel D_800E95A0 -.aligned_text "source" - -glabel D_800E95A8 -.aligned_text "env.c" - -glabel D_800E95B0 -.word 0x800CA870 -.word 0x800CA8C4 -.word 0x800CA8C4 -.word 0x800CA8C4 -.word 0x800CA8C4 -.word 0x800CA8C4 -.word 0x800CA8C4 -.word 0x800CA8C4 -.word 0x800CA8C4 -.word 0x800CA8C4 -.word 0x800CA8C4 -.word 0x800CA460 -.word 0x800CA460 -.word 0x800CA22C -.word 0x800CA7A8 -.word 0x800CA828 -.word 0x800CA460 - -.word 0x00000000 - -glabel D_800E95F8 -.word 0x40EFFFE0 - -glabel D_800E95FC -.word 0x00000000 - -glabel D_800E9600 -.word 0x800CC0C0 -.word 0x800CC150 -.word 0x800CC150 -.word 0x800CC0C8 -.word 0x800CC150 -.word 0x800CC150 -.word 0x800CC134 -.word 0x800CC144 -.word 0x800CC104 -.word 0x00000000 - -glabel D_800E9628 -.word 0x3FFFFFD6 -.word 0x0E94EE39 -.word 0x3FFFFEB0 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 diff --git a/data/unknown_0D43F0.rodata.s b/data/unknown_0D43F0.rodata.s deleted file mode 100644 index d60bd507..00000000 --- a/data/unknown_0D43F0.rodata.s +++ /dev/null @@ -1,80 +0,0 @@ -.include "macros.inc" - -.macro .aligned_text ascii - .asciz "\ascii" - .balign 4 -.endm - -.section .rodata - -glabel D_800E96C0 -.word 0x686C4C00 - -glabel D_800E96C4 -.word 0x202B2D23 -.word 0x30000000 - -glabel D_800E96CC -.word 0x00000001 -.word 0x00000002 -.word 0x00000004 -.word 0x00000008 -.word 0x00000010 -.word 0x00000000 - -glabel D_800E96E4 -.word 0x800D3C08 -.word 0x800D3EE8 -.word 0x800D3C08 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3AB8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3910 -.word 0x800D3948 -.word 0x800D3C08 -.word 0x800D3C08 -.word 0x800D3C08 -.word 0x800D3EE8 -.word 0x800D3948 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3D6C -.word 0x800D3AB8 -.word 0x800D3E3C -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3E84 -.word 0x800D3EE8 -.word 0x800D3AB8 -.word 0x800D3EE8 -.word 0x800D3EE8 -.word 0x800D3AB8 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 diff --git a/lib/src/unknown_0CA9A0.c b/lib/src/unknown_0CA9A0.c index 38ba6f31..d92dbe42 100644 --- a/lib/src/unknown_0CA9A0.c +++ b/lib/src/unknown_0CA9A0.c @@ -4,6 +4,38 @@ #include "types.h" #include "macros.h" +/************ .rodata ************/ + +const char D_800E9560[] = "samples >= 0"; +const char D_800E9570[] = "env.c"; +const char D_800E9578[] = "samples <= AL_MAX_RSP_SAMPLES"; +const char D_800E9598[] = "env.c"; +const char D_800E95A0[] = "source"; +const char D_800E95A8[] = "env.c"; + +// Jump table in alEnvMixerPull +const u32 D_800E95B0[] = { + 0x800CA870, 0x800CA8C4, 0x800CA8C4, 0x800CA8C4, + 0x800CA8C4, 0x800CA8C4, 0x800CA8C4, 0x800CA8C4, + 0x800CA8C4, 0x800CA8C4, 0x800CA8C4, 0x800CA460, + 0x800CA460, 0x800CA22C, 0x800CA7A8, 0x800CA828, + 0x800CA460 +}; + +const DoubleLiteral D_800E95F8 = { 65535.0 }; + +// Jump table in alResampleParam +const u32 D_800E9600[] = { + 0x800CC0C0, 0x800CC150, 0x800CC150, 0x800CC0C8, + 0x800CC150, 0x800CC150, 0x800CC134, 0x800CC144, + 0x800CC104 +}; + +const DoubleLiteral D_800E9628 = { 1.99996 }; +const FloatLiteral D_800E9630 = { 1.99996f }; + +/*********************************/ + GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/alFilterNew.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/alEnvMixerPull.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/alEnvmixerParam.s") diff --git a/lib/src/unknown_0D3020.c b/lib/src/unknown_0D3020.c index 315d60cd..308528dc 100644 --- a/lib/src/unknown_0D3020.c +++ b/lib/src/unknown_0D3020.c @@ -32,6 +32,8 @@ void __osPiRelAccess(void) osSendMesg(&piAccessQueue, NULL, OS_MESG_NOBLOCK); } -// Used with _Litob.s. Please move this later! +// Used with _Litob.s. Please move these later! char D_800E4920[20] = "0123456789abcdef"; // lowercase hex digits char D_800E4934[20] = "0123456789ABCDEF"; // uppercase hex digits + + diff --git a/lib/src/unknown_0D43F0.c b/lib/src/unknown_0D43F0.c index 78c8dc8c..7357a8d6 100644 --- a/lib/src/unknown_0D43F0.c +++ b/lib/src/unknown_0D43F0.c @@ -7,10 +7,35 @@ s32 D_800E48A0[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; GLOBAL_ASM("lib/asm/non_matchings/unknown_0D43F0/alCopy.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0D43F0/_Putfld.s") -// Both of these are used in _Printf + char D_800E48C0[36] = " "; char D_800E48E4[32] = "00000000000000000000000000000000"; +/************ .rodata ************/ + +const char D_800E96C0[] = "hlL"; +const char D_800E96C4[] = " +-#0"; +const int D_800E96CC[] = { 1, 2, 4, 8, 16, 0 }; + +// Jump table in _Putfld +const u32 D_800E96E4[] = { + 0x800D3C08, 0x800D3EE8, 0x800D3C08, 0x800D3EE8, + 0x800D3EE8, 0x800D3EE8, 0x800D3EE8, 0x800D3EE8, + 0x800D3EE8, 0x800D3EE8, 0x800D3EE8, 0x800D3EE8, + 0x800D3EE8, 0x800D3EE8, 0x800D3EE8, 0x800D3EE8, + 0x800D3EE8, 0x800D3EE8, 0x800D3EE8, 0x800D3AB8, + 0x800D3EE8, 0x800D3EE8, 0x800D3EE8, 0x800D3EE8, + 0x800D3EE8, 0x800D3EE8, 0x800D3EE8, 0x800D3EE8, + 0x800D3EE8, 0x800D3EE8, 0x800D3910, 0x800D3948, + 0x800D3C08, 0x800D3C08, 0x800D3C08, 0x800D3EE8, + 0x800D3948, 0x800D3EE8, 0x800D3EE8, 0x800D3EE8, + 0x800D3EE8, 0x800D3D6C, 0x800D3AB8, 0x800D3E3C, + 0x800D3EE8, 0x800D3EE8, 0x800D3E84, 0x800D3EE8, + 0x800D3AB8, 0x800D3EE8, 0x800D3EE8, 0x800D3AB8 +}; + +/*********************************/ + +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D43F0/_Putfld.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0D43F0/_Printf.s") \ No newline at end of file