Fixes and small bte stuff

4 files changed, 38 insertions, 10 deletions

diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt
index aa8032f4..1a2efb54 100644
--- a/config/SOUE01/splits.txt
+++ b/config/SOUE01/splits.txt
@@ -2556,6 +2556,13 @@ revolution/ax/AXVPB.c:
 	.sdata2     start:0x8057E5E8 end:0x8057E608
 	.bss        start:0x805D5260 end:0x805E6960
 
+revolution/ax/AXComp.c:
+	.data       start:0x8054DA20 end:0x8054E9E0
+
+revolution/ax/DSPCode.c:
+	.data       start:0x8054E9E0 end:0x805509E0
+	.sdata      start:0x80574910 end:0x80574918
+
 revolution/ax/AXProf.c:
 	.text       start:0x8039F290 end:0x8039F2D0 align:16
 	.sbss       start:0x80575F70 end:0x80575F80
@@ -3111,8 +3118,19 @@ revolution/usb/usb.c:
 	.sdata      start:0x80574CE8 end:0x80574D08
 	.sbss       start:0x805764D8 end:0x80576500
 
+revolution/bte/gki_buffer.c:
+	.text       start:0x803F7F80 end:0x803F9418 align:16
+	.data       start:0x80566530 end:0x80566678
+
+revolution/bte/gki_time.c:
+	.text       start:0x803F9420 end:0x803F99A4 align:16
+
+revolution/bte/gki_ppc.c:
+	.text       start:0x803F99B0 end:0x803F9CB4 align:16
+	.bss        start:0x805FE338 end:0x80626E18
+
 RVL_SDK/bte/BTE.c:
-	.text       start:0x803F7F80 end:0x80425754 align:16
+	.text       start:0x803F9CC0 end:0x80425754 align:16
 
 revolution/ipc/ipcMain.c:
 	.text       start:0x80425760 end:0x80425848 align:16
diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
index d13e601f..1565fcb0 100644
--- a/config/SOUE01/symbols.txt
+++ b/config/SOUE01/symbols.txt
@@ -38245,12 +38245,19 @@ lbl_80565C90 = .data:0x80565C90; // type:object size:0x24
 lbl_80565CB4 = .data:0x80565CB4; // type:object size:0x24
 e_dir = .data:0x80565CD8; // type:object size:0x28 data:4byte
 lbl_80565D00 = .data:0x80565D00; // type:object size:0x830
-lbl_80566530 = .data:0x80566530; // type:object size:0x18
-lbl_80566548 = .data:0x80566548; // type:object size:0x98
-lbl_805665E0 = .data:0x805665E0; // type:object size:0x1C
-lbl_805665FC = .data:0x805665FC; // type:object size:0x20
-lbl_8056661C = .data:0x8056661C; // type:object size:0x44
-lbl_80566660 = .data:0x80566660; // type:object size:0x18
+lbl_80566530 = .data:0x80566530; // type:object size:0x15 data:string
+lbl_80566548 = .data:0x80566548; // type:object size:0x18 data:string
+lbl_80566560 = .data:0x80566560; // type:object size:0x15 data:string
+lbl_80566578 = .data:0x80566578; // type:object size:0x13 data:string
+lbl_8056658C = .data:0x8056658C; // type:object size:0xC data:string
+lbl_80566598 = .data:0x80566598; // type:object size:0x18 data:string
+lbl_805665B0 = .data:0x805665B0; // type:object size:0x18 data:string
+lbl_805665C8 = .data:0x805665C8; // type:object size:0x15 data:string
+lbl_805665E0 = .data:0x805665E0; // type:object size:0x1B data:string
+lbl_805665FC = .data:0x805665FC; // type:object size:0x1D data:string
+lbl_8056661C = .data:0x8056661C; // type:object size:0x22 data:string
+lbl_8056663E = .data:0x8056663E; // type:object size:0x22
+lbl_80566660 = .data:0x80566660; // type:object size:0x12 data:string
 lbl_80566678 = .data:0x80566678; // type:object size:0x3C
 lbl_805666B4 = .data:0x805666B4; // type:object size:0x34
 lbl_805666E8 = .data:0x805666E8; // type:object size:0x14
@@ -51938,7 +51945,7 @@ lbl_805FE2A8 = .bss:0x805FE2A8; // type:object size:0x30 align:4 data:float
 lbl_805FE2D8 = .bss:0x805FE2D8; // type:object size:0x20 align:8 data:double
 lbl_805FE2F8 = .bss:0x805FE2F8; // type:object size:0x30 align:8 data:double
 Fxyz_0 = .bss:0x805FE328; // type:object size:0x10 data:4byte
-lbl_805FE338 = .bss:0x805FE338; // type:object size:0x28AE0 data:byte
+gki_cb = .bss:0x805FE338; // type:object size:0x28AE0 data:byte
 lbl_80626E18 = .bss:0x80626E18; // type:object size:0x28
 lbl_80626E40 = .bss:0x80626E40; // type:object size:0x60 data:4byte
 lbl_80626EA0 = .bss:0x80626EA0; // type:object size:0x1000
diff --git a/configure.py b/configure.py
index c7ea07ef..06cbd47f 100644
--- a/configure.py
+++ b/configure.py
@@ -1322,6 +1322,8 @@ config.libs = [
             Object(NonMatching, "revolution/ax/AXOut.c"),
             Object(NonMatching, "revolution/ax/AXSPB.c"),
             Object(NonMatching, "revolution/ax/AXVPB.c"),
+            Object(NonMatching, "revolution/ax/AXComp.c"),
+            Object(NonMatching, "revolution/ax/DSPCode.c"),
             Object(NonMatching, "revolution/ax/AXProf.c"),
             Object(NonMatching, "revolution/axfx/AXFXReverbHi.c"),
             Object(NonMatching, "revolution/axfx/AXFXReverbHiExp.c"),
@@ -1432,6 +1434,9 @@ config.libs = [
             Object(NonMatching, "revolution/kpad/KMPLS.c"),
             Object(NonMatching, "revolution/kpad/KZMplsTestSub.c"),
             Object(NonMatching, "revolution/usb/usb.c"),
+            Object(NonMatching, "revolution/bte/gki_buffer.c"),
+            Object(NonMatching, "revolution/bte/gki_time.c"),
+            Object(NonMatching, "revolution/bte/gki_ppc.c"),
             Object(NonMatching, "RVL_SDK/bte/BTE.c"),
             Object(NonMatching, "revolution/ipc/ipcMain.c"),
             Object(NonMatching, "revolution/ipc/ipcclt.c"),
diff --git a/src/nw4r/db/db_exception.cpp b/src/nw4r/db/db_exception.cpp
index 36867e95..dccba52e 100644
--- a/src/nw4r/db/db_exception.cpp
+++ b/src/nw4r/db/db_exception.cpp
@@ -29,8 +29,6 @@ static struct ExceptionStruct sException;
 
 static u8 sThreadBuffer[0x4000] ALIGN_DECL(0x20);
 
-extern "C" u32 lbl_80574960;
-
 const char *CPU_EXP_NAME[] = {
     "SYSTEM RESET",
     "MACHINE CHECK",