From 6898a9cc90f8fa6a383dc8b48c2c58f4b70412c4 Mon Sep 17 00:00:00 2001
From: Phillip Stephens <antidote.crk@gmail.com>
Date: Thu, 15 Sep 2022 19:17:34 -0700
Subject: [PATCH] Remove padding from g721.cpp, move unused bytes to
 CStaticAudioPlayer.cpp

---
 Makefile                             |  4 ++--
 asm/Kyoto/Audio/CStaticAudioPlayer.s | 12 ++++++++++++
 asm/Kyoto/Audio/g721.s               |  8 --------
 obj_files.mk                         |  2 +-
 src/Kyoto/Audio/g721.cpp             |  4 +---
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index b841eae2..9dbb8c29 100644
--- a/Makefile
+++ b/Makefile
@@ -130,7 +130,7 @@ $(METROTRK_FILES): MWCC_VERSION := 1.2.5
 $(METROTRK_FILES): CFLAGS := $(CFLAGS_BASE)
 $(BASE_FILES): MWCC_VERSION := 1.2.5
 $(BASE_FILES): CFLAGS := $(CFLAGS_BASE)
-$(AI_FILES): MWCC_VERSION := 1.2.5
+$(AI_FILES): MWCC_VERSION := 1.2.5e
 $(AI_FILES): CFLAGS := $(CFLAGS_BASE)
 $(OS_FILES): MWCC_VERSION := 1.2.5
 $(OS_FILES): CFLAGS := $(CFLAGS_BASE)
@@ -138,7 +138,7 @@ $(CARD_FILES): MWCC_VERSION := 1.2.5
 $(CARD_FILES): CFLAGS := $(CFLAGS_BASE)
 $(DVD_FILES): MWCC_VERSION := 1.2.5e
 $(DVD_FILES): CFLAGS := $(CFLAGS_BASE)
-$(DSP_FILES): MWCC_VERSION := 1.2.5
+$(DSP_FILES): MWCC_VERSION := 1.2.5e
 $(DSP_FILES): CFLAGS := $(CFLAGS_BASE)
 $(MUSYX_FILES): CFLAGS := $(CFLAGS_MUSYX)
 $(ZLIB_FILES): CFLAGS := $(CFLAGS_RUNTIME)
diff --git a/asm/Kyoto/Audio/CStaticAudioPlayer.s b/asm/Kyoto/Audio/CStaticAudioPlayer.s
index 10c296d4..bec4993f 100644
--- a/asm/Kyoto/Audio/CStaticAudioPlayer.s
+++ b/asm/Kyoto/Audio/CStaticAudioPlayer.s
@@ -4,6 +4,18 @@
 lbl_ctor:
 .4byte __sinit_CStaticAudioPlayer_cpp
 
+.section .data
+.balign 8
+lbl_803EF8C0:
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+
 .section .bss
 .balign 8
 .lcomm lbl_80540A20, 0xC, 4
diff --git a/asm/Kyoto/Audio/g721.s b/asm/Kyoto/Audio/g721.s
index ae2e7d6f..f9c640ba 100644
--- a/asm/Kyoto/Audio/g721.s
+++ b/asm/Kyoto/Audio/g721.s
@@ -38,14 +38,6 @@ lbl_803EF840:
 	.4byte 0x02000200
 	.4byte 0x02000000
 	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
 
 .section .text, "ax"
 
diff --git a/obj_files.mk b/obj_files.mk
index c638a28d..79c6fe78 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -641,7 +641,7 @@ DB_FILES :=\
 	$(BUILD_DIR)/asm/Dolphin/db.o
 	
 DSP_FILES :=\
-	$(BUILD_DIR)/asm/Dolphin/dsp/dsp.o\
+	$(BUILD_DIR)/src/Dolphin/dsp/dsp.o\
 	$(BUILD_DIR)/src/Dolphin/dsp/dsp_debug.o\
 	$(BUILD_DIR)/asm/Dolphin/dsp/dsp_task.o
 	
diff --git a/src/Kyoto/Audio/g721.cpp b/src/Kyoto/Audio/g721.cpp
index 0663184a..c776ebbf 100644
--- a/src/Kyoto/Audio/g721.cpp
+++ b/src/Kyoto/Audio/g721.cpp
@@ -418,9 +418,7 @@ static short	_witab[16] = {-12, 18, 41, 64, 112, 198, 355, 1122,
  */
 static short	_fitab[16] = {0, 0, 0, 0x200, 0x200, 0x200, 0x600, 0xE00,
     0xE00, 0x600, 0x200, 0x200, 0x200, 0, 0, 0};
-/* HACK: To make match */
-/* TODO: Remove this */
-static int padding[8] = { 0, 0, 0, 0, 0, 0, 0, 0};
+
 /*
  * g721_decoder()
  *