From 4fa3e8e3fb2eca5c06050669580d33e0bb9cad49 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sat, 29 May 2021 18:29:03 -0500 Subject: [PATCH] Moved .rodata in unknown_005740 from asm to C. --- data/unknown_005740.rodata.s | 234 ----------------------------------- src/unknown_005740.c | 62 ++++++++++ 2 files changed, 62 insertions(+), 234 deletions(-) delete mode 100644 data/unknown_005740.rodata.s diff --git a/data/unknown_005740.rodata.s b/data/unknown_005740.rodata.s deleted file mode 100644 index c54f28c9..00000000 --- a/data/unknown_005740.rodata.s +++ /dev/null @@ -1,234 +0,0 @@ -.include "macros.inc" - -.macro .aligned_text ascii - .asciz "\ascii" - .balign 4 -.endm - -.section .rodata - -glabel D_800E4BF0 -.word 0x461C4000 -.word 0x00000000 - -glabel D_800E4BF8 -.word 0x3FD99999 - -glabel D_800E4BFC -.word 0x9999999A - -glabel D_800E4C00 -.word 0x461C4000 -.word 0x00000000 - -glabel D_800E4C08 -.word 0x3FA99999 - -glabel D_800E4C0C -.word 0x9999999A - -glabel D_800E4C10 -.word 0x3FEE6666 - -glabel D_800E4C14 -.word 0x66666666 - -glabel D_800E4C18 -.word 0x3FC0A3D7 - -glabel D_800E4C1C -.word 0x0A3D70A4 - -glabel D_800E4C20 -.word 0x3FD33333 - -glabel D_800E4C24 -.word 0x33333333 - -glabel D_800E4C28 -.word 0x3F947AE1 - -glabel D_800E4C2C -.word 0x47AE147B - -glabel D_800E4C30 -.word 0x3F847AE1 - -glabel D_800E4C34 -.word 0x47AE147B - -glabel D_800E4C38 -.word 0x3ECCCCCD -.word 0x00000000 - -glabel D_800E4C40 -.word 0x3F747AE1 - -glabel D_800E4C44 -.word 0x47AE147B - -glabel D_800E4C48 -.word 0xBFB99999 - -glabel D_800E4C4C -.word 0x9999999A - -glabel D_800E4C50 -.word 0x3FA99999 - -glabel D_800E4C54 -.word 0x9999999A - -glabel D_800E4C58 -.word 0x3FEE6666 - -glabel D_800E4C5C -.word 0x66666666 - -glabel D_800E4C60 -.word 0x3FD33333 - -glabel D_800E4C64 -.word 0x33333333 - -glabel D_800E4C68 -.word 0x401A36AE - -glabel D_800E4C6C -.word 0x7D566CF4 - -glabel D_800E4C70 -.word 0x40D1B574 - -glabel D_800E4C74 -.word 0x461C4000 - -glabel D_800E4C78 -.word 0x461C4000 -.word 0x00000000 - -glabel D_800E4C80 -.word 0x3FA99999 - -glabel D_800E4C84 -.word 0x9999999A - -glabel D_800E4C88 -.word 0x3FEE6666 - -glabel D_800E4C8C -.word 0x66666666 - -glabel D_800E4C90 -.word 0x401A36AE - -glabel D_800E4C94 -.word 0x7D566CF4 - -glabel D_800E4C98 -.word 0x40D1B574 -.word 0x00000000 - -glabel D_800E4CA0 -.word 0x409B0CEF - -glabel D_800E4CA4 -.word 0xA82E87D3 - -glabel D_800E4CA8 -.word 0x3FE99999 - -glabel D_800E4CAC -.word 0x9999999A - -glabel D_800E4CB0 -.word 0x3F4CCCCD -.word 0x00000000 - -glabel D_800E4CB8 -.word 0xBFE99999 - -glabel D_800E4CBC -.word 0x9999999A - -glabel D_800E4CC0 -.word 0xBF4CCCCD - -glabel D_800E4CC4 -.word 0x4A095440 - -glabel D_800E4CC8 -.word 0x3FA99999 - -glabel D_800E4CCC -.word 0x9999999A - -glabel D_800E4CD0 -.word 0x44BB8000 - -glabel D_800E4CD4 -.word 0x3D4CCCCD - -glabel D_800E4CD8 -.word 0x3FA99999 - -glabel D_800E4CDC -.word 0x9999999A - -glabel D_800E4CE0 -.word 0x4A095440 -.word 0x00000000 - -glabel D_800E4CE8 -.word 0x3FE99999 - -glabel D_800E4CEC -.word 0x9999999A - -glabel D_800E4CF0 -.word 0x44BB8000 - -glabel D_800E4CF4 -.word 0x3D4CCCCD - -glabel D_800E4CF8 -.word 0x3F50624D - -glabel D_800E4CFC -.word 0xD2F1A9FC - -.aligned_text "OUT OF AUDIO POINTS\n" -.aligned_text "amAudioLineAddVertex: Exceeded maximum number of lines (%d)\n" -.aligned_text "amAudioLineAddVertex: Exceeded maximum number of line vertices (%d)\n" -.aligned_text "amReverbLineAddVertex: Exceeded maximum number of lines (%d)\n" -.aligned_text "amReverbLineAddVertex: Exceeded maximum number of line vertices (%d)\n" -.aligned_text "Audio line definition error (less than 2 vertices on line %d)\n" -.aligned_text "Audio line definition error (line=%d, vertex=%d)\n" -.aligned_text "Reverb line definition error (less than 2 vertices on line %d)\n" -.aligned_text "Reverb line definition error (line=%d, vertex=%d)\n" - -glabel D_800E4F10 -.word 0xC7C35000 - -glabel D_800E4F14 -.word 0x497423F0 - -glabel D_800E4F18 -.word 0xC0F86A00 - -glabel D_800E4F1C -.word 0x00000000 - -glabel D_800E4F20 -.word 0xC0F86A00 - -glabel D_800E4F24 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -.aligned_text "Exceeded voice limit of %d (%d)\n" - -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 diff --git a/src/unknown_005740.c b/src/unknown_005740.c index 94aecce3..d9026334 100644 --- a/src/unknown_005740.c +++ b/src/unknown_005740.c @@ -14,6 +14,68 @@ s32 D_800DC6E0 = 0; // Currently unknown, might be a different type. /*******************************/ +/************ .rodata ************/ + +const FloatLiteral D_800E4BF0 = { 10000.0f }; +const DoubleLiteral D_800E4BF8 = { 0.4 }; +const FloatLiteral D_800E4C00 = { 10000.0f }; +const DoubleLiteral D_800E4C08 = { 0.05 }; +const DoubleLiteral D_800E4C10 = { 0.95 }; +const DoubleLiteral D_800E4C18 = { 0.13 }; +const DoubleLiteral D_800E4C20 = { 0.3 }; +const DoubleLiteral D_800E4C28 = { 0.02 }; +const DoubleLiteral D_800E4C30 = { 0.01 }; +const FloatLiteral D_800E4C38 = { 0.4f }; +const DoubleLiteral D_800E4C40 = { 0.005 }; +const DoubleLiteral D_800E4C48 = { -0.1 }; +const DoubleLiteral D_800E4C50 = { 0.05 }; +const DoubleLiteral D_800E4C58 = { 0.95 }; +const DoubleLiteral D_800E4C60 = { 0.3 }; +const DoubleLiteral D_800E4C68 = { 6.5534 }; +const FloatLiteral D_800E4C70 = { 6.5534f }; +const FloatLiteral D_800E4C74 = { 10000.0f }; +const FloatLiteral D_800E4C78 = { 10000.0f }; +const DoubleLiteral D_800E4C80 = { 0.05 }; +const DoubleLiteral D_800E4C88 = { 0.95 }; +const DoubleLiteral D_800E4C90 = { 6.5534 }; +const FloatLiteral D_800E4C98 = { 6.5534f }; +const DoubleLiteral D_800E4CA0 = { 1731.23404 }; +const DoubleLiteral D_800E4CA8 = { 0.8 }; +const FloatLiteral D_800E4CB0 = { 0.8f }; +const DoubleLiteral D_800E4CB8 = { -0.8 }; +const FloatLiteral D_800E4CC0 = { -0.8f }; +const FloatLiteral D_800E4CC4 = { 2250000.0f }; +const DoubleLiteral D_800E4CC8 = { 0.05 }; +const FloatLiteral D_800E4CD0 = { 1500.0f }; +const FloatLiteral D_800E4CD4 = { 0.05f }; +const DoubleLiteral D_800E4CD8 = { 0.05 }; +const FloatLiteral D_800E4CE0 = { 2250000.0f }; +const DoubleLiteral D_800E4CE8 = { 0.8 }; +const FloatLiteral D_800E4CF0 = { 1500.0f }; +const FloatLiteral D_800E4CF4 = { 0.05f }; +const DoubleLiteral D_800E4CF8 = { 0.001 }; + +const char D_800E4D00[] = "OUT OF AUDIO POINTS\n"; +const char D_800E4D18[] = "amAudioLineAddVertex: Exceeded maximum number of lines (%d)\n"; +const char D_800E4D58[] = "amAudioLineAddVertex: Exceeded maximum number of line vertices (%d)\n"; +const char D_800E4DA0[] = "amReverbLineAddVertex: Exceeded maximum number of lines (%d)\n"; +const char D_800E4DE0[] = "amReverbLineAddVertex: Exceeded maximum number of line vertices (%d)\n"; +const char D_800E4E28[] = "Audio line definition error (less than 2 vertices on line %d)\n"; +const char D_800E4E68[] = "Audio line definition error (line=%d, vertex=%d)\n"; +const char D_800E4E9C[] = "Reverb line definition error (less than 2 vertices on line %d)\n"; +const char D_800E4EDC[] = "Reverb line definition error (line=%d, vertex=%d)\n"; + +const FloatLiteral D_800E4F10 = { -100000.0f }; +const FloatLiteral D_800E4F14 = { 999999.0f }; +const DoubleLiteral D_800E4F18 = { -100000.0 }; +const DoubleLiteral D_800E4F20 = { -100000.0 }; + +const u32 filePadding[2] = { 0, 0 }; // unknown_005740 needs to be split. + +const char D_800E4F30[] = "Exceeded voice limit of %d (%d)\n"; + +/*******************************/ + /************ .bss ************/ extern s8 D_8011AC18;