From 53555ffbcfef497dc0a78bf365942fb2ddb5ce1e Mon Sep 17 00:00:00 2001
From: Luke Street <luke.street@encounterpc.com>
Date: Sat, 23 Sep 2023 07:27:10 -0400
Subject: [PATCH] Link J3DSys

---
 configure.py                        | 2 +-
 src/JSystem/J3DGraphBase/J3DSys.cpp | 2 +-
 src/m_Do/m_Do_main.cpp              | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure.py b/configure.py
index 7bc9629fb..cbbe1b189 100644
--- a/configure.py
+++ b/configure.py
@@ -848,7 +848,7 @@ config.libs = [
         "J3DGraphBase",
         [
             Object(NonMatching, "JSystem/J3DGraphBase/J3DGD.cpp"),
-            Object(NonMatching, "JSystem/J3DGraphBase/J3DSys.cpp"),
+            Object(Matching,    "JSystem/J3DGraphBase/J3DSys.cpp"),
             Object(Matching,    "JSystem/J3DGraphBase/J3DVertex.cpp"),
             Object(NonMatching, "JSystem/J3DGraphBase/J3DTransform.cpp"),
             Object(NonMatching, "JSystem/J3DGraphBase/J3DPacket.cpp"),
diff --git a/src/JSystem/J3DGraphBase/J3DSys.cpp b/src/JSystem/J3DGraphBase/J3DSys.cpp
index 81a58d229..c1e76c230 100644
--- a/src/JSystem/J3DGraphBase/J3DSys.cpp
+++ b/src/JSystem/J3DGraphBase/J3DSys.cpp
@@ -123,7 +123,7 @@ void J3DFifoLoadNrmMtxImm3x3(Mtx33 mtx, unsigned long idx) {
     GFX_FIFO(u32) = mtx_u32[8];
 }
 
-u8 NullTexData[16] = {
+u8 NullTexData[16] __attribute__((aligned(32))) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index 5a251f01d..304386ae8 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -51,7 +51,8 @@ void HeapCheck::CheckHeap1() {
 }
 
 // unused data?
-static u32 lit_2100[] = {0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000};
+static u32 lit_2100[] = {0x3F800000, 0x3F800000, 0x3F800000};
+static u32 lit_2080[] = {0x3F800000, 0x3F800000, 0x3F800000};
 
 char mDoMain::COPYDATE_STRING[18] = "??/??/?? ??:??:??";