From 2d3a2fb8153b6f3424c32ef2dfb9d19ca80f109a Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sat, 23 Apr 2022 15:08:33 -0700
Subject: J3DSys: loadMtxIndx

---
 libs/JSystem/J3DGraphBase/J3DSys.cpp | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'libs/JSystem/J3DGraphBase')

diff --git a/libs/JSystem/J3DGraphBase/J3DSys.cpp b/libs/JSystem/J3DGraphBase/J3DSys.cpp
index 11dc04e293..17b43d88f2 100644
--- a/libs/JSystem/J3DGraphBase/J3DSys.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DSys.cpp
@@ -85,25 +85,21 @@ asm J3DSys::J3DSys() {
 }
 #pragma pop
 
+static inline void J3DFifoLoadIndx(u8 cmd, u16 indx, u16 addr) {
+    GFX_FIFO(u8) = cmd;
+    GFX_FIFO(u16) = indx;
+    GFX_FIFO(u16) = addr;
+}
+
 /* 8030FEC0-8030FEE4 30A800 0024+00 0/0 1/1 0/0 .text            loadPosMtxIndx__6J3DSysCFiUs */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void J3DSys::loadPosMtxIndx(int param_0, u16 param_1) const {
-    nofralloc
-#include "asm/JSystem/J3DGraphBase/J3DSys/loadPosMtxIndx__6J3DSysCFiUs.s"
+void J3DSys::loadPosMtxIndx(int addr, u16 indx) const {
+    J3DFifoLoadIndx(GX_CMD_LOAD_INDX_A, indx, 0xB000 | ((u16)(addr * 0x0C)));
 }
-#pragma pop
 
 /* 8030FEE4-8030FF0C 30A824 0028+00 0/0 1/1 0/0 .text            loadNrmMtxIndx__6J3DSysCFiUs */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void J3DSys::loadNrmMtxIndx(int param_0, u16 param_1) const {
-    nofralloc
-#include "asm/JSystem/J3DGraphBase/J3DSys/loadNrmMtxIndx__6J3DSysCFiUs.s"
+void J3DSys::loadNrmMtxIndx(int addr, u16 indx) const {
+    J3DFifoLoadIndx(GX_CMD_LOAD_INDX_B, indx, 0x8000 | ((u16)((addr * 0x09) + 0x400)));
 }
-#pragma pop
 
 /* ############################################################################################## */
 /* 803A1DF8-803A1E08 02E458 0010+00 1/1 0/0 0/0 .rodata          @695 */
-- 
cgit v1.2.3