From 12d379c2070902d7db11181a7b933e4aad76cd62 Mon Sep 17 00:00:00 2001
From: David Benepe <benepe96@gmail.com>
Date: Sat, 29 May 2021 22:31:14 -0500
Subject: [PATCH] Moved .rodata in unknown_05F0C0, unknown_0667D0, and
 unknown_0CA530 from asm to C.

---
 data/unknown_05F0C0.rodata.s | 20 --------------------
 data/unknown_0667D0.rodata.s | 14 --------------
 data/unknown_0CA530.rodata.s | 24 ------------------------
 lib/src/unknown_0CA530.c     |  9 +++++++++
 src/unknown_05F0C0.c         |  8 ++++++++
 src/unknown_0667D0.c         |  8 ++++++++
 6 files changed, 25 insertions(+), 58 deletions(-)
 delete mode 100644 data/unknown_05F0C0.rodata.s
 delete mode 100644 data/unknown_0667D0.rodata.s
 delete mode 100644 data/unknown_0CA530.rodata.s

diff --git a/data/unknown_05F0C0.rodata.s b/data/unknown_05F0C0.rodata.s
deleted file mode 100644
index 250d8cd2..00000000
--- a/data/unknown_05F0C0.rodata.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.include "macros.inc"
-
-.macro .aligned_text ascii
-    .asciz "\ascii"
-    .balign 4
-.endm
-
-.section .rodata
-
-glabel D_800E6AA0
-.word 0x3FD33333
-
-glabel D_800E6AA4
-.word 0x33333333
-
-glabel D_800E6AA8
-.word 0x4085E000
-
-glabel D_800E6AAC
-.word 0x00000000
diff --git a/data/unknown_0667D0.rodata.s b/data/unknown_0667D0.rodata.s
deleted file mode 100644
index 53fb67c7..00000000
--- a/data/unknown_0667D0.rodata.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.include "macros.inc"
-
-.macro .aligned_text ascii
-    .asciz "\ascii"
-    .balign 4
-.endm
-
-.section .rodata
-
-glabel D_800E6ED0
-.aligned_text "WARNING: Stack overflow/underflow!!!\n"
-
-.word 0x00000000
-.word 0x00000000
diff --git a/data/unknown_0CA530.rodata.s b/data/unknown_0CA530.rodata.s
deleted file mode 100644
index 989b95d2..00000000
--- a/data/unknown_0CA530.rodata.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.include "macros.inc"
-
-.macro .aligned_text ascii
-    .asciz "\ascii"
-    .balign 4
-.endm
-
-.section .rodata
-
-glabel D_800E94B0
-.word 0x412E8480
-.word 0x00000000
-
-glabel D_800E94B8
-.word 0x412E8480
-.word 0x00000000
-
-glabel D_800E94C0
-.word 0x3F8012EF
-
-glabel D_800E94C4
-.word 0x3F7FDA28
-.word 0x00000000
-.word 0x00000000
diff --git a/lib/src/unknown_0CA530.c b/lib/src/unknown_0CA530.c
index 0c6bbb03..839d1f1b 100644
--- a/lib/src/unknown_0CA530.c
+++ b/lib/src/unknown_0CA530.c
@@ -4,6 +4,15 @@
 #include "types.h"
 #include "macros.h"
 
+/************ .rodata ************/
+
+const DoubleLiteral D_800E94B0 = { 1000000.0 };
+const DoubleLiteral D_800E94B8 = { 1000000.0 };
+const FloatLiteral D_800E94C0 = { 1.0005778075f };
+const FloatLiteral D_800E94C4 = { 0.999422551f };
+
+/*********************************/
+
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA530/alSynFreeVoice.s")
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA530/alCents2Ratio.s")
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA530/osSetIntMask.s")
diff --git a/src/unknown_05F0C0.c b/src/unknown_05F0C0.c
index 09ce122c..1e3f3db7 100644
--- a/src/unknown_05F0C0.c
+++ b/src/unknown_05F0C0.c
@@ -15,4 +15,12 @@ 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_0667D0.c b/src/unknown_0667D0.c
index bc589714..799b38e4 100644
--- a/src/unknown_0667D0.c
+++ b/src/unknown_0667D0.c
@@ -12,6 +12,14 @@ s16 D_800DD050 = 0;
 
 extern s32* D_80065D98;
 
+/************ .rodata ************/
+
+// In func_80065E30
+const char D_800E6ED0[] = "WARNING: Stack overflow/underflow!!!\n";
+
+/*********************************/
+
+
 /************ .bss ************/
 
 extern s32* D_8011D750;