From 413601c7762e520d85a44d5b27905c34e59613e4 Mon Sep 17 00:00:00 2001
From: David Benepe <benepe96@gmail.com>
Date: Thu, 10 Jun 2021 01:31:04 -0500
Subject: [PATCH] Fixed conflicts

---
 include/unknown_043920.h |  4 +++-
 include/unknown_06B2B0.h | 11 ++++++++++-
 include/unknown_080500.h |  4 ++--
 src/unknown_003260.c     | 15 ---------------
 src/unknown_06B2B0.c     |  9 ---------
 src/unknown_080500.c     |  8 --------
 6 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/include/unknown_043920.h b/include/unknown_043920.h
index a6f5bc06..3c84013b 100644
--- a/include/unknown_043920.h
+++ b/include/unknown_043920.h
@@ -19,7 +19,9 @@ extern f32 D_800DCBE8[19];
 // Unused? Not sure if this is actually an array or just some random data.
 extern s32 D_800DCC34[19];
 
-extern s32 D_800DCC80[19];
+extern s32 D_800DCC80[13];
+
+extern s16 D_800DCCB4[12];
 
 extern u16 D_800DCCCC[20];
 
diff --git a/include/unknown_06B2B0.h b/include/unknown_06B2B0.h
index 3f9e3881..aa163905 100644
--- a/include/unknown_06B2B0.h
+++ b/include/unknown_06B2B0.h
@@ -3,6 +3,15 @@
 
 #include "types.h"
 
+typedef struct unknown800DD408 {
+    u8 unk0;
+    u8 unk1;
+    u8 unk2;
+    u8 unk3;
+    u16 unk4;
+    u16 unk6;
+} unknown800DD408;
+
 extern s8  D_800DD310;
 extern s8  D_800DD314;
 extern s8  D_800DD318;
@@ -55,7 +64,7 @@ extern s32 D_800DD3EC;
 extern s8  D_800DD3F0;
 extern s16 D_800DD3F4[8];
 extern s32 D_800DD404;
-extern s32 D_800DD408;
+extern unknown800DD408 D_800DD408;
 extern s32 D_800DD40C;
 
 // Unused?
diff --git a/include/unknown_080500.h b/include/unknown_080500.h
index 3b759e76..fd91e5c9 100644
--- a/include/unknown_080500.h
+++ b/include/unknown_080500.h
@@ -339,8 +339,8 @@ extern u16 D_800E0700[8];
 
 extern s16 D_800E0710[16];
 
-extern s16 D_800E0730[18];
-extern s16 D_800E0758[56];
+extern s16 D_800E0730[19];
+extern s16 D_800E0758[54];
 
 extern s16 D_800E07C4[14];
 
diff --git a/src/unknown_003260.c b/src/unknown_003260.c
index d4f461d8..1e6a5353 100644
--- a/src/unknown_003260.c
+++ b/src/unknown_003260.c
@@ -32,21 +32,6 @@ typedef union {
 
 }ALSndpEvent;
 
-/* Unknown Size */
-typedef struct unk800DC6BC {
-    ALPlayer        node;
-    ALEventQueue    evtq;
-    ALEvent         nextEvent;
-    ALSynth        *drvr;
-    u32             unk3C;
-    unk800DC6BC_40 *unk40;
-    s32             unk44;
-    s32             unk48;
-    s32             frameTime;
-    ALMicroTime     nextDelta;
-    ALMicroTime     curTime;
-} unk800DC6BC; //ALSndPlayer
-
 typedef struct unk80119240
 {
     ALLink node;
diff --git a/src/unknown_06B2B0.c b/src/unknown_06B2B0.c
index 62d45cb4..f677640a 100644
--- a/src/unknown_06B2B0.c
+++ b/src/unknown_06B2B0.c
@@ -86,15 +86,6 @@ s16 D_800DD3F4[8] = {
 };
 s32 D_800DD404 = 12;
 
-typedef struct unknown800DD408 {
-    u8 unk0;
-    u8 unk1;
-    u8 unk2;
-    u8 unk3;
-    u16 unk4;
-    u16 unk6;
-} unknown800DD408;
-
 unknown800DD408 D_800DD408 = {
     0, 255, 255, 255, 30, 0xFFFF
 };
diff --git a/src/unknown_080500.c b/src/unknown_080500.c
index b905c7f1..7718a5ff 100644
--- a/src/unknown_080500.c
+++ b/src/unknown_080500.c
@@ -42,14 +42,6 @@ typedef enum MENU_ID {
 
 extern s32 osTvType;
 
-typedef struct unk800DFC10 {
-    u32 *unk0;
-    s16 unk4;
-    s16 unk6;
-    u32 *unk8;
-    s32 unkC;
-} unk800DFC10;
-
 /************ .bss ************/
 
 // The bss section needs to stay above the data section!