From e773605fd49dca29ebb74f0e387576e7eaea3cee Mon Sep 17 00:00:00 2001
From: Max <mparisi@stevens.edu>
Date: Sun, 18 Oct 2020 18:24:23 -0400
Subject: arrange file-local type definitions, constants, and objects into an
 unnamed namespace

---
 asm/code_801DAAE0_asm.s |  3 ---
 obj_files.mk            |  1 -
 src/code_801DAAE0.cpp   | 49 ++++++++++++++++++++++++++-----------------------
 3 files changed, 26 insertions(+), 27 deletions(-)
 delete mode 100644 asm/code_801DAAE0_asm.s

diff --git a/asm/code_801DAAE0_asm.s b/asm/code_801DAAE0_asm.s
deleted file mode 100644
index 4ea72fe..0000000
--- a/asm/code_801DAAE0_asm.s
+++ /dev/null
@@ -1,3 +0,0 @@
-.include "macros.inc"
-
-.section .text, "ax"  # 0x80006980 - 0x803E1E60
diff --git a/obj_files.mk b/obj_files.mk
index d22e914..aeee1b5 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -219,7 +219,6 @@ SPLIT_O_FILES := 						                          \
 	$(BUILD_DIR)/asm/SDK/NdevExi2A/exi2.o                                       \
 	$(BUILD_DIR)/src/code_801DAA30.o                                   \
 	$(BUILD_DIR)/src/code_801DAAE0.o                                   \
-	$(BUILD_DIR)/asm/code_801DAAE0_asm.o                                   \
 	$(BUILD_DIR)/asm/code_801DB040.o                                   \
 	$(BUILD_DIR)/asm/code_801DB81C.o                                   \
 	$(BUILD_DIR)/asm/code_801DBB3C.o                                   \
diff --git a/src/code_801DAAE0.cpp b/src/code_801DAAE0.cpp
index 03f47ce..6d77fd3 100644
--- a/src/code_801DAAE0.cpp
+++ b/src/code_801DAAE0.cpp
@@ -4,30 +4,33 @@
 #include "Runtime/__mem.h"
 #include "SDK/mem.h"
 
-extern "C" {
-
-struct unkClass
-{
-    u8 unk0;
-    MEMHeapHandle unk4;
-    u32 unk8;
-};
-
-struct unkClass2
-{
-    MEMHeapHandle heap;
-    u16 groupID;
-    u32 unk8;
-};
-
-#define ARR_SIZE 16
-unkClass gUnk804912B0[ARR_SIZE];
+namespace
+{
+    struct unkClass
+    {
+        u8 unk0;
+        MEMHeapHandle unk4;
+        u32 unk8;
+    };
+
+    struct unkClass2
+    {
+        MEMHeapHandle heap;
+        u16 groupID;
+        u32 unk8;
+    };
+    
+    const size_t ARR_SIZE = 16;
+    unkClass gUnk804912B0[ARR_SIZE];
+
+    unkStruct gUnk8063F2D0(1, 4, 0);
+    u8 gUnk8063F2D6;
+    u8 gUnk8063F2D7;
+    MEMHeapHandle gUnk8063F2D8;
+    u16 gUnk8063F2DC;
+}
 
-unkStruct gUnk8063F2D0(1, 4, 0);
-u8 gUnk8063F2D6;
-u8 gUnk8063F2D7;
-MEMHeapHandle gUnk8063F2D8;
-u16 gUnk8063F2DC;
+extern "C" {
 
 static unkClass* func_801DAAE0(void)
 {
-- 
cgit v1.2.3