From 9eecfad9022b52c2ef78d15165a89394fa5eb113 Mon Sep 17 00:00:00 2001
From: David Benepe <benepe96@gmail.com>
Date: Sun, 30 May 2021 16:11:43 -0500
Subject: [PATCH] Moved .rodata in unknown_064830 from asm to C.

---
 data/unknown_064830.rodata.s | 40 ------------------------------------
 src/unknown_064830.c         | 25 +++++++++++++++++++++-
 2 files changed, 24 insertions(+), 41 deletions(-)
 delete mode 100644 data/unknown_064830.rodata.s

diff --git a/data/unknown_064830.rodata.s b/data/unknown_064830.rodata.s
deleted file mode 100644
index 21f4a364..00000000
--- a/data/unknown_064830.rodata.s
+++ /dev/null
@@ -1,40 +0,0 @@
-.include "macros.inc"
-
-.macro .aligned_text ascii
-    .asciz "\ascii"
-    .balign 4
-.endm
-
-.section .rodata
-
-glabel D_800E6E70
-.word 0x80063FE8
-.word 0x8006401C
-.word 0x8006407C
-.word 0x80064050
-.word 0x800640A8
-.word 0x800640D4
-.word 0x80064144
-.word 0x800641C4
-
-glabel D_800E6E90
-.word 0x4105221B
-
-glabel D_800E6E94
-.word 0x3D3FB61B
-.word 0x00000000
-.word 0x00000000
-
-glabel D_800E6EA0
-.word 0x80064AD8
-.word 0x80064AE4
-.word 0x80064AFC
-.word 0x80064B08
-.word 0x80064AF0
-.word 0x80064B14
-
-glabel D_800E6EB8
-.word 0x4105221B
-
-glabel D_800E6EBC
-.word 0x3D3FB61B
diff --git a/src/unknown_064830.c b/src/unknown_064830.c
index fe1d2ab4..c8101ab5 100644
--- a/src/unknown_064830.c
+++ b/src/unknown_064830.c
@@ -87,9 +87,32 @@ s32 D_800DD028[10] = {
     0x00000000, 0x00000000
 };
 
-
 /*******************************/
 
+/************ .rodata ************/
+
+// Jump table in alFxParamHdl
+const u32 D_800E6E70[] = {
+    0x80063FE8, 0x8006401C, 0x8006407C, 0x80064050, 
+    0x800640A8, 0x800640D4, 0x80064144, 0x800641C4
+};
+
+const FloatLiteral D_800E6E90 = { 8.320827f };
+const FloatLiteral D_800E6E94 = { 0.04680453f };
+
+const DoubleLiteral D_800E6E98 = { 0.0f }; // Probably a file boundary.
+
+// Jump table in alFxNew
+const u32 D_800E6EA0[] = {
+    0x80064AD8, 0x80064AE4, 0x80064AFC, 0x80064B08, 
+    0x80064AF0, 0x80064B14
+};
+
+const FloatLiteral D_800E6EB8 = { 8.320827f };
+const FloatLiteral D_800E6EBC = { 0.04680453f };
+
+/*********************************/
+
 extern s32 alAuxBusPull;
 extern s32 alAuxBusParam;
 extern s32 alEnvMixerPull;