d_door_param2 / d_cam_param / d_gameover + some misc cleanup

1 files changed, 137 insertions, 1546 deletions

diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp
index 772ac395b5..e52dd6bcdc 100644
--- a/src/d/d_drawlist.cpp
+++ b/src/d/d_drawlist.cpp
@@ -6,13 +6,14 @@
 #include "d/d_drawlist.h"
 #include "JSystem/J3DGraphBase/J3DShape.h"
 #include "JSystem/J3DGraphBase/J3DSys.h"
+#include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
 #include "dolphin/mtx/mtx44.h"
 #include "dolphin/mtx/mtxvec.h"
 #include "dolphin/types.h"
-#include "m_Do/m_Do_mtx.h"
-#include "m_Do/m_Do_lib.h"
 #include "m_Do/m_Do_graphic.h"
+#include "m_Do/m_Do_lib.h"
+#include "m_Do/m_Do_mtx.h"
 
 //
 // Types:
@@ -50,16 +51,6 @@ struct dDlst_2DM_c {
     /* 80052C58 */ void draw();
 };
 
-struct cBgS_ShdwDraw {
-    /* 80267F88 */ cBgS_ShdwDraw();
-    /* 80267FD0 */ ~cBgS_ShdwDraw();
-    /* 80268048 */ void Set(cXyz&, cXyz&);
-};
-
-struct cBgS {
-    /* 80074840 */ void ShdwDraw(cBgS_ShdwDraw*);
-};
-
 struct ShdwDrawPoly_c {
     /* 80054A6C */ ~ShdwDrawPoly_c();
 };
@@ -226,13 +217,9 @@ extern "C" extern void* __vt__12dDlst_base_c[3];
 extern "C" extern void* __vt__9J3DPacket[5];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" u8 mClipper__14mDoLib_clipper[92];
-extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" extern u8 g_envHIO[68];
 extern "C" u8 sincosTable___5JMath[65536];
 extern "C" u8 mBackColor__13mDoGph_gInf_c[4];
-extern "C" extern u8 g_clearColor[4];
-extern "C" extern u32 g_blackColor;
-extern "C" extern u32 g_whiteColor;
 extern "C" f32 mSystemFar__14mDoLib_clipper;
 extern "C" f32 mFovyRate__14mDoLib_clipper;
 extern "C" u8 sOldVcdVatCmd__8J3DShape[4];
@@ -242,8 +229,7 @@ extern "C" u8 sOldVcdVatCmd__8J3DShape[4];
 //
 
 /* 80051AC0-80051ADC 04C400 001C+00 0/0 3/3 0/0 .text setViewPort__14dDlst_window_cFffffff */
-void dDlst_window_c::setViewPort(f32 xOrig, f32 yOrig, f32 width, f32 height, f32 nearZ,
-                                 f32 farZ) {
+void dDlst_window_c::setViewPort(f32 xOrig, f32 yOrig, f32 width, f32 height, f32 nearZ, f32 farZ) {
     mXOrig = xOrig;
     mYOrig = yOrig;
     mWidth = width;
@@ -346,779 +332,104 @@ extern "C" asm void draw__12dDlst_2DT2_cFv() {
 
 /* ############################################################################################## */
 /* 803A87A0-803A87C0 0058C0 000C+14 2/2 0/0 0/0 .data            cNullVec__6Z2Calc */
-SECTION_DATA static u8 cNullVec__6Z2Calc[12 + 20 /* padding */] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    /* padding */
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
+SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
 /* 803A87C0-803A8800 0058E0 003C+04 0/0 0/0 0/0 .data            l_frontZMat */
 #pragma push
 #pragma force_active on
-SECTION_DATA static u8 l_frontZMat[60 + 4 /* padding */] = {
-    0x61,
-    0x40,
-    0x00,
-    0x00,
-    0x07,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x3F,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x09,
-    0x00,
-    0x00,
-    0x00,
-    0x01,
-    0x61,
-    0x00,
-    0x00,
-    0x40,
-    0x10,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    /* padding */
-    0x00,
-    0x00,
-    0x00,
-    0x00,
+SECTION_DATA static u8 l_frontZMat[] ALIGN_DECL(32) = {
+    0x61, 0x40, 0x00, 0x00, 0x07, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10,
+    0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, 0x00, 0x40, 0x10, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 #pragma pop
 
 /* 803A8800-803A882C 005920 002A+02 0/0 0/0 0/0 .data            l_frontNoZSubMat */
 #pragma push
 #pragma force_active on
-SECTION_DATA static u8 l_frontNoZSubMat[42 + 2 /* padding */] = {
-    0x61,
-    0x40,
-    0x00,
-    0x00,
-    0x06,
-    0x61,
-    0x41,
-    0x00,
-    0x09,
-    0x35,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    /* padding */
-    0x00,
-    0x00,
+SECTION_DATA static u8 l_frontNoZSubMat[] ALIGN_DECL(32) = {
+    0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x09, 0x35, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 #pragma pop
 
 /* 803A882C-803A88A0 00594C 0060+14 0/1 0/0 0/0 .data            l_shadowVolPos */
 #pragma push
 #pragma force_active on
-SECTION_DATA static u8 l_shadowVolPos[96 + 20 /* padding */] = {
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0xC3,
-    0x96,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0xC3,
-    0x96,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0xC3,
-    0x96,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0xC3,
-    0x96,
-    0x00,
-    0x00,
-    /* padding */
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
+SECTION_DATA static Vec l_shadowVolPos[] = {
+    {-1.0f, -1.0f, 0.0f}, {-1.0f, -1.0f, -300.0f}, {-1.0f, 1.0f, 0.0f}, {-1.0f, 1.0f, -300.0f},
+    {1.0f, -1.0f, 0.0f},  {1.0f, -1.0f, -300.0f},  {1.0f, 1.0f, 0.0f},  {1.0f, 1.0f, -300.0f},
 };
 #pragma pop
 
 /* 803A88A0-803A88E0 0059C0 003B+05 0/0 0/0 0/0 .data            l_shadowVolDL */
 #pragma push
 #pragma force_active on
-SECTION_DATA static u8 l_shadowVolDL[59 + 5 /* padding */] = {
-    0x80,
-    0x00,
-    0x18,
-    0x06,
-    0x02,
-    0x03,
-    0x07,
-    0x00,
-    0x04,
-    0x05,
-    0x01,
-    0x06,
-    0x04,
-    0x00,
-    0x02,
-    0x07,
-    0x05,
-    0x04,
-    0x06,
-    0x03,
-    0x01,
-    0x05,
-    0x07,
-    0x02,
-    0x00,
-    0x01,
-    0x03,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    /* padding */
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
+SECTION_DATA static u8 l_shadowVolDL[] ALIGN_DECL(32) = {
+    0x80, 0x00, 0x18, 0x06, 0x02, 0x03, 0x07, 0x00, 0x04, 0x05, 0x01, 0x06, 0x04, 0x00, 0x02,
+    0x07, 0x05, 0x04, 0x06, 0x03, 0x01, 0x05, 0x07, 0x02, 0x00, 0x01, 0x03, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 #pragma pop
 
 /* 803A88E0-803A8940 005A00 005A+06 1/1 0/0 0/0 .data            l_shadowProjMat */
-SECTION_DATA static u8 l_shadowProjMat[90 + 6 /* padding */] = {
-    0x61,
-    0x28,
-    0x38,
-    0x03,
-    0xC0,
-    0x61,
-    0xC0,
-    0x08,
-    0xFF,
-    0xFF,
-    0x61,
-    0xC1,
-    0x08,
-    0xE6,
-    0x70,
-    0x61,
-    0x43,
-    0x00,
-    0x00,
-    0x01,
-    0x61,
-    0x40,
-    0x00,
-    0x00,
-    0x07,
-    0x61,
-    0x41,
-    0x00,
-    0x04,
-    0xAD,
-    0x61,
-    0xF3,
-    0x64,
-    0x00,
-    0x00,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x3F,
-    0x00,
-    0x00,
-    0x00,
-    0x01,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x09,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x61,
-    0x00,
-    0x00,
-    0x40,
-    0x01,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    /* padding */
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
+SECTION_DATA static u8 l_shadowProjMat[] ALIGN_DECL(32) = {
+    0x61, 0x28, 0x38, 0x03, 0xC0, 0x61, 0xC0, 0x08, 0xFF, 0xFF, 0x61, 0xC1, 0x08, 0xE6, 0x70,
+    0x61, 0x43, 0x00, 0x00, 0x01, 0x61, 0x40, 0x00, 0x00, 0x07, 0x61, 0x41, 0x00, 0x04, 0xAD,
+    0x61, 0xF3, 0x64, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x01, 0x10,
+    0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
 /* 803A8940-803A89A0 005A60 005A+06 0/0 0/0 0/0 .data            l_shadowVolMat */
 #pragma push
 #pragma force_active on
-SECTION_DATA static u8 l_shadowVolMat[90 + 6 /* padding */] = {
-    0x61,
-    0x28,
-    0x38,
-    0x00,
-    0x00,
-    0x61,
-    0xC0,
-    0x08,
-    0xFF,
-    0xFC,
-    0x61,
-    0xC1,
-    0x08,
-    0xFF,
-    0x90,
-    0x61,
-    0x43,
-    0x00,
-    0x00,
-    0x41,
-    0x61,
-    0x40,
-    0x00,
-    0x00,
-    0x0D,
-    0x61,
-    0x41,
-    0x00,
-    0x01,
-    0x35,
-    0x61,
-    0xF3,
-    0x7F,
-    0x00,
-    0x00,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x3F,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x09,
-    0x00,
-    0x00,
-    0x00,
-    0x01,
-    0x61,
-    0x00,
-    0x00,
-    0x80,
-    0x10,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    /* padding */
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
+SECTION_DATA static u8 l_shadowVolMat[] ALIGN_DECL(32) = {
+    0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFC, 0x61, 0xC1, 0x08, 0xFF, 0x90,
+    0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0x40, 0x00, 0x00, 0x0D, 0x61, 0x41, 0x00, 0x01, 0x35,
+    0x61, 0xF3, 0x7F, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10,
+    0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, 0x00, 0x80, 0x10, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 #pragma pop
 
 /* 803A89A0-803A8A00 005AC0 0055+0B 0/1 0/0 0/0 .data            l_clearMat */
 #pragma push
 #pragma force_active on
-SECTION_DATA static u8 l_clearMat[85 + 11 /* padding */] = {
-    0x61,
-    0x28,
-    0x38,
-    0x00,
-    0x00,
-    0x61,
-    0xC0,
-    0x08,
-    0xFF,
-    0xFF,
-    0x61,
-    0xC1,
-    0x08,
-    0xFF,
-    0xA0,
-    0x61,
-    0x40,
-    0x00,
-    0x00,
-    0x06,
-    0x61,
-    0x41,
-    0x00,
-    0x00,
-    0x14,
-    0x61,
-    0xF3,
-    0x7F,
-    0x00,
-    0x00,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x3F,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x09,
-    0x00,
-    0x00,
-    0x00,
-    0x01,
-    0x61,
-    0x00,
-    0x00,
-    0x00,
-    0x10,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    /* padding */
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
+SECTION_DATA static u8 l_clearMat[] ALIGN_DECL(32) = {
+    0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFF, 0x61, 0xC1, 0x08, 0xFF, 0xA0,
+    0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x00, 0x14, 0x61, 0xF3, 0x7F, 0x00, 0x00,
+    0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00,
+    0x00, 0x00, 0x01, 0x61, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 #pragma pop
 
 /* 803A8A00-803A8A60 005B20 0055+0B 0/1 0/0 0/0 .data            l_frontMat */
 #pragma push
 #pragma force_active on
-SECTION_DATA static u8 l_frontMat[85 + 11 /* padding */] = {
-    0x61,
-    0x28,
-    0x38,
-    0x00,
-    0x00,
-    0x61,
-    0xC0,
-    0x08,
-    0xFF,
-    0xFF,
-    0x61,
-    0xC1,
-    0x08,
-    0xFF,
-    0x90,
-    0x61,
-    0x43,
-    0x00,
-    0x00,
-    0x41,
-    0x61,
-    0x40,
-    0x00,
-    0x00,
-    0x07,
-    0x61,
-    0x41,
-    0x00,
-    0x01,
-    0x15,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x3F,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x09,
-    0x00,
-    0x00,
-    0x00,
-    0x01,
-    0x61,
-    0x00,
-    0x00,
-    0x40,
-    0x10,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    /* padding */
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
+SECTION_DATA static u8 l_frontMat[] ALIGN_DECL(32) = {
+    0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFF, 0x61, 0xC1, 0x08, 0xFF, 0x90,
+    0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0x40, 0x00, 0x00, 0x07, 0x61, 0x41, 0x00, 0x01, 0x15,
+    0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00,
+    0x00, 0x00, 0x01, 0x61, 0x00, 0x00, 0x40, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 #pragma pop
 
 /* 803A8A60-803A8A9C 005B80 003C+00 0/1 0/0 0/0 .data            l_backSubMat */
 #pragma push
 #pragma force_active on
-SECTION_DATA static u8 l_backSubMat[60] = {
+SECTION_DATA static u8 l_backSubMat[] ALIGN_DECL(32) = {
     0x61, 0x41, 0x00, 0x09, 0x35, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10,
     0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, 0x00, 0x80, 0x10, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1129,804 +440,105 @@ SECTION_DATA static u8 l_backSubMat[60] = {
 /* 803A8A9C-803A8B60 005BBC 00A8+1C 0/1 0/0 0/0 .data            l_simpleShadowPos */
 #pragma push
 #pragma force_active on
-SECTION_DATA static u8 l_simpleShadowPos[168 + 28 /* padding */] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0xBF,
-    0x80,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    0x3F,
-    0x80,
-    0x00,
-    0x00,
-    /* padding */
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
+SECTION_DATA static Vec l_simpleShadowPos[] = {
+    {0.0f, -1.0f, 0.0f},   {0.0f, 0.0f, 0.0f},   {1.0f, -1.0f, -1.0f}, {1.0f, 0.0f, -1.0f},
+    {-1.0f, -1.0f, -1.0f}, {-1.0f, 0.0f, -1.0f}, {-1.0f, -1.0f, 1.0f}, {-1.0f, 0.0f, 1.0f},
+    {1.0f, -1.0f, 1.0f},   {1.0f, 0.0f, 1.0f},   {-1.0f, 1.0f, -1.0f}, {1.0f, 1.0f, -1.0f},
+    {1.0f, 1.0f, 1.0f},    {-1.0f, 1.0f, 1.0f},
 };
 #pragma pop
 
 /* 803A8B60-803A8BC0 005C80 0058+08 0/1 0/0 0/0 .data            l_shadowVolumeDL */
 #pragma push
 #pragma force_active on
-SECTION_DATA static u8 l_shadowVolumeDL[88 + 8 /* padding */] = {
-    0x98,
-    0x00,
-    0x05,
-    0x03,
-    0x09,
-    0x01,
-    0x07,
-    0x05,
-    0x98,
-    0x00,
-    0x05,
-    0x04,
-    0x06,
-    0x00,
-    0x08,
-    0x02,
-    0x98,
-    0x00,
-    0x04,
-    0x04,
-    0x05,
-    0x06,
-    0x07,
-    0x98,
-    0x00,
-    0x04,
-    0x02,
-    0x03,
-    0x04,
-    0x05,
-    0x98,
-    0x00,
-    0x04,
-    0x08,
-    0x09,
-    0x02,
-    0x03,
-    0x98,
-    0x00,
-    0x04,
-    0x06,
-    0x07,
-    0x08,
-    0x09,
-    0x98,
-    0x00,
-    0x03,
-    0x01,
-    0x05,
-    0x03,
-    0x98,
-    0x00,
-    0x03,
-    0x00,
-    0x02,
-    0x04,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    /* padding */
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
+SECTION_DATA static u8 l_shadowVolumeDL[] ALIGN_DECL(32) = {
+    0x98, 0x00, 0x05, 0x03, 0x09, 0x01, 0x07, 0x05, 0x98, 0x00, 0x05, 0x04, 0x06, 0x00, 0x08,
+    0x02, 0x98, 0x00, 0x04, 0x04, 0x05, 0x06, 0x07, 0x98, 0x00, 0x04, 0x02, 0x03, 0x04, 0x05,
+    0x98, 0x00, 0x04, 0x08, 0x09, 0x02, 0x03, 0x98, 0x00, 0x04, 0x06, 0x07, 0x08, 0x09, 0x98,
+    0x00, 0x03, 0x01, 0x05, 0x03, 0x98, 0x00, 0x03, 0x00, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 #pragma pop
 
 /* 803A8BC0-803A8C20 005CE0 0055+0B 0/1 0/0 0/0 .data            l_shadowSealTexDL */
 #pragma push
 #pragma force_active on
-SECTION_DATA static u8 l_shadowSealTexDL[85 + 11 /* padding */] = {
-    0x61,
-    0x28,
-    0x38,
-    0x03,
-    0xC0,
-    0x61,
-    0x40,
-    0x00,
-    0x00,
-    0x06,
-    0x61,
-    0x41,
-    0x00,
-    0x06,
-    0x15,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x3F,
-    0x00,
-    0x00,
-    0x00,
-    0x01,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x09,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x61,
-    0x00,
-    0x00,
-    0x40,
-    0x01,
-    0x80,
-    0x00,
-    0x04,
-    0x0A,
-    0x00,
-    0x00,
-    0x0B,
-    0x01,
-    0x00,
-    0x0C,
-    0x01,
-    0x01,
-    0x0D,
-    0x00,
-    0x01,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    /* padding */
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
+SECTION_DATA static u8 l_shadowSealTexDL[] ALIGN_DECL(32) = {
+    0x61, 0x28, 0x38, 0x03, 0xC0, 0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x06, 0x15,
+    0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00,
+    0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x40, 0x01, 0x80, 0x00, 0x04, 0x0A, 0x00, 0x00, 0x0B,
+    0x01, 0x00, 0x0C, 0x01, 0x01, 0x0D, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 #pragma pop
 
 /* 803A8C20-803A8C80 005D40 0055+0B 0/1 0/0 0/0 .data            l_shadowSealTex2DL */
 #pragma push
 #pragma force_active on
-SECTION_DATA static u8 l_shadowSealTex2DL[85 + 11 /* padding */] = {
-    0x61,
-    0x28,
-    0x38,
-    0x03,
-    0xC0,
-    0x61,
-    0x40,
-    0x00,
-    0x00,
-    0x06,
-    0x61,
-    0x41,
-    0x00,
-    0x06,
-    0x15,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x3F,
-    0x00,
-    0x00,
-    0x00,
-    0x01,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x09,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x61,
-    0x00,
-    0x00,
-    0x40,
-    0x01,
-    0x80,
-    0x00,
-    0x04,
-    0x0A,
-    0x00,
-    0x00,
-    0x0B,
-    0x02,
-    0x00,
-    0x0C,
-    0x02,
-    0x01,
-    0x0D,
-    0x00,
-    0x01,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    /* padding */
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
+SECTION_DATA static u8 l_shadowSealTex2DL[] ALIGN_DECL(32) = {
+    0x61, 0x28, 0x38, 0x03, 0xC0, 0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x06, 0x15,
+    0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00,
+    0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x40, 0x01, 0x80, 0x00, 0x04, 0x0A, 0x00, 0x00, 0x0B,
+    0x02, 0x00, 0x0C, 0x02, 0x01, 0x0D, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 #pragma pop
 
 /* 803A8C80-803A8D00 005DA0 0069+17 0/1 0/0 0/0 .data            l_shadowSealDL */
 #pragma push
 #pragma force_active on
-SECTION_DATA static u8 l_shadowSealDL[105 + 23 /* padding */] = {
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x0E,
-    0x00,
-    0x00,
-    0x05,
-    0x00,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x10,
-    0x00,
-    0x00,
-    0x05,
-    0x00,
-    0x61,
-    0x28,
-    0x38,
-    0x00,
-    0x00,
-    0x61,
-    0xC0,
-    0x08,
-    0xFF,
-    0xFF,
-    0x61,
-    0xC1,
-    0x08,
-    0xFF,
-    0xB0,
-    0x61,
-    0x40,
-    0x00,
-    0x00,
-    0x06,
-    0x61,
-    0x41,
-    0x00,
-    0x06,
-    0xED,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x3F,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x09,
-    0x00,
-    0x00,
-    0x00,
-    0x01,
-    0x61,
-    0x00,
-    0x00,
-    0x40,
-    0x10,
-    0x80,
-    0x00,
-    0x04,
-    0x0A,
-    0x0B,
-    0x0C,
-    0x0D,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    /* padding */
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
+SECTION_DATA static u8 l_shadowSealDL[] ALIGN_DECL(32) = {
+    0x10, 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x05, 0x00, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00,
+    0x00, 0x05, 0x00, 0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFF, 0x61, 0xC1,
+    0x08, 0xFF, 0xB0, 0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x06, 0xED, 0x10, 0x00,
+    0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00,
+    0x01, 0x61, 0x00, 0x00, 0x40, 0x10, 0x80, 0x00, 0x04, 0x0A, 0x0B, 0x0C, 0x0D, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 #pragma pop
 
 /* 803A8D00-803A8D7C 005E20 007B+01 1/1 0/0 0/0 .data            l_matDL$5404 */
-SECTION_DATA static u8 l_matDL[123 + 1 /* padding */] = {
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x0E,
-    0x00,
-    0x00,
-    0x04,
-    0x00,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x10,
-    0x00,
-    0x00,
-    0x04,
-    0x00,
-    0x61,
-    0x28,
-    0x38,
-    0x00,
-    0x00,
-    0x61,
-    0xC0,
-    0x08,
-    0xFF,
-    0xF2,
-    0x61,
-    0xC1,
-    0x08,
-    0xFF,
-    0x90,
-    0x61,
-    0x43,
-    0x00,
-    0x00,
-    0x41,
-    0x61,
-    0xF3,
-    0x7F,
-    0x00,
-    0x00,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x3F,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x10,
-    0x00,
-    0x00,
-    0x10,
-    0x09,
-    0x00,
-    0x00,
-    0x00,
-    0x01,
-    0x61,
-    0x00,
-    0x00,
-    0x40,
-    0x10,
-    0x61,
-    0xEE,
-    0x00,
-    0x00,
-    0x00,
-    0x61,
-    0xEF,
-    0x00,
-    0x00,
-    0x00,
-    0x61,
-    0xF0,
-    0x00,
-    0x00,
-    0x00,
-    0x61,
-    0xF1,
-    0x00,
-    0x00,
-    0x00,
-    0x61,
-    0xF2,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    /* padding */
-    0x00,
+SECTION_DATA static u8 l_matDL[] ALIGN_DECL(32) = {
+    0x10, 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x04, 0x00, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00,
+    0x04, 0x00, 0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xF2, 0x61, 0xC1, 0x08, 0xFF,
+    0x90, 0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0xF3, 0x7F, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x3F,
+    0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, 0x00,
+    0x40, 0x10, 0x61, 0xEE, 0x00, 0x00, 0x00, 0x61, 0xEF, 0x00, 0x00, 0x00, 0x61, 0xF0, 0x00, 0x00,
+    0x00, 0x61, 0xF1, 0x00, 0x00, 0x00, 0x61, 0xF2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
 /* 803A8D7C-803A8D8C 005E9C 0010+00 1/1 0/0 0/0 .data            l_imageDrawColor$5405 */
-SECTION_DATA static GXColor l_imageDrawColor[4] = {{0xFF, 0x00, 0x00, 0x00},
-                                                    {0x00, 0xFF, 0x00, 0x00},
-                                                    {0x00, 0x00, 0xFF, 0x00},
-                                                    {0x00, 0x00, 0x00, 0xFF}};
+SECTION_DATA static GXColor l_imageDrawColor[4] = {
+    {255, 0, 0, 0},
+    {0, 255, 0, 0},
+    {0, 0, 255, 0},
+    {0, 0, 0, 255},
+};
 
 /* 803A8D8C-803A8D9C 005EAC 0010+00 0/1 0/0 0/0 .data            l_tevColorChan$5438 */
 #pragma push
 #pragma force_active on
-SECTION_DATA static GXTevColor l_tevColorChan[4] = {GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE,
-                                                    GX_CH_ALPHA};
+SECTION_DATA static GXTevColor l_tevColorChan[4] = {
+    GX_CH_RED,
+    GX_CH_GREEN,
+    GX_CH_BLUE,
+    GX_CH_ALPHA,
+};
 #pragma pop
 
 /* 803A8D9C-803A8DCC 005EBC 0030+00 0/0 0/0 0/0 .data            mtx_adj$5842 */
 #pragma push
 #pragma force_active on
-SECTION_DATA static u8 mtx_adj[48] = {
-    0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+SECTION_DATA static Mtx mtx_adj = {
+    {0.5f, 0.0f, 0.0f, 0.5f},
+    {0.0f, -0.5f, 0.0f, 0.5f},
+    {0.0f, 0.0f, 1.0f, 0.0f},
 };
 #pragma pop
 
@@ -2759,52 +1371,20 @@ dDlst_shadowSimple_c::dDlst_shadowSimple_c() {
 /* ############################################################################################## */
 /* 8037A178-8037A1A4 0067D8 002A+02 1/1 0/0 0/0 .rodata          l_drawlistSize$5656 */
 SECTION_RODATA static u16 const l_drawlistSize[21] = {
-    0x0001,
-    0x0001,
-    0x0001,
-    0x0080,
-    0x0001,
-    0x0001,
-    0x0001,
-    0x0080,
-    0x0100,
-    0x0001,
-    0x0100,
-    0x0001,
-    0x0020,
-    0x0010,
-    0x0010,
-    0x0020,
-    0x0020,
-    0x0100,
-    0x0001,
-    0x0004,
-    0x0004,
+    0x0001, 0x0001, 0x0001, 0x0080, 0x0001, 0x0001, 0x0001, 0x0080, 0x0100, 0x0001, 0x0100,
+    0x0001, 0x0020, 0x0010, 0x0010, 0x0020, 0x0020, 0x0100, 0x0001, 0x0004, 0x0004,
 };
 COMPILER_STRIP_GATE(0x8037A178, &l_drawlistSize);
 
 /* 8037A1A4-8037A1B0 006804 0009+03 1/1 0/0 0/0 .rodata          l_nonSortId$5662 */
 SECTION_RODATA static u8 const l_nonSortId[9] = {
-    0x00,
-    0x01,
-    0x02,
-    0x04,
-    0x05,
-    0x06,
-    0x09,
-    0x12,
-    0x0D,
+    0x00, 0x01, 0x02, 0x04, 0x05, 0x06, 0x09, 0x12, 0x0D,
 };
 COMPILER_STRIP_GATE(0x8037A1A4, &l_nonSortId);
 
 /* 804520C4-804520CC 0006C4 0006+02 1/1 0/0 0/0 .sdata2          l_zSortId$5668 */
 SECTION_SDATA2 static u8 l_zSortId[6] = {
-    0x08,
-    0x0A,
-    0x0C,
-    0x0E,
-    0x10,
-    0x11,
+    0x08, 0x0A, 0x0C, 0x0E, 0x10, 0x11,
 };
 
 /* 80056390-8005648C 050CD0 00FC+00 0/0 1/1 0/0 .text            init__12dDlst_list_cFv */
@@ -2812,7 +1392,7 @@ SECTION_SDATA2 static u8 l_zSortId[6] = {
 void dDlst_list_c::init() {
     J3DDrawBuffer** buffer = mDrawBuffers;
     const u16* size = l_drawlistSize;
-    
+
     for (int i = 0; i < 21; i++) {
         u32 bufSize = *size;
         size++;
@@ -2959,7 +1539,7 @@ u8 dDlst_list_c::mWipe;
 f32 dDlst_list_c::mWipeRate;
 
 /* 80450ED8-80450EE0 0003D8 0004+04 2/2 0/0 0/0 .sbss            mWipeSpeed__12dDlst_list_c */
-f32 dDlst_list_c::mWipeSpeed[1 + 1 /* padding */];
+f32 dDlst_list_c::mWipeSpeed;
 
 /* 804520D0-804520D4 0006D0 0004+00 1/1 0/0 0/0 .sdata2          @5809 */
 SECTION_SDATA2 static f32 lit_5809 = 608.0f;
@@ -2972,24 +1552,35 @@ SECTION_SDATA2 static f32 lit_5811 = 2.436000108718872f;
 
 /* 8005681C-800568D8 05115C 00BC+00 1/1 0/0 0/0 .text            wipeIn__12dDlst_list_cFfR8_GXColor
  */
+// matches with literals
+#ifdef NONMATCHING
+void dDlst_list_c::wipeIn(f32 i_wipeSpeed, GXColor& i_wipeColor) {
+    mWipe = true;
+    mWipeSpeed = i_wipeSpeed;
+    mWipeColor = i_wipeColor;
+    mWipeRate = i_wipeSpeed >= 0.0f ? 0.0f : 1.0f;
+
+    JKRArchive* main2d = dComIfGp_getMain2DArchive();
+    ResTIMG* texture = (ResTIMG*)JKRArchive::getGlbResource('TIMG', "wipe_00.bti", main2d);
+
+    mWipeDlst.init(texture, mDoGph_gInf_c::getMinX(), mDoGph_gInf_c::getMinY(),
+                   mDoGph_gInf_c::getWidth(), mDoGph_gInf_c::getHeight(), 0, 1, 1, 2.0f, 2.436f);
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void dDlst_list_c::wipeIn(f32 param_0, _GXColor& param_1) {
+asm void dDlst_list_c::wipeIn(f32 i_wipeSpeed, GXColor& i_wipeColor) {
     nofralloc
 #include "asm/d/d_drawlist/wipeIn__12dDlst_list_cFfR8_GXColor.s"
 }
 #pragma pop
+#endif
 
 /* 800568D8-80056900 051218 0028+00 0/0 1/1 0/0 .text            wipeIn__12dDlst_list_cFf */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dDlst_list_c::wipeIn(f32 param_0) {
-    nofralloc
-#include "asm/d/d_drawlist/wipeIn__12dDlst_list_cFf.s"
+void dDlst_list_c::wipeIn(f32 i_wipeSpeed) {
+    wipeIn(-i_wipeSpeed, g_blackColor);
 }
-#pragma pop
 
 /* ############################################################################################## */
 /* 804520DC-804520E0 0006DC 0004+00 1/1 0/0 0/0 .sdata2          @5838 */
@@ -3060,6 +1651,6 @@ SECTION_DATA extern void* __vt__13dDlst_2DTri_c[3] = {
 
 /* 80450EE0-80450EE8 0003E0 0008+00 0/0 1/1 0/0 .sbss            None */
 extern u8 data_80450EE0[8];
-u8 data_80450EE0[8];
+u8 data_80450EE0[8] ALIGN_DECL(8);
 
 /* 8037A1B0-8037A1B0 006810 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */