From c5018c62cae9ff60250dc585cf51ff27f3cae581 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sat, 5 Jun 2021 17:16:50 -0500 Subject: [PATCH] Moved rodata from C to GLOBAL_ASM in unknown_05CEF0, _05F0C0, _065D30, and _072E50 --- asm/non_matchings/unknown_05CEF0/func_8005C364.s | 11 +++++++++++ asm/non_matchings/unknown_05F0C0/func_8005E4C0.s | 7 +++++++ .../unknown_065D30/__timeToSamplesNoRound.s | 5 +++++ asm/non_matchings/unknown_072E50/func_80072578.s | 5 +++++ asm/non_matchings/unknown_072E50/func_80072718.s | 7 +++++++ asm/non_matchings/unknown_072E50/func_80074EB8.s | 6 ++++++ asm/non_matchings/unknown_072E50/func_80075000.s | 9 +++++++++ asm/non_matchings/unknown_072E50/func_800753D8.s | 9 +++++++++ asm/non_matchings/unknown_072E50/func_800756D4.s | 6 ++++++ src/unknown_05CEF0.c | 9 --------- src/unknown_05F0C0.c | 8 -------- src/unknown_065D30.c | 7 ------- src/unknown_072E50.c | 10 ---------- 13 files changed, 65 insertions(+), 34 deletions(-) diff --git a/asm/non_matchings/unknown_05CEF0/func_8005C364.s b/asm/non_matchings/unknown_05CEF0/func_8005C364.s index 246d154c..7d3bd883 100644 --- a/asm/non_matchings/unknown_05CEF0/func_8005C364.s +++ b/asm/non_matchings/unknown_05CEF0/func_8005C364.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_800E6A10 +.double 0.3 +glabel D_800E6A18 +.double -0.1 +glabel D_800E6A20 +.double 0.1 +glabel D_800E6A28 +.double 700.0 + +.text glabel func_8005C364 /* 05CF64 8005C364 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 05CF68 8005C368 AFA40058 */ sw $a0, 0x58($sp) diff --git a/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s b/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s index ea9a0676..19701edb 100644 --- a/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s +++ b/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_800E6AA0 +.double 0.3 +glabel D_800E6AA8 +.double 700.0 + +.text glabel func_8005E4C0 /* 05F0C0 8005E4C0 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 05F0C4 8005E4C4 AFA40058 */ sw $a0, 0x58($sp) diff --git a/asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s b/asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s index bf5dba42..c59c988d 100644 --- a/asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s +++ b/asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_800E6EC0 +.double 1000000.0 + +.text glabel __timeToSamplesNoRound /* 066354 80065754 8C8E0044 */ lw $t6, 0x44($a0) /* 066358 80065758 44852000 */ mtc1 $a1, $f4 diff --git a/asm/non_matchings/unknown_072E50/func_80072578.s b/asm/non_matchings/unknown_072E50/func_80072578.s index 463e240b..2e2f24f5 100644 --- a/asm/non_matchings/unknown_072E50/func_80072578.s +++ b/asm/non_matchings/unknown_072E50/func_80072578.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_800E77E0 +.double 0.1 + +.text glabel func_80072578 /* 073178 80072578 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 07317C 8007257C 3C198012 */ lui $t9, %hi(D_801241E4) # $t9, 0x8012 diff --git a/asm/non_matchings/unknown_072E50/func_80072718.s b/asm/non_matchings/unknown_072E50/func_80072718.s index c65125f9..3a54a123 100644 --- a/asm/non_matchings/unknown_072E50/func_80072718.s +++ b/asm/non_matchings/unknown_072E50/func_80072718.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_800E77E8 +.double 3.6 +glabel D_800E77F0 +.double 490.0 + +.text glabel func_80072718 /* 073318 80072718 27BDFF88 */ addiu $sp, $sp, -0x78 /* 07331C 8007271C AFBE0048 */ sw $fp, 0x48($sp) diff --git a/asm/non_matchings/unknown_072E50/func_80074EB8.s b/asm/non_matchings/unknown_072E50/func_80074EB8.s index 3dd1f1ae..a6e39c7c 100644 --- a/asm/non_matchings/unknown_072E50/func_80074EB8.s +++ b/asm/non_matchings/unknown_072E50/func_80074EB8.s @@ -1,3 +1,9 @@ +.rdata +glabel D_800E7768 +.asciz "DKRACING-GHOSTS\0" +.ascii "\0\0\0" # padding + +.text glabel func_80074EB8 /* 075AB8 80074EB8 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 075ABC 80074EBC AFA60048 */ sw $a2, 0x48($sp) diff --git a/asm/non_matchings/unknown_072E50/func_80075000.s b/asm/non_matchings/unknown_072E50/func_80075000.s index af6d8596..d1da6c0b 100644 --- a/asm/non_matchings/unknown_072E50/func_80075000.s +++ b/asm/non_matchings/unknown_072E50/func_80075000.s @@ -1,3 +1,12 @@ +.rdata +glabel D_800E777C +.asciz "DKRACING-GHOSTS\0" +.ascii "\0\0\0" # padding +glabel D_800E7790 +.asciz "DKRACING-GHOSTS\0" +.ascii "\0\0\0" # padding + +.text glabel func_80075000 /* 075C00 80075000 27BDFF88 */ addiu $sp, $sp, -0x78 /* 075C04 80075004 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/non_matchings/unknown_072E50/func_800753D8.s b/asm/non_matchings/unknown_072E50/func_800753D8.s index d38c03fe..d6639ec9 100644 --- a/asm/non_matchings/unknown_072E50/func_800753D8.s +++ b/asm/non_matchings/unknown_072E50/func_800753D8.s @@ -1,3 +1,12 @@ +.rdata +glabel D_800E77A4 +.asciz "DKRACING-GHOSTS\0" +.ascii "\0\0\0" # padding +glabel D_800E77B8 +.asciz "DKRACING-GHOSTS\0" +.ascii "\0\0\0" # padding + +.text glabel func_800753D8 /* 075FD8 800753D8 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 075FDC 800753DC AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/unknown_072E50/func_800756D4.s b/asm/non_matchings/unknown_072E50/func_800756D4.s index b464ae60..48ce3b2f 100644 --- a/asm/non_matchings/unknown_072E50/func_800756D4.s +++ b/asm/non_matchings/unknown_072E50/func_800756D4.s @@ -1,3 +1,9 @@ +.rdata +glabel D_800E77CC +.asciz "DKRACING-GHOSTS\0" +.ascii "\0\0\0" # padding + +.text glabel func_800756D4 /* 0762D4 800756D4 27BDFF90 */ addiu $sp, $sp, -0x70 /* 0762D8 800756D8 AFBF003C */ sw $ra, 0x3c($sp) diff --git a/src/unknown_05CEF0.c b/src/unknown_05CEF0.c index 71f76806..d9f998b9 100644 --- a/src/unknown_05CEF0.c +++ b/src/unknown_05CEF0.c @@ -15,15 +15,6 @@ s16 D_800DCDE0[16] = { /*******************************/ -/************ .rodata ************/ - -const DoubleLiteral D_800E6A10 = { 0.3 }; -const DoubleLiteral D_800E6A18 = { -0.1 }; -const DoubleLiteral D_800E6A20 = { 0.1 }; -const DoubleLiteral D_800E6A28 = { 700.0 }; - -/*********************************/ - GLOBAL_ASM("asm/non_matchings/unknown_05CEF0/func_8005C2F0.s") GLOBAL_ASM("asm/non_matchings/unknown_05CEF0/func_8005C364.s") GLOBAL_ASM("asm/non_matchings/unknown_05CEF0/func_8005CA78.s") diff --git a/src/unknown_05F0C0.c b/src/unknown_05F0C0.c index 1e3f3db7..09ce122c 100644 --- a/src/unknown_05F0C0.c +++ b/src/unknown_05F0C0.c @@ -15,12 +15,4 @@ s16 D_800DCE40[16] = { /*******************************/ -/************ .rodata ************/ - -// In func_8005E4C0 -const DoubleLiteral D_800E6AA0 = { 0.3 }; -const DoubleLiteral D_800E6AA8 = { 700.0 }; - -/*********************************/ - GLOBAL_ASM("asm/non_matchings/unknown_05F0C0/func_8005E4C0.s") diff --git a/src/unknown_065D30.c b/src/unknown_065D30.c index 2d897500..7d56eca1 100644 --- a/src/unknown_065D30.c +++ b/src/unknown_065D30.c @@ -4,13 +4,6 @@ #include "types.h" #include "macros.h" -/************ .rodata ************/ - -// In __timeToSamplesNoRound -const DoubleLiteral D_800E6EC0 = { 1000000.0 }; - -/*********************************/ - GLOBAL_ASM("asm/non_matchings/unknown_065D30/alSynNew.s") GLOBAL_ASM("asm/non_matchings/unknown_065D30/alAudioFrame.s") GLOBAL_ASM("asm/non_matchings/unknown_065D30/__allocParam.s") diff --git a/src/unknown_072E50.c b/src/unknown_072E50.c index 585fced0..693f5141 100644 --- a/src/unknown_072E50.c +++ b/src/unknown_072E50.c @@ -47,16 +47,6 @@ const char D_800E7728[] = "WARNING : No Eprom\n"; const char D_800E773C[] = "DKRACING-GHOSTS\0"; const char D_800E7750[] = "warning: corrupt ghost\n"; -const char D_800E7768[] = "DKRACING-GHOSTS\0"; -const char D_800E777C[] = "DKRACING-GHOSTS\0"; -const char D_800E7790[] = "DKRACING-GHOSTS\0"; -const char D_800E77A4[] = "DKRACING-GHOSTS\0"; -const char D_800E77B8[] = "DKRACING-GHOSTS\0"; -const char D_800E77CC[] = "DKRACING-GHOSTS\0"; - -const DoubleLiteral D_800E77E0 = { 0.1 }; -const DoubleLiteral D_800E77E8 = { 3.6 }; -const DoubleLiteral D_800E77F0 = { 490.0 }; /*********************************/