From 981cfe7283c0a39b8d1845d8ba59f3bb1e192932 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Fri, 19 Jan 2024 16:22:19 -0800 Subject: almost all of dolphin matched (#2036) * TRK full match * remove trk asm * ar done * cleanup some dolphin headers * more dolphin cleanup * cleanup / GD fully matched * almost all of GX fully matched * GX / Mtx full matched * most of OS done * pad done * most of VI * remove asm * forgot couple vec funcs * couple JUtility matches --- include/JSystem/J3DGraphBase/J3DGD.h | 22 +++++++++++----------- include/JSystem/J3DGraphBase/J3DShape.h | 18 +++++++++--------- include/JSystem/J3DGraphBase/J3DShapeMtx.h | 2 +- include/JSystem/J3DGraphBase/J3DStruct.h | 2 +- include/JSystem/J3DGraphBase/J3DSys.h | 2 +- include/JSystem/J3DGraphBase/J3DTexture.h | 2 +- include/JSystem/J3DGraphBase/J3DTransform.h | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) (limited to 'include/JSystem/J3DGraphBase') diff --git a/include/JSystem/J3DGraphBase/J3DGD.h b/include/JSystem/J3DGraphBase/J3DGD.h index 2ff7131106..1a10836999 100644 --- a/include/JSystem/J3DGraphBase/J3DGD.h +++ b/include/JSystem/J3DGraphBase/J3DGD.h @@ -2,7 +2,7 @@ #define J3DGD_H #include "dolphin/gd/GDBase.h" -#include "dolphin/gx/GX.h" +#include "dolphin/gx.h" inline void J3DGDWrite_u8(u8 param) { __GDWrite(param); @@ -31,8 +31,8 @@ inline void J3DGDWriteBPCmd(u32 cmd) { } inline void J3DFifoLoadBPCmd(u32 cmd) { - GFX_FIFO(u8) = 0x61; - GFX_FIFO(u32) = cmd; + GXWGFifo.u8 = 0x61; + GXWGFifo.u32 = cmd; } inline void J3DGDWriteXFCmd(u16 addr, u32 cmd) { @@ -49,17 +49,17 @@ inline void J3DGDWriteXFCmdHdr(u16 addr, u8 len) { } inline void J3DFifoWriteXFCmdHdr(u16 addr, u8 len) { - GFX_FIFO(u8) = 0x10; - GFX_FIFO(u16) = len - 1; - GFX_FIFO(u16) = addr; + GXWGFifo.u8 = 0x10; + GXWGFifo.u16 = len - 1; + GXWGFifo.u16 = addr; } inline void J3DGXCmd1f32ptr(f32* value) { - GFX_FIFO(u32) = *(u32*)value; + GXWGFifo.u32 = *(u32*)value; } inline void J3DGXCmd1f32(f32 value) { - GFX_FIFO(u32) = *(u32*)&value; + GXWGFifo.u32 = *(u32*)&value; } inline void J3DGDWriteCPCmd(u8 reg, u32 value) { @@ -104,9 +104,9 @@ void J3DFifoLoadNrmMtxToTexMtx3x3(f32 (*)[3], u32); void J3DFifoLoadTexCached(GXTexMapID, u32, GXTexCacheSize, u32, GXTexCacheSize); static inline void J3DFifoLoadIndx(u8 cmd, u16 indx, u16 addr) { - GFX_FIFO(u8) = cmd; - GFX_FIFO(u16) = indx; - GFX_FIFO(u16) = addr; + GXWGFifo.u8 = cmd; + GXWGFifo.u16 = indx; + GXWGFifo.u16 = addr; } inline void J3DGDSetNumChans(u8 numChans) { diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h index afa53214db..e045b31edc 100644 --- a/include/JSystem/J3DGraphBase/J3DShape.h +++ b/include/JSystem/J3DGraphBase/J3DShape.h @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphBase/J3DShapeDraw.h" #include "JSystem/J3DGraphBase/J3DShapeMtx.h" -#include "dolphin/gx/GX.h" +#include "dolphin/gx.h" #include "dolphin/types.h" class J3DCurrentMtxInfo { @@ -13,15 +13,15 @@ public: }; static inline void J3DFifoWriteCPCmd(u8 cmd, u32 param) { - GFX_FIFO(u8) = GX_CMD_LOAD_CP_REG; - GFX_FIFO(u8) = cmd; - GFX_FIFO(u32) = param; + GXWGFifo.u8 = GX_CMD_LOAD_CP_REG; + GXWGFifo.u8 = cmd; + GXWGFifo.u32 = param; } static inline void J3DFifoWriteXFCmd(u16 cmd, u16 len) { - GFX_FIFO(u8) = GX_CMD_LOAD_XF_REG; - GFX_FIFO(u16) = (len - 1); - GFX_FIFO(u16) = cmd; + GXWGFifo.u8 = GX_CMD_LOAD_XF_REG; + GXWGFifo.u16 = (len - 1); + GXWGFifo.u16 = cmd; } class J3DCurrentMtx : public J3DCurrentMtxInfo { @@ -44,8 +44,8 @@ public: J3DFifoWriteCPCmd(0x30, getMtxIdxRegA()); // CP_MATINDEX_A J3DFifoWriteCPCmd(0x40, getMtxIdxRegB()); // CP_MATINDEX_B J3DFifoWriteXFCmd(0x1018, 2); - GFX_FIFO(u32) = getMtxIdxRegA(); - GFX_FIFO(u32) = getMtxIdxRegB(); + GXWGFifo.u32 = getMtxIdxRegA(); + GXWGFifo.u32 = getMtxIdxRegB(); } void setCurrentTexMtx(u8 param_1, u8 param_2, u8 param_3, u8 param_4, diff --git a/include/JSystem/J3DGraphBase/J3DShapeMtx.h b/include/JSystem/J3DGraphBase/J3DShapeMtx.h index 824ab06de0..222d35a0a1 100644 --- a/include/JSystem/J3DGraphBase/J3DShapeMtx.h +++ b/include/JSystem/J3DGraphBase/J3DShapeMtx.h @@ -1,7 +1,7 @@ #ifndef J3DSHAPEMTX_H #define J3DSHAPEMTX_H -#include "dolphin/mtx/mtxvec.h" +#include "dolphin/mtx.h" class J3DTexMtx; class J3DTexGenBlock; diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h index 1932113cb1..06fb45e5b0 100644 --- a/include/JSystem/J3DGraphBase/J3DStruct.h +++ b/include/JSystem/J3DGraphBase/J3DStruct.h @@ -2,7 +2,7 @@ #define J3DSTRUCT_H #include "dolphin/gx/GXStruct.h" -#include "dolphin/mtx/mtx.h" +#include "dolphin/mtx.h" #include "dolphin/mtx/mtx44.h" #include "dolphin/mtx/vec.h" diff --git a/include/JSystem/J3DGraphBase/J3DSys.h b/include/JSystem/J3DGraphBase/J3DSys.h index a7a3469938..774f303fc1 100644 --- a/include/JSystem/J3DGraphBase/J3DSys.h +++ b/include/JSystem/J3DGraphBase/J3DSys.h @@ -1,7 +1,7 @@ #ifndef J3DSYS_H #define J3DSYS_H -#include "dolphin/gx/GX.h" +#include "dolphin/gx.h" #include "dolphin/types.h" // Perhaps move to a new J3DEnum.h? diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h index a37ceb8006..c0741a4d0a 100644 --- a/include/JSystem/J3DGraphBase/J3DTexture.h +++ b/include/JSystem/J3DGraphBase/J3DTexture.h @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphBase/J3DStruct.h" #include "JSystem/JUtility/JUTTexture.h" -#include "dolphin/mtx/mtx.h" +#include "dolphin/mtx.h" #include "dolphin/types.h" class J3DTexture { diff --git a/include/JSystem/J3DGraphBase/J3DTransform.h b/include/JSystem/J3DGraphBase/J3DTransform.h index 5cd4601ef5..5ffe0a73d9 100644 --- a/include/JSystem/J3DGraphBase/J3DTransform.h +++ b/include/JSystem/J3DGraphBase/J3DTransform.h @@ -2,7 +2,7 @@ #define J3DTRANSFORM_H #include "JSystem/JGeometry.h" -#include "dolphin/mtx/mtxvec.h" +#include "dolphin/mtx.h" struct J3DTextureSRTInfo; -- cgit v1.2.3