From 0ef45251caeda8d8aef83d7dd94de4469f9ea367 Mon Sep 17 00:00:00 2001
From: rjkiv <rjkiv@users.noreply.github.com>
Date: Mon, 25 Sep 2023 15:58:45 -0700
Subject: [PATCH] refactor quazal file names

---
 config/SZBE69/splits.txt                      |  2 +-
 configure.py                                  |  4 +--
 src/quazal/quazal_stuff.hpp                   |  0
 ...al_stuff.cpp => quazal_unk_0x800A515C.cpp} | 32 -------------------
 src/quazal/quazal_unk_0x800A515C.hpp          | 22 +++++++++++++
 src/unknown.hpp                               |  7 ++++
 6 files changed, 32 insertions(+), 35 deletions(-)
 delete mode 100644 src/quazal/quazal_stuff.hpp
 rename src/quazal/{quazal_stuff.cpp => quazal_unk_0x800A515C.cpp} (71%)
 create mode 100644 src/quazal/quazal_unk_0x800A515C.hpp

diff --git a/config/SZBE69/splits.txt b/config/SZBE69/splits.txt
index 44a16e7..13f303c 100644
--- a/config/SZBE69/splits.txt
+++ b/config/SZBE69/splits.txt
@@ -19,7 +19,7 @@ rb3/app.cpp:
 rb3/main.cpp:
 	.text       start:0x8000F96C end:0x8000F9B0
 
-quazal/quazal_stuff.cpp:
+quazal/unk_0x800A515C.cpp:
 	.text       start:0x800A515C end:0x800A5368
 	.data       start:0x8082A5C0 end:0x8082A678
 
diff --git a/configure.py b/configure.py
index 45f4cbb..2440977 100644
--- a/configure.py
+++ b/configure.py
@@ -201,12 +201,12 @@ config.libs = [
         ],
     },
     {
-        "lib": "unknown",
+        "lib": "quazal",
         "mw_version": "Wii/1.3",
         "cflags": cflags_rb3,
         "host": False,
         "objects": [
-            Object(NonMatching, "quazal/quazal_stuff.cpp")
+            Object(NonMatching, "quazal/unk_0x800A515C.cpp")
         ],
     },
     # anything below this line does not need to be decompiled
diff --git a/src/quazal/quazal_stuff.hpp b/src/quazal/quazal_stuff.hpp
deleted file mode 100644
index e69de29..0000000
diff --git a/src/quazal/quazal_stuff.cpp b/src/quazal/quazal_unk_0x800A515C.cpp
similarity index 71%
rename from src/quazal/quazal_stuff.cpp
rename to src/quazal/quazal_unk_0x800A515C.cpp
index 08fb889..79c71ac 100644
--- a/src/quazal/quazal_stuff.cpp
+++ b/src/quazal/quazal_unk_0x800A515C.cpp
@@ -1,26 +1,3 @@
-// ------------------------------------
-// class layouts
-// ------------------------------------
-namespace Quazal {
-    class ProductSpecifics {
-        public:
-            ProductSpecifics();             // aka fn_800A515C
-            virtual ~ProductSpecifics();    // aka fn_800A516C
-            virtual void unk() = 0;         // 0'd in vtable, pure virtual
-            virtual void fn_8076F540();
-            // virtual void fn_8076F540();  // wait, why is this duplicated?
-    };
-
-    class NetZSpecifics : ProductSpecifics {
-        public:
-            NetZSpecifics();                // aka fn_800A5278
-            virtual ~NetZSpecifics();       // aka fn_800A52B4
-            virtual int fn_800A530C();
-            virtual void fn_800A5314();
-            virtual void fn_800A5338();
-    };
-}
-
 // ------------------------------------
 // fn_800A515C
 // ------------------------------------
@@ -90,7 +67,6 @@ Quazal::NetZSpecifics::~NetZSpecifics() {}
 // // ------------------------------------
 // // fn_800A530C
 // // ------------------------------------
-
 int Quazal::NetZSpecifics::fn_800A530C() {
     return 1;
 }
@@ -98,10 +74,6 @@ int Quazal::NetZSpecifics::fn_800A530C() {
 // ------------------------------------
 // fn_800A5314
 // ------------------------------------
-
-extern "C" void fn_8007DFD0();
-extern "C" void fn_80083734();
-
 void Quazal::NetZSpecifics::fn_800A5314(void) {
     fn_80083734();
     fn_8007DFD0();
@@ -110,10 +82,6 @@ void Quazal::NetZSpecifics::fn_800A5314(void) {
 // ------------------------------------
 // fn_800A5338
 // ------------------------------------
-
-extern "C" void fn_8007E3C0();
-extern "C" void fn_80083174();
-extern "C" void fn_80084160();
 extern char lbl_808E2DA0;
 
 void Quazal::NetZSpecifics::fn_800A5338(void) {
diff --git a/src/quazal/quazal_unk_0x800A515C.hpp b/src/quazal/quazal_unk_0x800A515C.hpp
new file mode 100644
index 0000000..fe512d4
--- /dev/null
+++ b/src/quazal/quazal_unk_0x800A515C.hpp
@@ -0,0 +1,22 @@
+// ------------------------------------
+// class layouts
+// ------------------------------------
+namespace Quazal {
+    class ProductSpecifics {
+        public:
+            ProductSpecifics();             // aka fn_800A515C
+            virtual ~ProductSpecifics();    // aka fn_800A516C
+            virtual void unk() = 0;         // 0'd in vtable, pure virtual
+            virtual void fn_8076F540();
+            // virtual void fn_8076F540();  // wait, why is this duplicated?
+    };
+
+    class NetZSpecifics : ProductSpecifics {
+        public:
+            NetZSpecifics();                // aka fn_800A5278
+            virtual ~NetZSpecifics();       // aka fn_800A52B4
+            virtual int fn_800A530C();
+            virtual void fn_800A5314();
+            virtual void fn_800A5338();
+    };
+}
\ No newline at end of file
diff --git a/src/unknown.hpp b/src/unknown.hpp
index 3fa9923..4960004 100644
--- a/src/unknown.hpp
+++ b/src/unknown.hpp
@@ -1,6 +1,13 @@
 #ifndef UNKNOWN_HPP
 #define UNKNOWN_HPP
 #include <types.h>
+
+extern "C" void fn_8007DFD0();
+extern "C" void fn_80083734();
+extern "C" void fn_8007E3C0();
+extern "C" void fn_80083174();
+extern "C" void fn_80084160();
+
 extern "C" s32 fn_806F61D4();
 
 struct unk_8030F9EC {