From 1c1e65bc4b018b87159348c80dc5ea8feed8c6f2 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Tue, 4 Jun 2024 23:25:37 +0300 Subject: [PATCH] Work on J3DMatBlock (#2164) --- ...IDUl15_GXTexCacheSizeUl15_GXTexCacheSize.s | 33 - .../J3DMatBlock/__dt__13J3DPEBlockOpaFv.s | 26 - .../J3DMatBlock/__dt__13J3DPEBlockXluFv.s | 26 - .../J3DMatBlock/__dt__14J3DPEBlockFullFv.s | 26 - .../J3DMatBlock/__dt__15J3DIndBlockFullFv.s | 42 - .../J3DMatBlock/__dt__16J3DPEBlockFogOffFv.s | 26 - .../J3DMatBlock/__dt__17J3DPEBlockTexEdgeFv.s | 26 - .../__dt__22J3DColorBlockAmbientOnFv.s | 30 - .../J3DMatBlock/__sinit_J3DMatBlock_cpp.s | 10 - .../diffBlend__14J3DPEBlockFullFv.s | 196 -- .../diffBlend__16J3DPEBlockFogOffFv.s | 196 -- .../J3DMatBlock/diffFog__14J3DPEBlockFullFv.s | 32 - .../diffLightObj__20J3DColorBlockLightOnFUl.s | 30 - .../diffTevReg__12J3DTevBlock2Fv.s | 42 - .../diffTevReg__12J3DTevBlock4Fv.s | 42 - .../diffTevReg__13J3DTevBlock16Fv.s | 42 - .../diffTevReg__18J3DTevBlockPatchedFv.s | 42 - .../diffTevStageIndirect__12J3DTevBlock1Fv.s | 33 - .../diffTevStageIndirect__12J3DTevBlock2Fv.s | 46 - .../diffTevStageIndirect__12J3DTevBlock4Fv.s | 46 - .../diffTevStageIndirect__13J3DTevBlock16Fv.s | 46 - ...TevStageIndirect__18J3DTevBlockPatchedFv.s | 46 - .../diffTevStage__12J3DTevBlock1Fv.s | 61 - .../diffTevStage__12J3DTevBlock2Fv.s | 71 - .../diffTevStage__12J3DTevBlock4Fv.s | 71 - .../diffTevStage__13J3DTevBlock16Fv.s | 71 - .../diffTevStage__18J3DTevBlockPatchedFv.s | 71 - .../diffTexCoordScale__12J3DTevBlock1Fv.s | 27 - .../diffTexCoordScale__12J3DTevBlock2Fv.s | 50 - .../diffTexCoordScale__12J3DTevBlock4Fv.s | 65 - .../diffTexCoordScale__13J3DTevBlock16Fv.s | 65 - ...iffTexCoordScale__18J3DTevBlockPatchedFv.s | 65 - .../diffTexGen__21J3DTexGenBlockPatchedFv.s | 15 - .../diffTexMtx__21J3DTexGenBlockPatchedFv.s | 27 - .../J3DMatBlock/diffTexNo__12J3DTevBlock1Fv.s | 16 - .../J3DMatBlock/diffTexNo__12J3DTevBlock2Fv.s | 28 - .../J3DMatBlock/diffTexNo__12J3DTevBlock4Fv.s | 28 - .../diffTexNo__13J3DTevBlock16Fv.s | 28 - .../diffTexNo__18J3DTevBlockPatchedFv.s | 28 - .../J3DMatBlock/diff__11J3DTevBlockFUl.s | 52 - .../J3DMatBlock/diff__14J3DPEBlockFullFUl.s | 29 - .../J3DMatBlock/diff__15J3DIndBlockFullFUl.s | 58 - .../J3DMatBlock/diff__16J3DPEBlockFogOffFUl.s | 15 - .../diff__21J3DTexGenBlockPatchedFUl.s | 28 - .../getAlphaComp__14J3DPEBlockFullFv.s | 3 - .../getAlphaComp__16J3DPEBlockFogOffFv.s | 3 - .../getBlend__14J3DPEBlockFullFv.s | 3 - .../getBlend__16J3DPEBlockFogOffFv.s | 3 - ...ColorChanNum__21J3DColorBlockLightOffCFv.s | 3 - ...orChanOffset__21J3DColorBlockLightOffCFv.s | 3 - ...getColorChan__21J3DColorBlockLightOffFUl.s | 6 - .../getCullMode__21J3DColorBlockLightOffCFv.s | 3 - .../getDither__14J3DPEBlockFullCFv.s | 3 - .../getDither__16J3DPEBlockFogOffCFv.s | 3 - .../getFogOffset__14J3DPEBlockFullCFv.s | 3 - .../J3DMatBlock/getFog__14J3DPEBlockFullFv.s | 3 - ...etIndTexCoordScale__15J3DIndBlockFullFUl.s | 6 - .../getIndTexMtx__15J3DIndBlockFullFUl.s | 6 - .../getIndTexOrder__15J3DIndBlockFullFUl.s | 6 - .../getIndTexStageNum__15J3DIndBlockFullCFv.s | 3 - ...tColorOffset__21J3DColorBlockLightOffCFv.s | 3 - .../getMatColor__21J3DColorBlockLightOffFUl.s | 6 - .../getZCompLoc__14J3DPEBlockFullCFv.s | 3 - .../getZCompLoc__16J3DPEBlockFogOffCFv.s | 3 - .../getZMode__14J3DPEBlockFullFv.s | 3 - .../getZMode__16J3DPEBlockFogOffFv.s | 3 - .../indexToPtr__13J3DTevBlock16Fv.s | 10 - .../indexToPtr_private__11J3DTevBlockFUl.s | 40 - .../initialize__12J3DTevBlock2Fv.s | 58 - .../initialize__12J3DTevBlock4Fv.s | 72 - .../initialize__13J3DTevBlock16Fv.s | 81 - .../initialize__18J3DTevBlockPatchedFv.s | 72 - .../initialize__20J3DColorBlockLightOnFv.s | 53 - .../initialize__21J3DColorBlockLightOffFv.s | 26 - .../initialize__22J3DColorBlockAmbientOnFv.s | 44 - .../J3DMatBlock/load__12J3DTevBlock1Fv.s | 147 - .../J3DMatBlock/load__12J3DTevBlock2Fv.s | 335 --- .../J3DMatBlock/load__12J3DTevBlock4Fv.s | 347 --- .../J3DMatBlock/load__13J3DTevBlock16Fv.s | 348 --- .../J3DMatBlock/load__14J3DPEBlockFullFv.s | 318 -- .../J3DMatBlock/load__16J3DPEBlockFogOffFv.s | 300 -- .../patchTevReg__12J3DTevBlock2Fv.s | 54 - .../patchTevReg__12J3DTevBlock4Fv.s | 54 - .../patchTevReg__13J3DTevBlock16Fv.s | 54 - .../patchTevReg__18J3DTevBlockPatchedFv.s | 54 - ...hTexNoAndTexCoordScale__12J3DTevBlock1Fv.s | 59 - ...hTexNoAndTexCoordScale__12J3DTevBlock2Fv.s | 87 - ...hTexNoAndTexCoordScale__12J3DTevBlock4Fv.s | 100 - ...TexNoAndTexCoordScale__13J3DTevBlock16Fv.s | 100 - ...AndTexCoordScale__18J3DTevBlockPatchedFv.s | 100 - .../patchTexNo__12J3DTevBlock1Fv.s | 30 - .../patchTexNo__12J3DTevBlock2Fv.s | 40 - .../patchTexNo__12J3DTevBlock4Fv.s | 40 - .../patchTexNo__13J3DTevBlock16Fv.s | 40 - .../patchTexNo__18J3DTevBlockPatchedFv.s | 40 - .../J3DMatBlock/patch__12J3DTevBlock1Fv.s | 12 - .../J3DMatBlock/patch__12J3DTevBlock2Fv.s | 20 - .../J3DMatBlock/patch__12J3DTevBlock4Fv.s | 20 - .../J3DMatBlock/patch__13J3DTevBlock16Fv.s | 20 - .../J3DMatBlock/patch__14J3DPEBlockFullFv.s | 46 - .../J3DMatBlock/patch__15J3DTexGenBlock4Fv.s | 45 - .../patch__18J3DTevBlockPatchedFv.s | 20 - .../patch__19J3DTexGenBlockBasicFv.s | 45 - .../patch__21J3DColorBlockLightOffFv.s | 20 - .../ptrToIndex__13J3DTevBlock16Fv.s | 60 - .../ptrToIndex__18J3DTevBlockPatchedFv.s | 60 - ..._20J3DColorBlockLightOnFP13J3DColorBlock.s | 89 - ...21J3DColorBlockLightOffFP13J3DColorBlock.s | 58 - ...2J3DColorBlockAmbientOnFP13J3DColorBlock.s | 89 - ...aComp__14J3DPEBlockFullFPC12J3DAlphaComp.s | 8 - ...aComp__14J3DPEBlockFullFRC12J3DAlphaComp.s | 8 - ...omp__16J3DPEBlockFogOffFPC12J3DAlphaComp.s | 8 - ...omp__16J3DPEBlockFogOffFRC12J3DAlphaComp.s | 8 - .../setBlend__14J3DPEBlockFullFPC8J3DBlend.s | 4 - .../setBlend__14J3DPEBlockFullFRC8J3DBlend.s | 4 - ...setBlend__16J3DPEBlockFogOffFPC8J3DBlend.s | 4 - ...setBlend__16J3DPEBlockFogOffFRC8J3DBlend.s | 4 - ...lorChanNum__21J3DColorBlockLightOffFPCUc.s | 4 - ...J3DColorBlockLightOffFUlPC12J3DColorChan.s | 6 - ...J3DColorBlockLightOffFUlRC12J3DColorChan.s | 6 - ...etCullMode__21J3DColorBlockLightOffFPCUc.s | 4 - .../setDither__14J3DPEBlockFullFPCUc.s | 4 - .../setDither__16J3DPEBlockFogOffFPCUc.s | 4 - .../setFog__14J3DPEBlockFullF6J3DFog.s | 10 - .../setFog__14J3DPEBlockFullFP6J3DFog.s | 10 - ...5J3DIndBlockFullFUl19J3DIndTexCoordScale.s | 6 - ...3DIndBlockFullFUlPC19J3DIndTexCoordScale.s | 6 - ...xMtx__15J3DIndBlockFullFUl12J3DIndTexMtx.s | 14 - ...tx__15J3DIndBlockFullFUlPC12J3DIndTexMtx.s | 14 - ...er__15J3DIndBlockFullFUl14J3DIndTexOrder.s | 6 - ...__15J3DIndBlockFullFUlPC14J3DIndTexOrder.s | 6 - ...__21J3DColorBlockLightOffFUl10J3DGXColor.s | 12 - ...21J3DColorBlockLightOffFUlPC10J3DGXColor.s | 12 - .../setTexNo__13J3DTevBlock16FUlUs.s | 5 - .../setZCompLoc__14J3DPEBlockFullFPCUc.s | 4 - .../setZCompLoc__16J3DPEBlockFogOffFPCUc.s | 4 - .../setZMode__14J3DPEBlockFullF8J3DZMode.s | 4 - .../setZMode__14J3DPEBlockFullFPC8J3DZMode.s | 4 - .../setZMode__16J3DPEBlockFogOffF8J3DZMode.s | 4 - ...setZMode__16J3DPEBlockFogOffFPC8J3DZMode.s | 4 - include/JSystem/J3DGraphBase/J3DGD.h | 43 + include/JSystem/J3DGraphBase/J3DMatBlock.h | 206 +- include/JSystem/J3DGraphBase/J3DMaterial.h | 4 +- include/JSystem/J3DGraphBase/J3DStruct.h | 33 +- include/JSystem/J3DGraphBase/J3DTevs.h | 47 +- include/JSystem/J3DGraphBase/J3DTexture.h | 5 + libs/JSystem/J3DGraphBase/J3DGD.cpp | 81 +- libs/JSystem/J3DGraphBase/J3DMatBlock.cpp | 2609 ++++++++++------- libs/JSystem/J3DGraphBase/J3DMaterial.cpp | 23 +- libs/JSystem/J3DGraphBase/J3DStruct.cpp | 18 +- libs/JSystem/J3DGraphBase/J3DSys.cpp | 2 - libs/JSystem/J3DGraphBase/J3DTevs.cpp | 2 +- .../J3DGraphLoader/J3DMaterialFactory.cpp | 4 +- rel/d/a/d_a_vrbox/d_a_vrbox.cpp | 2 +- src/d/d_resorce.cpp | 2 +- src/m_Do/m_Do_ext.cpp | 34 +- 156 files changed, 1842 insertions(+), 7315 deletions(-) delete mode 100644 asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DPEBlockOpaFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DPEBlockXluFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__14J3DPEBlockFullFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__15J3DIndBlockFullFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__16J3DPEBlockFogOffFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__17J3DPEBlockTexEdgeFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__22J3DColorBlockAmbientOnFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/__sinit_J3DMatBlock_cpp.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffBlend__14J3DPEBlockFullFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffBlend__16J3DPEBlockFogOffFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffFog__14J3DPEBlockFullFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffLightObj__20J3DColorBlockLightOnFUl.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__12J3DTevBlock2Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__12J3DTevBlock4Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__13J3DTevBlock16Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__18J3DTevBlockPatchedFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__12J3DTevBlock1Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__12J3DTevBlock2Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__12J3DTevBlock4Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__13J3DTevBlock16Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__18J3DTevBlockPatchedFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__12J3DTevBlock1Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__12J3DTevBlock2Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__12J3DTevBlock4Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__13J3DTevBlock16Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__18J3DTevBlockPatchedFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock1Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock2Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock4Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__13J3DTevBlock16Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__18J3DTevBlockPatchedFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexGen__21J3DTexGenBlockPatchedFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexMtx__21J3DTexGenBlockPatchedFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__12J3DTevBlock1Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__12J3DTevBlock2Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__12J3DTevBlock4Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__13J3DTevBlock16Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__18J3DTevBlockPatchedFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diff__11J3DTevBlockFUl.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diff__14J3DPEBlockFullFUl.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diff__15J3DIndBlockFullFUl.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diff__16J3DPEBlockFogOffFUl.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/diff__21J3DTexGenBlockPatchedFUl.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getAlphaComp__14J3DPEBlockFullFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getAlphaComp__16J3DPEBlockFogOffFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getBlend__14J3DPEBlockFullFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getBlend__16J3DPEBlockFogOffFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChanNum__21J3DColorBlockLightOffCFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChanOffset__21J3DColorBlockLightOffCFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChan__21J3DColorBlockLightOffFUl.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getCullMode__21J3DColorBlockLightOffCFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getDither__14J3DPEBlockFullCFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getDither__16J3DPEBlockFogOffCFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getFogOffset__14J3DPEBlockFullCFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getFog__14J3DPEBlockFullFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexCoordScale__15J3DIndBlockFullFUl.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexMtx__15J3DIndBlockFullFUl.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexOrder__15J3DIndBlockFullFUl.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexStageNum__15J3DIndBlockFullCFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getMatColorOffset__21J3DColorBlockLightOffCFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getMatColor__21J3DColorBlockLightOffFUl.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getZCompLoc__14J3DPEBlockFullCFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getZCompLoc__16J3DPEBlockFogOffCFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getZMode__14J3DPEBlockFullFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/getZMode__16J3DPEBlockFogOffFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/indexToPtr__13J3DTevBlock16Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/indexToPtr_private__11J3DTevBlockFUl.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__12J3DTevBlock2Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__12J3DTevBlock4Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__13J3DTevBlock16Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__18J3DTevBlockPatchedFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__20J3DColorBlockLightOnFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__21J3DColorBlockLightOffFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__22J3DColorBlockAmbientOnFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock1Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock2Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock4Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/load__13J3DTevBlock16Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/load__14J3DPEBlockFullFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/load__16J3DPEBlockFogOffFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__12J3DTevBlock2Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__12J3DTevBlock4Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__13J3DTevBlock16Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__18J3DTevBlockPatchedFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock1Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock2Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock4Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__13J3DTevBlock16Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__18J3DTevBlockPatchedFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__12J3DTevBlock1Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__12J3DTevBlock2Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__12J3DTevBlock4Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__13J3DTevBlock16Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__18J3DTevBlockPatchedFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patch__12J3DTevBlock1Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patch__12J3DTevBlock2Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patch__12J3DTevBlock4Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patch__13J3DTevBlock16Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patch__14J3DPEBlockFullFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patch__15J3DTexGenBlock4Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patch__18J3DTevBlockPatchedFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patch__19J3DTexGenBlockBasicFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/patch__21J3DColorBlockLightOffFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/ptrToIndex__13J3DTevBlock16Fv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/ptrToIndex__18J3DTevBlockPatchedFv.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/reset__20J3DColorBlockLightOnFP13J3DColorBlock.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/reset__21J3DColorBlockLightOffFP13J3DColorBlock.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/reset__22J3DColorBlockAmbientOnFP13J3DColorBlock.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__14J3DPEBlockFullFPC12J3DAlphaComp.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__14J3DPEBlockFullFRC12J3DAlphaComp.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__16J3DPEBlockFogOffFPC12J3DAlphaComp.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__16J3DPEBlockFogOffFRC12J3DAlphaComp.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__14J3DPEBlockFullFPC8J3DBlend.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__14J3DPEBlockFullFRC8J3DBlend.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__16J3DPEBlockFogOffFPC8J3DBlend.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__16J3DPEBlockFogOffFRC8J3DBlend.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__21J3DColorBlockLightOffFPCUc.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChan__21J3DColorBlockLightOffFUlPC12J3DColorChan.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChan__21J3DColorBlockLightOffFUlRC12J3DColorChan.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__21J3DColorBlockLightOffFPCUc.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__14J3DPEBlockFullFPCUc.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__16J3DPEBlockFogOffFPCUc.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setFog__14J3DPEBlockFullF6J3DFog.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setFog__14J3DPEBlockFullFP6J3DFog.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexCoordScale__15J3DIndBlockFullFUl19J3DIndTexCoordScale.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexCoordScale__15J3DIndBlockFullFUlPC19J3DIndTexCoordScale.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexMtx__15J3DIndBlockFullFUl12J3DIndTexMtx.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexMtx__15J3DIndBlockFullFUlPC12J3DIndTexMtx.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexOrder__15J3DIndBlockFullFUl14J3DIndTexOrder.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexOrder__15J3DIndBlockFullFUlPC14J3DIndTexOrder.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColor__21J3DColorBlockLightOffFUl10J3DGXColor.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColor__21J3DColorBlockLightOffFUlPC10J3DGXColor.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setTexNo__13J3DTevBlock16FUlUs.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__14J3DPEBlockFullFPCUc.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__16J3DPEBlockFogOffFPCUc.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__14J3DPEBlockFullF8J3DZMode.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__14J3DPEBlockFullFPC8J3DZMode.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__16J3DPEBlockFogOffF8J3DZMode.s delete mode 100644 asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__16J3DPEBlockFogOffFPC8J3DZMode.s diff --git a/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize.s b/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize.s deleted file mode 100644 index 38e4e1d5525..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8030FD68: -/* 8030FD68 39 40 00 61 */ li r10, 0x61 -/* 8030FD6C 3D 20 CC 01 */ lis r9, 0xCC01 /* 0xCC008000@ha */ -/* 8030FD70 99 49 80 00 */ stb r10, 0x8000(r9) /* 0xCC008000@l */ -/* 8030FD74 39 0D 83 BC */ la r8, J3DTexImage1Ids(r13) /* 8045093C-_SDA_BASE_ */ -/* 8030FD78 7C 08 18 AE */ lbzx r0, r8, r3 -/* 8030FD7C 54 08 C0 0E */ slwi r8, r0, 0x18 -/* 8030FD80 38 05 00 03 */ addi r0, r5, 3 -/* 8030FD84 54 05 90 1A */ slwi r5, r0, 0x12 -/* 8030FD88 54 84 D9 7E */ srwi r4, r4, 5 -/* 8030FD8C 54 00 78 20 */ slwi r0, r0, 0xf -/* 8030FD90 7C 80 03 78 */ or r0, r4, r0 -/* 8030FD94 7C A0 03 78 */ or r0, r5, r0 -/* 8030FD98 7D 00 03 78 */ or r0, r8, r0 -/* 8030FD9C 90 09 80 00 */ stw r0, -0x8000(r9) -/* 8030FDA0 2C 07 00 03 */ cmpwi r7, 3 -/* 8030FDA4 4D 82 00 20 */ beqlr -/* 8030FDA8 3C 00 00 10 */ lis r0, 0x10 -/* 8030FDAC 7C 06 00 40 */ cmplw r6, r0 -/* 8030FDB0 4C 80 00 20 */ bgelr -/* 8030FDB4 99 49 80 00 */ stb r10, -0x8000(r9) -/* 8030FDB8 38 8D 83 C4 */ la r4, J3DTexImage2Ids(r13) /* 80450944-_SDA_BASE_ */ -/* 8030FDBC 7C 04 18 AE */ lbzx r0, r4, r3 -/* 8030FDC0 54 05 C0 0E */ slwi r5, r0, 0x18 -/* 8030FDC4 38 07 00 03 */ addi r0, r7, 3 -/* 8030FDC8 54 04 90 1A */ slwi r4, r0, 0x12 -/* 8030FDCC 54 C3 D9 7E */ srwi r3, r6, 5 -/* 8030FDD0 54 00 78 20 */ slwi r0, r0, 0xf -/* 8030FDD4 7C 60 03 78 */ or r0, r3, r0 -/* 8030FDD8 7C 80 03 78 */ or r0, r4, r0 -/* 8030FDDC 7C A0 03 78 */ or r0, r5, r0 -/* 8030FDE0 90 09 80 00 */ stw r0, -0x8000(r9) -/* 8030FDE4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DPEBlockOpaFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DPEBlockOpaFv.s deleted file mode 100644 index 7f097a0c58f..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DPEBlockOpaFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80323334: -/* 80323334 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80323338 7C 08 02 A6 */ mflr r0 -/* 8032333C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80323340 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80323344 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80323348 41 82 00 30 */ beq lbl_80323378 -/* 8032334C 3C 60 80 3D */ lis r3, __vt__13J3DPEBlockOpa@ha /* 0x803CE890@ha */ -/* 80323350 38 03 E8 90 */ addi r0, r3, __vt__13J3DPEBlockOpa@l /* 0x803CE890@l */ -/* 80323354 90 1F 00 00 */ stw r0, 0(r31) -/* 80323358 41 82 00 10 */ beq lbl_80323368 -/* 8032335C 3C 60 80 3D */ lis r3, __vt__10J3DPEBlock@ha /* 0x803CDD20@ha */ -/* 80323360 38 03 DD 20 */ addi r0, r3, __vt__10J3DPEBlock@l /* 0x803CDD20@l */ -/* 80323364 90 1F 00 00 */ stw r0, 0(r31) -lbl_80323368: -/* 80323368 7C 80 07 35 */ extsh. r0, r4 -/* 8032336C 40 81 00 0C */ ble lbl_80323378 -/* 80323370 7F E3 FB 78 */ mr r3, r31 -/* 80323374 4B FA B9 C9 */ bl __dl__FPv -lbl_80323378: -/* 80323378 7F E3 FB 78 */ mr r3, r31 -/* 8032337C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80323380 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80323384 7C 08 03 A6 */ mtlr r0 -/* 80323388 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032338C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DPEBlockXluFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DPEBlockXluFv.s deleted file mode 100644 index 27b65838dd7..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DPEBlockXluFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80323264: -/* 80323264 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80323268 7C 08 02 A6 */ mflr r0 -/* 8032326C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80323270 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80323274 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80323278 41 82 00 30 */ beq lbl_803232A8 -/* 8032327C 3C 60 80 3D */ lis r3, __vt__13J3DPEBlockXlu@ha /* 0x803CE798@ha */ -/* 80323280 38 03 E7 98 */ addi r0, r3, __vt__13J3DPEBlockXlu@l /* 0x803CE798@l */ -/* 80323284 90 1F 00 00 */ stw r0, 0(r31) -/* 80323288 41 82 00 10 */ beq lbl_80323298 -/* 8032328C 3C 60 80 3D */ lis r3, __vt__10J3DPEBlock@ha /* 0x803CDD20@ha */ -/* 80323290 38 03 DD 20 */ addi r0, r3, __vt__10J3DPEBlock@l /* 0x803CDD20@l */ -/* 80323294 90 1F 00 00 */ stw r0, 0(r31) -lbl_80323298: -/* 80323298 7C 80 07 35 */ extsh. r0, r4 -/* 8032329C 40 81 00 0C */ ble lbl_803232A8 -/* 803232A0 7F E3 FB 78 */ mr r3, r31 -/* 803232A4 4B FA BA 99 */ bl __dl__FPv -lbl_803232A8: -/* 803232A8 7F E3 FB 78 */ mr r3, r31 -/* 803232AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 803232B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803232B4 7C 08 03 A6 */ mtlr r0 -/* 803232B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 803232BC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__14J3DPEBlockFullFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__14J3DPEBlockFullFv.s deleted file mode 100644 index 0a4b01e2f65..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__14J3DPEBlockFullFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80321A70: -/* 80321A70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80321A74 7C 08 02 A6 */ mflr r0 -/* 80321A78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80321A7C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80321A80 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80321A84 41 82 00 30 */ beq lbl_80321AB4 -/* 80321A88 3C 60 80 3D */ lis r3, __vt__14J3DPEBlockFull@ha /* 0x803CDFF0@ha */ -/* 80321A8C 38 03 DF F0 */ addi r0, r3, __vt__14J3DPEBlockFull@l /* 0x803CDFF0@l */ -/* 80321A90 90 1F 00 00 */ stw r0, 0(r31) -/* 80321A94 41 82 00 10 */ beq lbl_80321AA4 -/* 80321A98 3C 60 80 3D */ lis r3, __vt__10J3DPEBlock@ha /* 0x803CDD20@ha */ -/* 80321A9C 38 03 DD 20 */ addi r0, r3, __vt__10J3DPEBlock@l /* 0x803CDD20@l */ -/* 80321AA0 90 1F 00 00 */ stw r0, 0(r31) -lbl_80321AA4: -/* 80321AA4 7C 80 07 35 */ extsh. r0, r4 -/* 80321AA8 40 81 00 0C */ ble lbl_80321AB4 -/* 80321AAC 7F E3 FB 78 */ mr r3, r31 -/* 80321AB0 4B FA D2 8D */ bl __dl__FPv -lbl_80321AB4: -/* 80321AB4 7F E3 FB 78 */ mr r3, r31 -/* 80321AB8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80321ABC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80321AC0 7C 08 03 A6 */ mtlr r0 -/* 80321AC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80321AC8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__15J3DIndBlockFullFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__15J3DIndBlockFullFv.s deleted file mode 100644 index 341381db23d..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__15J3DIndBlockFullFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_803234A0: -/* 803234A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803234A4 7C 08 02 A6 */ mflr r0 -/* 803234A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 803234AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 803234B0 93 C1 00 08 */ stw r30, 8(r1) -/* 803234B4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 803234B8 7C 9F 23 78 */ mr r31, r4 -/* 803234BC 41 82 00 64 */ beq lbl_80323520 -/* 803234C0 3C 60 80 3D */ lis r3, __vt__15J3DIndBlockFull@ha /* 0x803CE90C@ha */ -/* 803234C4 38 03 E9 0C */ addi r0, r3, __vt__15J3DIndBlockFull@l /* 0x803CE90C@l */ -/* 803234C8 90 1E 00 00 */ stw r0, 0(r30) -/* 803234CC 38 7E 00 6C */ addi r3, r30, 0x6c -/* 803234D0 3C 80 80 01 */ lis r4, __dt__19J3DIndTexCoordScaleFv@ha /* 0x8000E024@ha */ -/* 803234D4 38 84 E0 24 */ addi r4, r4, __dt__19J3DIndTexCoordScaleFv@l /* 0x8000E024@l */ -/* 803234D8 38 A0 00 04 */ li r5, 4 -/* 803234DC 38 C0 00 04 */ li r6, 4 -/* 803234E0 48 03 E8 09 */ bl __destroy_arr -/* 803234E4 38 7E 00 18 */ addi r3, r30, 0x18 -/* 803234E8 3C 80 80 01 */ lis r4, __dt__12J3DIndTexMtxFv@ha /* 0x8000E064@ha */ -/* 803234EC 38 84 E0 64 */ addi r4, r4, __dt__12J3DIndTexMtxFv@l /* 0x8000E064@l */ -/* 803234F0 38 A0 00 1C */ li r5, 0x1c -/* 803234F4 38 C0 00 03 */ li r6, 3 -/* 803234F8 48 03 E7 F1 */ bl __destroy_arr -/* 803234FC 28 1E 00 00 */ cmplwi r30, 0 -/* 80323500 41 82 00 10 */ beq lbl_80323510 -/* 80323504 3C 60 80 3D */ lis r3, __vt__11J3DIndBlock@ha /* 0x803CDDE8@ha */ -/* 80323508 38 03 DD E8 */ addi r0, r3, __vt__11J3DIndBlock@l /* 0x803CDDE8@l */ -/* 8032350C 90 1E 00 00 */ stw r0, 0(r30) -lbl_80323510: -/* 80323510 7F E0 07 35 */ extsh. r0, r31 -/* 80323514 40 81 00 0C */ ble lbl_80323520 -/* 80323518 7F C3 F3 78 */ mr r3, r30 -/* 8032351C 4B FA B8 21 */ bl __dl__FPv -lbl_80323520: -/* 80323520 7F C3 F3 78 */ mr r3, r30 -/* 80323524 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80323528 83 C1 00 08 */ lwz r30, 8(r1) -/* 8032352C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80323530 7C 08 03 A6 */ mtlr r0 -/* 80323534 38 21 00 10 */ addi r1, r1, 0x10 -/* 80323538 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__16J3DPEBlockFogOffFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__16J3DPEBlockFogOffFv.s deleted file mode 100644 index 8bbfa06eb4a..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__16J3DPEBlockFogOffFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80321BC4: -/* 80321BC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80321BC8 7C 08 02 A6 */ mflr r0 -/* 80321BCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80321BD0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80321BD4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80321BD8 41 82 00 30 */ beq lbl_80321C08 -/* 80321BDC 3C 60 80 3D */ lis r3, __vt__16J3DPEBlockFogOff@ha /* 0x803CE06C@ha */ -/* 80321BE0 38 03 E0 6C */ addi r0, r3, __vt__16J3DPEBlockFogOff@l /* 0x803CE06C@l */ -/* 80321BE4 90 1F 00 00 */ stw r0, 0(r31) -/* 80321BE8 41 82 00 10 */ beq lbl_80321BF8 -/* 80321BEC 3C 60 80 3D */ lis r3, __vt__10J3DPEBlock@ha /* 0x803CDD20@ha */ -/* 80321BF0 38 03 DD 20 */ addi r0, r3, __vt__10J3DPEBlock@l /* 0x803CDD20@l */ -/* 80321BF4 90 1F 00 00 */ stw r0, 0(r31) -lbl_80321BF8: -/* 80321BF8 7C 80 07 35 */ extsh. r0, r4 -/* 80321BFC 40 81 00 0C */ ble lbl_80321C08 -/* 80321C00 7F E3 FB 78 */ mr r3, r31 -/* 80321C04 4B FA D1 39 */ bl __dl__FPv -lbl_80321C08: -/* 80321C08 7F E3 FB 78 */ mr r3, r31 -/* 80321C0C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80321C10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80321C14 7C 08 03 A6 */ mtlr r0 -/* 80321C18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80321C1C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__17J3DPEBlockTexEdgeFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__17J3DPEBlockTexEdgeFv.s deleted file mode 100644 index 0ce008ca235..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__17J3DPEBlockTexEdgeFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_803232CC: -/* 803232CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803232D0 7C 08 02 A6 */ mflr r0 -/* 803232D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 803232D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 803232DC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 803232E0 41 82 00 30 */ beq lbl_80323310 -/* 803232E4 3C 60 80 3D */ lis r3, __vt__17J3DPEBlockTexEdge@ha /* 0x803CE814@ha */ -/* 803232E8 38 03 E8 14 */ addi r0, r3, __vt__17J3DPEBlockTexEdge@l /* 0x803CE814@l */ -/* 803232EC 90 1F 00 00 */ stw r0, 0(r31) -/* 803232F0 41 82 00 10 */ beq lbl_80323300 -/* 803232F4 3C 60 80 3D */ lis r3, __vt__10J3DPEBlock@ha /* 0x803CDD20@ha */ -/* 803232F8 38 03 DD 20 */ addi r0, r3, __vt__10J3DPEBlock@l /* 0x803CDD20@l */ -/* 803232FC 90 1F 00 00 */ stw r0, 0(r31) -lbl_80323300: -/* 80323300 7C 80 07 35 */ extsh. r0, r4 -/* 80323304 40 81 00 0C */ ble lbl_80323310 -/* 80323308 7F E3 FB 78 */ mr r3, r31 -/* 8032330C 4B FA BA 31 */ bl __dl__FPv -lbl_80323310: -/* 80323310 7F E3 FB 78 */ mr r3, r31 -/* 80323314 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80323318 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8032331C 7C 08 03 A6 */ mtlr r0 -/* 80323320 38 21 00 10 */ addi r1, r1, 0x10 -/* 80323324 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__22J3DColorBlockAmbientOnFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__22J3DColorBlockAmbientOnFv.s deleted file mode 100644 index 36f7ecedfcc..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__22J3DColorBlockAmbientOnFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_803230EC: -/* 803230EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803230F0 7C 08 02 A6 */ mflr r0 -/* 803230F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 803230F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 803230FC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80323100 41 82 00 40 */ beq lbl_80323140 -/* 80323104 3C 60 80 3D */ lis r3, __vt__22J3DColorBlockAmbientOn@ha /* 0x803CE708@ha */ -/* 80323108 38 03 E7 08 */ addi r0, r3, __vt__22J3DColorBlockAmbientOn@l /* 0x803CE708@l */ -/* 8032310C 90 1F 00 00 */ stw r0, 0(r31) -/* 80323110 41 82 00 20 */ beq lbl_80323130 -/* 80323114 3C 60 80 3D */ lis r3, __vt__21J3DColorBlockLightOff@ha /* 0x803CEA34@ha */ -/* 80323118 38 03 EA 34 */ addi r0, r3, __vt__21J3DColorBlockLightOff@l /* 0x803CEA34@l */ -/* 8032311C 90 1F 00 00 */ stw r0, 0(r31) -/* 80323120 41 82 00 10 */ beq lbl_80323130 -/* 80323124 3C 60 80 3D */ lis r3, __vt__13J3DColorBlock@ha /* 0x803CDEA0@ha */ -/* 80323128 38 03 DE A0 */ addi r0, r3, __vt__13J3DColorBlock@l /* 0x803CDEA0@l */ -/* 8032312C 90 1F 00 00 */ stw r0, 0(r31) -lbl_80323130: -/* 80323130 7C 80 07 35 */ extsh. r0, r4 -/* 80323134 40 81 00 0C */ ble lbl_80323140 -/* 80323138 7F E3 FB 78 */ mr r3, r31 -/* 8032313C 4B FA BC 01 */ bl __dl__FPv -lbl_80323140: -/* 80323140 7F E3 FB 78 */ mr r3, r31 -/* 80323144 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80323148 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8032314C 7C 08 03 A6 */ mtlr r0 -/* 80323150 38 21 00 10 */ addi r1, r1, 0x10 -/* 80323154 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__sinit_J3DMatBlock_cpp.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__sinit_J3DMatBlock_cpp.s deleted file mode 100644 index ffd55e918ec..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__sinit_J3DMatBlock_cpp.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8032356C: -/* 8032356C 80 6D 83 E0 */ lwz r3, SizeOfLoadMatColors(r13) -/* 80323570 80 8D 83 E8 */ lwz r4, SizeOfLoadColorChans(r13) -/* 80323574 7C 03 22 14 */ add r0, r3, r4 -/* 80323578 90 0D 90 58 */ stw r0, SizeOfJ3DColorBlockLightOffLoad(r13) -/* 8032357C 80 0D 83 E4 */ lwz r0, SizeOfLoadAmbColors(r13) -/* 80323580 7C 00 22 14 */ add r0, r0, r4 -/* 80323584 7C 03 02 14 */ add r0, r3, r0 -/* 80323588 90 0D 90 5C */ stw r0, SizeOfJ3DColorBlockAmbientOnLoad(r13) -/* 8032358C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffBlend__14J3DPEBlockFullFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffBlend__14J3DPEBlockFullFv.s deleted file mode 100644 index 9b3a64d34a4..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffBlend__14J3DPEBlockFullFv.s +++ /dev/null @@ -1,196 +0,0 @@ -lbl_8031F9B8: -/* 8031F9B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031F9BC 7C 08 02 A6 */ mflr r0 -/* 8031F9C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031F9C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8031F9C8 7C 7F 1B 78 */ mr r31, r3 -/* 8031F9CC 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F9D0 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F9D4 38 63 00 0F */ addi r3, r3, 0xf -/* 8031F9D8 80 04 00 0C */ lwz r0, 0xc(r4) -/* 8031F9DC 7C 03 00 40 */ cmplw r3, r0 -/* 8031F9E0 40 81 00 08 */ ble lbl_8031F9E8 -/* 8031F9E4 48 04 16 F1 */ bl GDOverflowed -lbl_8031F9E8: -/* 8031F9E8 88 7F 00 3B */ lbz r3, 0x3b(r31) -/* 8031F9EC 88 FF 00 37 */ lbz r7, 0x37(r31) -/* 8031F9F0 88 DF 00 36 */ lbz r6, 0x36(r31) -/* 8031F9F4 88 BF 00 35 */ lbz r5, 0x35(r31) -/* 8031F9F8 88 9F 00 34 */ lbz r4, 0x34(r31) -/* 8031F9FC 39 80 00 61 */ li r12, 0x61 -/* 8031FA00 81 2D 94 00 */ lwz r9, __GDCurrentDL(r13) -/* 8031FA04 81 09 00 08 */ lwz r8, 8(r9) -/* 8031FA08 38 08 00 01 */ addi r0, r8, 1 -/* 8031FA0C 90 09 00 08 */ stw r0, 8(r9) -/* 8031FA10 99 88 00 00 */ stb r12, 0(r8) -/* 8031FA14 39 40 00 FE */ li r10, 0xfe -/* 8031FA18 81 2D 94 00 */ lwz r9, __GDCurrentDL(r13) -/* 8031FA1C 81 09 00 08 */ lwz r8, 8(r9) -/* 8031FA20 38 08 00 01 */ addi r0, r8, 1 -/* 8031FA24 90 09 00 08 */ stw r0, 8(r9) -/* 8031FA28 99 48 00 00 */ stb r10, 0(r8) -/* 8031FA2C 38 00 00 00 */ li r0, 0 -/* 8031FA30 81 4D 94 00 */ lwz r10, __GDCurrentDL(r13) -/* 8031FA34 81 2A 00 08 */ lwz r9, 8(r10) -/* 8031FA38 39 09 00 01 */ addi r8, r9, 1 -/* 8031FA3C 91 0A 00 08 */ stw r8, 8(r10) -/* 8031FA40 98 09 00 00 */ stb r0, 0(r9) -/* 8031FA44 39 60 00 FF */ li r11, 0xff -/* 8031FA48 81 4D 94 00 */ lwz r10, __GDCurrentDL(r13) -/* 8031FA4C 81 2A 00 08 */ lwz r9, 8(r10) -/* 8031FA50 39 09 00 01 */ addi r8, r9, 1 -/* 8031FA54 91 0A 00 08 */ stw r8, 8(r10) -/* 8031FA58 99 69 00 00 */ stb r11, 0(r9) -/* 8031FA5C 39 60 00 E7 */ li r11, 0xe7 -/* 8031FA60 81 4D 94 00 */ lwz r10, __GDCurrentDL(r13) -/* 8031FA64 81 2A 00 08 */ lwz r9, 8(r10) -/* 8031FA68 39 09 00 01 */ addi r8, r9, 1 -/* 8031FA6C 91 0A 00 08 */ stw r8, 8(r10) -/* 8031FA70 99 69 00 00 */ stb r11, 0(r9) -/* 8031FA74 81 4D 94 00 */ lwz r10, __GDCurrentDL(r13) -/* 8031FA78 81 2A 00 08 */ lwz r9, 8(r10) -/* 8031FA7C 39 09 00 01 */ addi r8, r9, 1 -/* 8031FA80 91 0A 00 08 */ stw r8, 8(r10) -/* 8031FA84 99 89 00 00 */ stb r12, 0(r9) -/* 8031FA88 2C 04 00 01 */ cmpwi r4, 1 -/* 8031FA8C 41 82 00 0C */ beq lbl_8031FA98 -/* 8031FA90 2C 04 00 03 */ cmpwi r4, 3 -/* 8031FA94 40 82 00 08 */ bne lbl_8031FA9C -lbl_8031FA98: -/* 8031FA98 38 00 00 01 */ li r0, 1 -lbl_8031FA9C: -/* 8031FA9C 54 E9 60 26 */ slwi r9, r7, 0xc -/* 8031FAA0 20 E4 00 03 */ subfic r7, r4, 3 -/* 8031FAA4 7C E7 00 34 */ cntlzw r7, r7 -/* 8031FAA8 54 E8 33 68 */ rlwinm r8, r7, 6, 0xd, 0x14 -/* 8031FAAC 54 A7 40 2E */ slwi r7, r5, 8 -/* 8031FAB0 54 C6 28 34 */ slwi r6, r6, 5 -/* 8031FAB4 54 65 15 BA */ rlwinm r5, r3, 2, 0x16, 0x1d -/* 8031FAB8 20 64 00 02 */ subfic r3, r4, 2 -/* 8031FABC 7C 63 00 34 */ cntlzw r3, r3 -/* 8031FAC0 54 63 E5 FC */ rlwinm r3, r3, 0x1c, 0x17, 0x1e -/* 8031FAC4 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8031FAC8 7C 60 03 78 */ or r0, r3, r0 -/* 8031FACC 7C A0 03 78 */ or r0, r5, r0 -/* 8031FAD0 7C C0 03 78 */ or r0, r6, r0 -/* 8031FAD4 7C E0 03 78 */ or r0, r7, r0 -/* 8031FAD8 7D 00 03 78 */ or r0, r8, r0 -/* 8031FADC 7D 20 03 78 */ or r0, r9, r0 -/* 8031FAE0 64 00 41 00 */ oris r0, r0, 0x4100 -/* 8031FAE4 54 0C 46 3E */ srwi r12, r0, 0x18 -/* 8031FAE8 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031FAEC 81 4B 00 08 */ lwz r10, 8(r11) -/* 8031FAF0 38 0A 00 01 */ addi r0, r10, 1 -/* 8031FAF4 90 0B 00 08 */ stw r0, 8(r11) -/* 8031FAF8 99 8A 00 00 */ stb r12, 0(r10) -/* 8031FAFC 38 00 00 00 */ li r0, 0 -/* 8031FB00 2C 04 00 01 */ cmpwi r4, 1 -/* 8031FB04 41 82 00 0C */ beq lbl_8031FB10 -/* 8031FB08 2C 04 00 03 */ cmpwi r4, 3 -/* 8031FB0C 40 82 00 08 */ bne lbl_8031FB14 -lbl_8031FB10: -/* 8031FB10 38 00 00 01 */ li r0, 1 -lbl_8031FB14: -/* 8031FB14 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8031FB18 7C 60 03 78 */ or r0, r3, r0 -/* 8031FB1C 7C A0 03 78 */ or r0, r5, r0 -/* 8031FB20 7C C0 03 78 */ or r0, r6, r0 -/* 8031FB24 7C E0 03 78 */ or r0, r7, r0 -/* 8031FB28 7D 00 03 78 */ or r0, r8, r0 -/* 8031FB2C 7D 20 03 78 */ or r0, r9, r0 -/* 8031FB30 64 00 41 00 */ oris r0, r0, 0x4100 -/* 8031FB34 54 0C 86 3E */ rlwinm r12, r0, 0x10, 0x18, 0x1f -/* 8031FB38 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031FB3C 81 4B 00 08 */ lwz r10, 8(r11) -/* 8031FB40 38 0A 00 01 */ addi r0, r10, 1 -/* 8031FB44 90 0B 00 08 */ stw r0, 8(r11) -/* 8031FB48 99 8A 00 00 */ stb r12, 0(r10) -/* 8031FB4C 38 00 00 00 */ li r0, 0 -/* 8031FB50 2C 04 00 01 */ cmpwi r4, 1 -/* 8031FB54 41 82 00 0C */ beq lbl_8031FB60 -/* 8031FB58 2C 04 00 03 */ cmpwi r4, 3 -/* 8031FB5C 40 82 00 08 */ bne lbl_8031FB64 -lbl_8031FB60: -/* 8031FB60 38 00 00 01 */ li r0, 1 -lbl_8031FB64: -/* 8031FB64 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8031FB68 7C 60 03 78 */ or r0, r3, r0 -/* 8031FB6C 7C A0 03 78 */ or r0, r5, r0 -/* 8031FB70 7C C0 03 78 */ or r0, r6, r0 -/* 8031FB74 7C E0 03 78 */ or r0, r7, r0 -/* 8031FB78 7D 00 03 78 */ or r0, r8, r0 -/* 8031FB7C 7D 20 03 78 */ or r0, r9, r0 -/* 8031FB80 64 00 41 00 */ oris r0, r0, 0x4100 -/* 8031FB84 54 0C C6 3E */ rlwinm r12, r0, 0x18, 0x18, 0x1f -/* 8031FB88 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031FB8C 81 4B 00 08 */ lwz r10, 8(r11) -/* 8031FB90 38 0A 00 01 */ addi r0, r10, 1 -/* 8031FB94 90 0B 00 08 */ stw r0, 8(r11) -/* 8031FB98 99 8A 00 00 */ stb r12, 0(r10) -/* 8031FB9C 38 00 00 00 */ li r0, 0 -/* 8031FBA0 2C 04 00 01 */ cmpwi r4, 1 -/* 8031FBA4 41 82 00 0C */ beq lbl_8031FBB0 -/* 8031FBA8 2C 04 00 03 */ cmpwi r4, 3 -/* 8031FBAC 40 82 00 08 */ bne lbl_8031FBB4 -lbl_8031FBB0: -/* 8031FBB0 38 00 00 01 */ li r0, 1 -lbl_8031FBB4: -/* 8031FBB4 7C 60 03 78 */ or r0, r3, r0 -/* 8031FBB8 7C A0 03 78 */ or r0, r5, r0 -/* 8031FBBC 7C C0 03 78 */ or r0, r6, r0 -/* 8031FBC0 7C E0 03 78 */ or r0, r7, r0 -/* 8031FBC4 7D 00 03 78 */ or r0, r8, r0 -/* 8031FBC8 7D 20 03 78 */ or r0, r9, r0 -/* 8031FBCC 60 05 00 00 */ ori r5, r0, 0 -/* 8031FBD0 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031FBD4 80 64 00 08 */ lwz r3, 8(r4) -/* 8031FBD8 38 03 00 01 */ addi r0, r3, 1 -/* 8031FBDC 90 04 00 08 */ stw r0, 8(r4) -/* 8031FBE0 98 A3 00 00 */ stb r5, 0(r3) -/* 8031FBE4 3C 60 80 43 */ lis r3, j3dZModeTable@ha /* 0x80437160@ha */ -/* 8031FBE8 38 83 71 60 */ addi r4, r3, j3dZModeTable@l /* 0x80437160@l */ -/* 8031FBEC A0 1F 00 38 */ lhz r0, 0x38(r31) -/* 8031FBF0 1C 00 00 03 */ mulli r0, r0, 3 -/* 8031FBF4 7C 64 02 14 */ add r3, r4, r0 -/* 8031FBF8 88 E3 00 02 */ lbz r7, 2(r3) -/* 8031FBFC 88 C3 00 01 */ lbz r6, 1(r3) -/* 8031FC00 7D 04 00 AE */ lbzx r8, r4, r0 -/* 8031FC04 38 A0 00 61 */ li r5, 0x61 -/* 8031FC08 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031FC0C 80 64 00 08 */ lwz r3, 8(r4) -/* 8031FC10 38 03 00 01 */ addi r0, r3, 1 -/* 8031FC14 90 04 00 08 */ stw r0, 8(r4) -/* 8031FC18 98 A3 00 00 */ stb r5, 0(r3) -/* 8031FC1C 54 E3 25 36 */ rlwinm r3, r7, 4, 0x14, 0x1b -/* 8031FC20 54 C0 08 3C */ slwi r0, r6, 1 -/* 8031FC24 7D 00 03 78 */ or r0, r8, r0 -/* 8031FC28 7C 60 03 78 */ or r0, r3, r0 -/* 8031FC2C 64 06 40 00 */ oris r6, r0, 0x4000 -/* 8031FC30 54 C5 46 3E */ srwi r5, r6, 0x18 -/* 8031FC34 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031FC38 80 64 00 08 */ lwz r3, 8(r4) -/* 8031FC3C 38 03 00 01 */ addi r0, r3, 1 -/* 8031FC40 90 04 00 08 */ stw r0, 8(r4) -/* 8031FC44 98 A3 00 00 */ stb r5, 0(r3) -/* 8031FC48 54 C5 86 3E */ rlwinm r5, r6, 0x10, 0x18, 0x1f -/* 8031FC4C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031FC50 80 64 00 08 */ lwz r3, 8(r4) -/* 8031FC54 38 03 00 01 */ addi r0, r3, 1 -/* 8031FC58 90 04 00 08 */ stw r0, 8(r4) -/* 8031FC5C 98 A3 00 00 */ stb r5, 0(r3) -/* 8031FC60 54 C5 C6 3E */ rlwinm r5, r6, 0x18, 0x18, 0x1f -/* 8031FC64 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031FC68 80 64 00 08 */ lwz r3, 8(r4) -/* 8031FC6C 38 03 00 01 */ addi r0, r3, 1 -/* 8031FC70 90 04 00 08 */ stw r0, 8(r4) -/* 8031FC74 98 A3 00 00 */ stb r5, 0(r3) -/* 8031FC78 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031FC7C 80 64 00 08 */ lwz r3, 8(r4) -/* 8031FC80 38 03 00 01 */ addi r0, r3, 1 -/* 8031FC84 90 04 00 08 */ stw r0, 8(r4) -/* 8031FC88 98 C3 00 00 */ stb r6, 0(r3) -/* 8031FC8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8031FC90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031FC94 7C 08 03 A6 */ mtlr r0 -/* 8031FC98 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031FC9C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffBlend__16J3DPEBlockFogOffFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffBlend__16J3DPEBlockFogOffFv.s deleted file mode 100644 index cb39dece9dd..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffBlend__16J3DPEBlockFogOffFv.s +++ /dev/null @@ -1,196 +0,0 @@ -lbl_8031F0D8: -/* 8031F0D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031F0DC 7C 08 02 A6 */ mflr r0 -/* 8031F0E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031F0E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8031F0E8 7C 7F 1B 78 */ mr r31, r3 -/* 8031F0EC 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F0F0 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F0F4 38 63 00 0F */ addi r3, r3, 0xf -/* 8031F0F8 80 04 00 0C */ lwz r0, 0xc(r4) -/* 8031F0FC 7C 03 00 40 */ cmplw r3, r0 -/* 8031F100 40 81 00 08 */ ble lbl_8031F108 -/* 8031F104 48 04 1F D1 */ bl GDOverflowed -lbl_8031F108: -/* 8031F108 88 7F 00 0F */ lbz r3, 0xf(r31) -/* 8031F10C 88 FF 00 0B */ lbz r7, 0xb(r31) -/* 8031F110 88 DF 00 0A */ lbz r6, 0xa(r31) -/* 8031F114 88 BF 00 09 */ lbz r5, 9(r31) -/* 8031F118 88 9F 00 08 */ lbz r4, 8(r31) -/* 8031F11C 39 80 00 61 */ li r12, 0x61 -/* 8031F120 81 2D 94 00 */ lwz r9, __GDCurrentDL(r13) -/* 8031F124 81 09 00 08 */ lwz r8, 8(r9) -/* 8031F128 38 08 00 01 */ addi r0, r8, 1 -/* 8031F12C 90 09 00 08 */ stw r0, 8(r9) -/* 8031F130 99 88 00 00 */ stb r12, 0(r8) -/* 8031F134 39 40 00 FE */ li r10, 0xfe -/* 8031F138 81 2D 94 00 */ lwz r9, __GDCurrentDL(r13) -/* 8031F13C 81 09 00 08 */ lwz r8, 8(r9) -/* 8031F140 38 08 00 01 */ addi r0, r8, 1 -/* 8031F144 90 09 00 08 */ stw r0, 8(r9) -/* 8031F148 99 48 00 00 */ stb r10, 0(r8) -/* 8031F14C 38 00 00 00 */ li r0, 0 -/* 8031F150 81 4D 94 00 */ lwz r10, __GDCurrentDL(r13) -/* 8031F154 81 2A 00 08 */ lwz r9, 8(r10) -/* 8031F158 39 09 00 01 */ addi r8, r9, 1 -/* 8031F15C 91 0A 00 08 */ stw r8, 8(r10) -/* 8031F160 98 09 00 00 */ stb r0, 0(r9) -/* 8031F164 39 60 00 FF */ li r11, 0xff -/* 8031F168 81 4D 94 00 */ lwz r10, __GDCurrentDL(r13) -/* 8031F16C 81 2A 00 08 */ lwz r9, 8(r10) -/* 8031F170 39 09 00 01 */ addi r8, r9, 1 -/* 8031F174 91 0A 00 08 */ stw r8, 8(r10) -/* 8031F178 99 69 00 00 */ stb r11, 0(r9) -/* 8031F17C 39 60 00 E7 */ li r11, 0xe7 -/* 8031F180 81 4D 94 00 */ lwz r10, __GDCurrentDL(r13) -/* 8031F184 81 2A 00 08 */ lwz r9, 8(r10) -/* 8031F188 39 09 00 01 */ addi r8, r9, 1 -/* 8031F18C 91 0A 00 08 */ stw r8, 8(r10) -/* 8031F190 99 69 00 00 */ stb r11, 0(r9) -/* 8031F194 81 4D 94 00 */ lwz r10, __GDCurrentDL(r13) -/* 8031F198 81 2A 00 08 */ lwz r9, 8(r10) -/* 8031F19C 39 09 00 01 */ addi r8, r9, 1 -/* 8031F1A0 91 0A 00 08 */ stw r8, 8(r10) -/* 8031F1A4 99 89 00 00 */ stb r12, 0(r9) -/* 8031F1A8 2C 04 00 01 */ cmpwi r4, 1 -/* 8031F1AC 41 82 00 0C */ beq lbl_8031F1B8 -/* 8031F1B0 2C 04 00 03 */ cmpwi r4, 3 -/* 8031F1B4 40 82 00 08 */ bne lbl_8031F1BC -lbl_8031F1B8: -/* 8031F1B8 38 00 00 01 */ li r0, 1 -lbl_8031F1BC: -/* 8031F1BC 54 E9 60 26 */ slwi r9, r7, 0xc -/* 8031F1C0 20 E4 00 03 */ subfic r7, r4, 3 -/* 8031F1C4 7C E7 00 34 */ cntlzw r7, r7 -/* 8031F1C8 54 E8 33 68 */ rlwinm r8, r7, 6, 0xd, 0x14 -/* 8031F1CC 54 A7 40 2E */ slwi r7, r5, 8 -/* 8031F1D0 54 C6 28 34 */ slwi r6, r6, 5 -/* 8031F1D4 54 65 15 BA */ rlwinm r5, r3, 2, 0x16, 0x1d -/* 8031F1D8 20 64 00 02 */ subfic r3, r4, 2 -/* 8031F1DC 7C 63 00 34 */ cntlzw r3, r3 -/* 8031F1E0 54 63 E5 FC */ rlwinm r3, r3, 0x1c, 0x17, 0x1e -/* 8031F1E4 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8031F1E8 7C 60 03 78 */ or r0, r3, r0 -/* 8031F1EC 7C A0 03 78 */ or r0, r5, r0 -/* 8031F1F0 7C C0 03 78 */ or r0, r6, r0 -/* 8031F1F4 7C E0 03 78 */ or r0, r7, r0 -/* 8031F1F8 7D 00 03 78 */ or r0, r8, r0 -/* 8031F1FC 7D 20 03 78 */ or r0, r9, r0 -/* 8031F200 64 00 41 00 */ oris r0, r0, 0x4100 -/* 8031F204 54 0C 46 3E */ srwi r12, r0, 0x18 -/* 8031F208 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031F20C 81 4B 00 08 */ lwz r10, 8(r11) -/* 8031F210 38 0A 00 01 */ addi r0, r10, 1 -/* 8031F214 90 0B 00 08 */ stw r0, 8(r11) -/* 8031F218 99 8A 00 00 */ stb r12, 0(r10) -/* 8031F21C 38 00 00 00 */ li r0, 0 -/* 8031F220 2C 04 00 01 */ cmpwi r4, 1 -/* 8031F224 41 82 00 0C */ beq lbl_8031F230 -/* 8031F228 2C 04 00 03 */ cmpwi r4, 3 -/* 8031F22C 40 82 00 08 */ bne lbl_8031F234 -lbl_8031F230: -/* 8031F230 38 00 00 01 */ li r0, 1 -lbl_8031F234: -/* 8031F234 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8031F238 7C 60 03 78 */ or r0, r3, r0 -/* 8031F23C 7C A0 03 78 */ or r0, r5, r0 -/* 8031F240 7C C0 03 78 */ or r0, r6, r0 -/* 8031F244 7C E0 03 78 */ or r0, r7, r0 -/* 8031F248 7D 00 03 78 */ or r0, r8, r0 -/* 8031F24C 7D 20 03 78 */ or r0, r9, r0 -/* 8031F250 64 00 41 00 */ oris r0, r0, 0x4100 -/* 8031F254 54 0C 86 3E */ rlwinm r12, r0, 0x10, 0x18, 0x1f -/* 8031F258 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031F25C 81 4B 00 08 */ lwz r10, 8(r11) -/* 8031F260 38 0A 00 01 */ addi r0, r10, 1 -/* 8031F264 90 0B 00 08 */ stw r0, 8(r11) -/* 8031F268 99 8A 00 00 */ stb r12, 0(r10) -/* 8031F26C 38 00 00 00 */ li r0, 0 -/* 8031F270 2C 04 00 01 */ cmpwi r4, 1 -/* 8031F274 41 82 00 0C */ beq lbl_8031F280 -/* 8031F278 2C 04 00 03 */ cmpwi r4, 3 -/* 8031F27C 40 82 00 08 */ bne lbl_8031F284 -lbl_8031F280: -/* 8031F280 38 00 00 01 */ li r0, 1 -lbl_8031F284: -/* 8031F284 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8031F288 7C 60 03 78 */ or r0, r3, r0 -/* 8031F28C 7C A0 03 78 */ or r0, r5, r0 -/* 8031F290 7C C0 03 78 */ or r0, r6, r0 -/* 8031F294 7C E0 03 78 */ or r0, r7, r0 -/* 8031F298 7D 00 03 78 */ or r0, r8, r0 -/* 8031F29C 7D 20 03 78 */ or r0, r9, r0 -/* 8031F2A0 64 00 41 00 */ oris r0, r0, 0x4100 -/* 8031F2A4 54 0C C6 3E */ rlwinm r12, r0, 0x18, 0x18, 0x1f -/* 8031F2A8 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031F2AC 81 4B 00 08 */ lwz r10, 8(r11) -/* 8031F2B0 38 0A 00 01 */ addi r0, r10, 1 -/* 8031F2B4 90 0B 00 08 */ stw r0, 8(r11) -/* 8031F2B8 99 8A 00 00 */ stb r12, 0(r10) -/* 8031F2BC 38 00 00 00 */ li r0, 0 -/* 8031F2C0 2C 04 00 01 */ cmpwi r4, 1 -/* 8031F2C4 41 82 00 0C */ beq lbl_8031F2D0 -/* 8031F2C8 2C 04 00 03 */ cmpwi r4, 3 -/* 8031F2CC 40 82 00 08 */ bne lbl_8031F2D4 -lbl_8031F2D0: -/* 8031F2D0 38 00 00 01 */ li r0, 1 -lbl_8031F2D4: -/* 8031F2D4 7C 60 03 78 */ or r0, r3, r0 -/* 8031F2D8 7C A0 03 78 */ or r0, r5, r0 -/* 8031F2DC 7C C0 03 78 */ or r0, r6, r0 -/* 8031F2E0 7C E0 03 78 */ or r0, r7, r0 -/* 8031F2E4 7D 00 03 78 */ or r0, r8, r0 -/* 8031F2E8 7D 20 03 78 */ or r0, r9, r0 -/* 8031F2EC 60 05 00 00 */ ori r5, r0, 0 -/* 8031F2F0 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F2F4 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F2F8 38 03 00 01 */ addi r0, r3, 1 -/* 8031F2FC 90 04 00 08 */ stw r0, 8(r4) -/* 8031F300 98 A3 00 00 */ stb r5, 0(r3) -/* 8031F304 3C 60 80 43 */ lis r3, j3dZModeTable@ha /* 0x80437160@ha */ -/* 8031F308 38 83 71 60 */ addi r4, r3, j3dZModeTable@l /* 0x80437160@l */ -/* 8031F30C A0 1F 00 0C */ lhz r0, 0xc(r31) -/* 8031F310 1C 00 00 03 */ mulli r0, r0, 3 -/* 8031F314 7C 64 02 14 */ add r3, r4, r0 -/* 8031F318 88 E3 00 02 */ lbz r7, 2(r3) -/* 8031F31C 88 C3 00 01 */ lbz r6, 1(r3) -/* 8031F320 7D 04 00 AE */ lbzx r8, r4, r0 -/* 8031F324 38 A0 00 61 */ li r5, 0x61 -/* 8031F328 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F32C 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F330 38 03 00 01 */ addi r0, r3, 1 -/* 8031F334 90 04 00 08 */ stw r0, 8(r4) -/* 8031F338 98 A3 00 00 */ stb r5, 0(r3) -/* 8031F33C 54 E3 25 36 */ rlwinm r3, r7, 4, 0x14, 0x1b -/* 8031F340 54 C0 08 3C */ slwi r0, r6, 1 -/* 8031F344 7D 00 03 78 */ or r0, r8, r0 -/* 8031F348 7C 60 03 78 */ or r0, r3, r0 -/* 8031F34C 64 06 40 00 */ oris r6, r0, 0x4000 -/* 8031F350 54 C5 46 3E */ srwi r5, r6, 0x18 -/* 8031F354 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F358 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F35C 38 03 00 01 */ addi r0, r3, 1 -/* 8031F360 90 04 00 08 */ stw r0, 8(r4) -/* 8031F364 98 A3 00 00 */ stb r5, 0(r3) -/* 8031F368 54 C5 86 3E */ rlwinm r5, r6, 0x10, 0x18, 0x1f -/* 8031F36C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F370 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F374 38 03 00 01 */ addi r0, r3, 1 -/* 8031F378 90 04 00 08 */ stw r0, 8(r4) -/* 8031F37C 98 A3 00 00 */ stb r5, 0(r3) -/* 8031F380 54 C5 C6 3E */ rlwinm r5, r6, 0x18, 0x18, 0x1f -/* 8031F384 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F388 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F38C 38 03 00 01 */ addi r0, r3, 1 -/* 8031F390 90 04 00 08 */ stw r0, 8(r4) -/* 8031F394 98 A3 00 00 */ stb r5, 0(r3) -/* 8031F398 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F39C 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F3A0 38 03 00 01 */ addi r0, r3, 1 -/* 8031F3A4 90 04 00 08 */ stw r0, 8(r4) -/* 8031F3A8 98 C3 00 00 */ stb r6, 0(r3) -/* 8031F3AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8031F3B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031F3B4 7C 08 03 A6 */ mtlr r0 -/* 8031F3B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031F3BC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffFog__14J3DPEBlockFullFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffFog__14J3DPEBlockFullFv.s deleted file mode 100644 index 7b82e68ae66..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffFog__14J3DPEBlockFullFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_8031F940: -/* 8031F940 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031F944 7C 08 02 A6 */ mflr r0 -/* 8031F948 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031F94C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8031F950 7C 7F 1B 78 */ mr r31, r3 -/* 8031F954 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F958 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F95C 38 63 00 37 */ addi r3, r3, 0x37 -/* 8031F960 80 04 00 0C */ lwz r0, 0xc(r4) -/* 8031F964 7C 03 00 40 */ cmplw r3, r0 -/* 8031F968 40 81 00 08 */ ble lbl_8031F970 -/* 8031F96C 48 04 17 69 */ bl GDOverflowed -lbl_8031F970: -/* 8031F970 80 1F 00 18 */ lwz r0, 0x18(r31) -/* 8031F974 90 01 00 08 */ stw r0, 8(r1) -/* 8031F978 88 7F 00 04 */ lbz r3, 4(r31) -/* 8031F97C C0 3F 00 08 */ lfs f1, 8(r31) -/* 8031F980 C0 5F 00 0C */ lfs f2, 0xc(r31) -/* 8031F984 C0 7F 00 10 */ lfs f3, 0x10(r31) -/* 8031F988 C0 9F 00 14 */ lfs f4, 0x14(r31) -/* 8031F98C 38 81 00 08 */ addi r4, r1, 8 -/* 8031F990 4B FE FC A1 */ bl J3DGDSetFog__F10_GXFogTypeffff8_GXColor -/* 8031F994 88 7F 00 05 */ lbz r3, 5(r31) -/* 8031F998 A0 9F 00 06 */ lhz r4, 6(r31) -/* 8031F99C 38 BF 00 1C */ addi r5, r31, 0x1c -/* 8031F9A0 4B FE FF F5 */ bl J3DGDSetFogRangeAdj__FUcUsP14_GXFogAdjTable -/* 8031F9A4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8031F9A8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031F9AC 7C 08 03 A6 */ mtlr r0 -/* 8031F9B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031F9B4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffLightObj__20J3DColorBlockLightOnFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffLightObj__20J3DColorBlockLightOnFUl.s deleted file mode 100644 index e3676e60854..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffLightObj__20J3DColorBlockLightOnFUl.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8031A8E0: -/* 8031A8E0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031A8E4 7C 08 02 A6 */ mflr r0 -/* 8031A8E8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031A8EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031A8F0 48 04 78 E9 */ bl _savegpr_28 -/* 8031A8F4 7C 7C 1B 78 */ mr r28, r3 -/* 8031A8F8 7C 9D 23 78 */ mr r29, r4 -/* 8031A8FC 3B C0 00 00 */ li r30, 0 -/* 8031A900 3B E0 00 00 */ li r31, 0 -/* 8031A904 48 00 00 24 */ b lbl_8031A928 -lbl_8031A908: -/* 8031A908 38 1F 00 20 */ addi r0, r31, 0x20 -/* 8031A90C 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 8031A910 28 03 00 00 */ cmplwi r3, 0 -/* 8031A914 41 82 00 0C */ beq lbl_8031A920 -/* 8031A918 7F C4 F3 78 */ mr r4, r30 -/* 8031A91C 48 00 8C 75 */ bl load__11J3DLightObjCFUl -lbl_8031A920: -/* 8031A920 3B DE 00 01 */ addi r30, r30, 1 -/* 8031A924 3B FF 00 04 */ addi r31, r31, 4 -lbl_8031A928: -/* 8031A928 7C 1E E8 40 */ cmplw r30, r29 -/* 8031A92C 41 80 FF DC */ blt lbl_8031A908 -/* 8031A930 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031A934 48 04 78 F1 */ bl _restgpr_28 -/* 8031A938 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031A93C 7C 08 03 A6 */ mtlr r0 -/* 8031A940 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031A944 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__12J3DTevBlock2Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__12J3DTevBlock2Fv.s deleted file mode 100644 index 1c88c4b8c87..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__12J3DTevBlock2Fv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8031D434: -/* 8031D434 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8031D438 7C 08 02 A6 */ mflr r0 -/* 8031D43C 90 01 00 34 */ stw r0, 0x34(r1) -/* 8031D440 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031D444 48 04 4D 99 */ bl _savegpr_29 -/* 8031D448 7C 7D 1B 78 */ mr r29, r3 -/* 8031D44C 3B C0 00 00 */ li r30, 0 -/* 8031D450 3B E0 00 00 */ li r31, 0 -lbl_8031D454: -/* 8031D454 38 1F 00 14 */ addi r0, r31, 0x14 -/* 8031D458 7C 9D 02 14 */ add r4, r29, r0 -/* 8031D45C 80 64 00 00 */ lwz r3, 0(r4) -/* 8031D460 80 04 00 04 */ lwz r0, 4(r4) -/* 8031D464 90 61 00 0C */ stw r3, 0xc(r1) -/* 8031D468 90 01 00 10 */ stw r0, 0x10(r1) -/* 8031D46C 38 7E 00 01 */ addi r3, r30, 1 -/* 8031D470 38 81 00 0C */ addi r4, r1, 0xc -/* 8031D474 4B FF 1F 89 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 -/* 8031D478 3B DE 00 01 */ addi r30, r30, 1 -/* 8031D47C 28 1E 00 03 */ cmplwi r30, 3 -/* 8031D480 3B FF 00 08 */ addi r31, r31, 8 -/* 8031D484 41 80 FF D0 */ blt lbl_8031D454 -/* 8031D488 3B C0 00 00 */ li r30, 0 -/* 8031D48C 3B E0 00 00 */ li r31, 0 -lbl_8031D490: -/* 8031D490 38 1F 00 45 */ addi r0, r31, 0x45 -/* 8031D494 7C 1D 00 2E */ lwzx r0, r29, r0 -/* 8031D498 90 01 00 08 */ stw r0, 8(r1) -/* 8031D49C 7F C3 F3 78 */ mr r3, r30 -/* 8031D4A0 38 81 00 08 */ addi r4, r1, 8 -/* 8031D4A4 4B FF 1D F1 */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor -/* 8031D4A8 3B DE 00 01 */ addi r30, r30, 1 -/* 8031D4AC 28 1E 00 04 */ cmplwi r30, 4 -/* 8031D4B0 3B FF 00 04 */ addi r31, r31, 4 -/* 8031D4B4 41 80 FF DC */ blt lbl_8031D490 -/* 8031D4B8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031D4BC 48 04 4D 6D */ bl _restgpr_29 -/* 8031D4C0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8031D4C4 7C 08 03 A6 */ mtlr r0 -/* 8031D4C8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031D4CC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__12J3DTevBlock4Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__12J3DTevBlock4Fv.s deleted file mode 100644 index 9f63ca12ae0..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__12J3DTevBlock4Fv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8031D7BC: -/* 8031D7BC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8031D7C0 7C 08 02 A6 */ mflr r0 -/* 8031D7C4 90 01 00 34 */ stw r0, 0x34(r1) -/* 8031D7C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031D7CC 48 04 4A 11 */ bl _savegpr_29 -/* 8031D7D0 7C 7D 1B 78 */ mr r29, r3 -/* 8031D7D4 3B C0 00 00 */ li r30, 0 -/* 8031D7D8 3B E0 00 00 */ li r31, 0 -lbl_8031D7DC: -/* 8031D7DC 38 1F 00 42 */ addi r0, r31, 0x42 -/* 8031D7E0 7C 9D 02 14 */ add r4, r29, r0 -/* 8031D7E4 80 64 00 00 */ lwz r3, 0(r4) -/* 8031D7E8 80 04 00 04 */ lwz r0, 4(r4) -/* 8031D7EC 90 61 00 0C */ stw r3, 0xc(r1) -/* 8031D7F0 90 01 00 10 */ stw r0, 0x10(r1) -/* 8031D7F4 38 7E 00 01 */ addi r3, r30, 1 -/* 8031D7F8 38 81 00 0C */ addi r4, r1, 0xc -/* 8031D7FC 4B FF 1C 01 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 -/* 8031D800 3B DE 00 01 */ addi r30, r30, 1 -/* 8031D804 28 1E 00 03 */ cmplwi r30, 3 -/* 8031D808 3B FF 00 08 */ addi r31, r31, 8 -/* 8031D80C 41 80 FF D0 */ blt lbl_8031D7DC -/* 8031D810 3B C0 00 00 */ li r30, 0 -/* 8031D814 3B E0 00 00 */ li r31, 0 -lbl_8031D818: -/* 8031D818 38 1F 00 62 */ addi r0, r31, 0x62 -/* 8031D81C 7C 1D 00 2E */ lwzx r0, r29, r0 -/* 8031D820 90 01 00 08 */ stw r0, 8(r1) -/* 8031D824 7F C3 F3 78 */ mr r3, r30 -/* 8031D828 38 81 00 08 */ addi r4, r1, 8 -/* 8031D82C 4B FF 1A 69 */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor -/* 8031D830 3B DE 00 01 */ addi r30, r30, 1 -/* 8031D834 28 1E 00 04 */ cmplwi r30, 4 -/* 8031D838 3B FF 00 04 */ addi r31, r31, 4 -/* 8031D83C 41 80 FF DC */ blt lbl_8031D818 -/* 8031D840 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031D844 48 04 49 E5 */ bl _restgpr_29 -/* 8031D848 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8031D84C 7C 08 03 A6 */ mtlr r0 -/* 8031D850 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031D854 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__13J3DTevBlock16Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__13J3DTevBlock16Fv.s deleted file mode 100644 index f0d89c1f00a..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__13J3DTevBlock16Fv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8031DB78: -/* 8031DB78 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8031DB7C 7C 08 02 A6 */ mflr r0 -/* 8031DB80 90 01 00 34 */ stw r0, 0x34(r1) -/* 8031DB84 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031DB88 48 04 46 55 */ bl _savegpr_29 -/* 8031DB8C 7C 7D 1B 78 */ mr r29, r3 -/* 8031DB90 3B C0 00 00 */ li r30, 0 -/* 8031DB94 3B E0 00 00 */ li r31, 0 -lbl_8031DB98: -/* 8031DB98 38 1F 00 DA */ addi r0, r31, 0xda -/* 8031DB9C 7C 9D 02 14 */ add r4, r29, r0 -/* 8031DBA0 80 64 00 00 */ lwz r3, 0(r4) -/* 8031DBA4 80 04 00 04 */ lwz r0, 4(r4) -/* 8031DBA8 90 61 00 0C */ stw r3, 0xc(r1) -/* 8031DBAC 90 01 00 10 */ stw r0, 0x10(r1) -/* 8031DBB0 38 7E 00 01 */ addi r3, r30, 1 -/* 8031DBB4 38 81 00 0C */ addi r4, r1, 0xc -/* 8031DBB8 4B FF 18 45 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 -/* 8031DBBC 3B DE 00 01 */ addi r30, r30, 1 -/* 8031DBC0 28 1E 00 03 */ cmplwi r30, 3 -/* 8031DBC4 3B FF 00 08 */ addi r31, r31, 8 -/* 8031DBC8 41 80 FF D0 */ blt lbl_8031DB98 -/* 8031DBCC 3B C0 00 00 */ li r30, 0 -/* 8031DBD0 3B E0 00 00 */ li r31, 0 -lbl_8031DBD4: -/* 8031DBD4 38 1F 00 FA */ addi r0, r31, 0xfa -/* 8031DBD8 7C 1D 00 2E */ lwzx r0, r29, r0 -/* 8031DBDC 90 01 00 08 */ stw r0, 8(r1) -/* 8031DBE0 7F C3 F3 78 */ mr r3, r30 -/* 8031DBE4 38 81 00 08 */ addi r4, r1, 8 -/* 8031DBE8 4B FF 16 AD */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor -/* 8031DBEC 3B DE 00 01 */ addi r30, r30, 1 -/* 8031DBF0 28 1E 00 04 */ cmplwi r30, 4 -/* 8031DBF4 3B FF 00 04 */ addi r31, r31, 4 -/* 8031DBF8 41 80 FF DC */ blt lbl_8031DBD4 -/* 8031DBFC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031DC00 48 04 46 29 */ bl _restgpr_29 -/* 8031DC04 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8031DC08 7C 08 03 A6 */ mtlr r0 -/* 8031DC0C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031DC10 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__18J3DTevBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__18J3DTevBlockPatchedFv.s deleted file mode 100644 index 56a429ae385..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__18J3DTevBlockPatchedFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8031D028: -/* 8031D028 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8031D02C 7C 08 02 A6 */ mflr r0 -/* 8031D030 90 01 00 34 */ stw r0, 0x34(r1) -/* 8031D034 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031D038 48 04 51 A5 */ bl _savegpr_29 -/* 8031D03C 7C 7D 1B 78 */ mr r29, r3 -/* 8031D040 3B C0 00 00 */ li r30, 0 -/* 8031D044 3B E0 00 00 */ li r31, 0 -lbl_8031D048: -/* 8031D048 38 1F 00 98 */ addi r0, r31, 0x98 -/* 8031D04C 7C 9D 02 14 */ add r4, r29, r0 -/* 8031D050 80 64 00 00 */ lwz r3, 0(r4) -/* 8031D054 80 04 00 04 */ lwz r0, 4(r4) -/* 8031D058 90 61 00 0C */ stw r3, 0xc(r1) -/* 8031D05C 90 01 00 10 */ stw r0, 0x10(r1) -/* 8031D060 38 7E 00 01 */ addi r3, r30, 1 -/* 8031D064 38 81 00 0C */ addi r4, r1, 0xc -/* 8031D068 4B FF 23 95 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 -/* 8031D06C 3B DE 00 01 */ addi r30, r30, 1 -/* 8031D070 28 1E 00 03 */ cmplwi r30, 3 -/* 8031D074 3B FF 00 08 */ addi r31, r31, 8 -/* 8031D078 41 80 FF D0 */ blt lbl_8031D048 -/* 8031D07C 3B C0 00 00 */ li r30, 0 -/* 8031D080 3B E0 00 00 */ li r31, 0 -lbl_8031D084: -/* 8031D084 38 1F 00 B8 */ addi r0, r31, 0xb8 -/* 8031D088 7C 1D 00 2E */ lwzx r0, r29, r0 -/* 8031D08C 90 01 00 08 */ stw r0, 8(r1) -/* 8031D090 7F C3 F3 78 */ mr r3, r30 -/* 8031D094 38 81 00 08 */ addi r4, r1, 8 -/* 8031D098 4B FF 21 FD */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor -/* 8031D09C 3B DE 00 01 */ addi r30, r30, 1 -/* 8031D0A0 28 1E 00 04 */ cmplwi r30, 4 -/* 8031D0A4 3B FF 00 04 */ addi r31, r31, 4 -/* 8031D0A8 41 80 FF DC */ blt lbl_8031D084 -/* 8031D0AC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031D0B0 48 04 51 79 */ bl _restgpr_29 -/* 8031D0B4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8031D0B8 7C 08 03 A6 */ mtlr r0 -/* 8031D0BC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031D0C0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__12J3DTevBlock1Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__12J3DTevBlock1Fv.s deleted file mode 100644 index 38a61cadf69..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__12J3DTevBlock1Fv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8031D2E8: -/* 8031D2E8 80 03 00 18 */ lwz r0, 0x18(r3) -/* 8031D2EC 64 06 10 00 */ oris r6, r0, 0x1000 -/* 8031D2F0 38 A0 00 61 */ li r5, 0x61 -/* 8031D2F4 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031D2F8 80 64 00 08 */ lwz r3, 8(r4) -/* 8031D2FC 38 03 00 01 */ addi r0, r3, 1 -/* 8031D300 90 04 00 08 */ stw r0, 8(r4) -/* 8031D304 98 A3 00 00 */ stb r5, 0(r3) -/* 8031D308 54 C5 46 3E */ srwi r5, r6, 0x18 -/* 8031D30C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031D310 80 64 00 08 */ lwz r3, 8(r4) -/* 8031D314 38 03 00 01 */ addi r0, r3, 1 -/* 8031D318 90 04 00 08 */ stw r0, 8(r4) -/* 8031D31C 98 A3 00 00 */ stb r5, 0(r3) -/* 8031D320 54 C5 86 3E */ rlwinm r5, r6, 0x10, 0x18, 0x1f -/* 8031D324 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031D328 80 64 00 08 */ lwz r3, 8(r4) -/* 8031D32C 38 03 00 01 */ addi r0, r3, 1 -/* 8031D330 90 04 00 08 */ stw r0, 8(r4) -/* 8031D334 98 A3 00 00 */ stb r5, 0(r3) -/* 8031D338 54 C5 C6 3E */ rlwinm r5, r6, 0x18, 0x18, 0x1f -/* 8031D33C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031D340 80 64 00 08 */ lwz r3, 8(r4) -/* 8031D344 38 03 00 01 */ addi r0, r3, 1 -/* 8031D348 90 04 00 08 */ stw r0, 8(r4) -/* 8031D34C 98 A3 00 00 */ stb r5, 0(r3) -/* 8031D350 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031D354 80 64 00 08 */ lwz r3, 8(r4) -/* 8031D358 38 03 00 01 */ addi r0, r3, 1 -/* 8031D35C 90 04 00 08 */ stw r0, 8(r4) -/* 8031D360 98 C3 00 00 */ stb r6, 0(r3) -/* 8031D364 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__12J3DTevBlock2Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__12J3DTevBlock2Fv.s deleted file mode 100644 index b13e3b7d779..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__12J3DTevBlock2Fv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_8031D5E4: -/* 8031D5E4 88 03 00 34 */ lbz r0, 0x34(r3) -/* 8031D5E8 39 20 00 00 */ li r9, 0 -/* 8031D5EC 38 80 00 00 */ li r4, 0 -/* 8031D5F0 7C 09 03 A6 */ mtctr r0 -/* 8031D5F4 28 00 00 00 */ cmplwi r0, 0 -/* 8031D5F8 4C 81 00 20 */ blelr -lbl_8031D5FC: -/* 8031D5FC 38 04 00 60 */ addi r0, r4, 0x60 -/* 8031D600 7C A3 00 2E */ lwzx r5, r3, r0 -/* 8031D604 38 09 00 10 */ addi r0, r9, 0x10 -/* 8031D608 54 00 C0 0E */ slwi r0, r0, 0x18 -/* 8031D60C 7C A8 03 78 */ or r8, r5, r0 -/* 8031D610 38 E0 00 61 */ li r7, 0x61 -/* 8031D614 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D618 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D61C 38 05 00 01 */ addi r0, r5, 1 -/* 8031D620 90 06 00 08 */ stw r0, 8(r6) -/* 8031D624 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D628 55 07 46 3E */ srwi r7, r8, 0x18 -/* 8031D62C 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D630 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D634 38 05 00 01 */ addi r0, r5, 1 -/* 8031D638 90 06 00 08 */ stw r0, 8(r6) -/* 8031D63C 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D640 55 07 86 3E */ rlwinm r7, r8, 0x10, 0x18, 0x1f -/* 8031D644 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D648 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D64C 38 05 00 01 */ addi r0, r5, 1 -/* 8031D650 90 06 00 08 */ stw r0, 8(r6) -/* 8031D654 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D658 55 07 C6 3E */ rlwinm r7, r8, 0x18, 0x18, 0x1f -/* 8031D65C 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D660 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D664 38 05 00 01 */ addi r0, r5, 1 -/* 8031D668 90 06 00 08 */ stw r0, 8(r6) -/* 8031D66C 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D670 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D674 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D678 38 05 00 01 */ addi r0, r5, 1 -/* 8031D67C 90 06 00 08 */ stw r0, 8(r6) -/* 8031D680 99 05 00 00 */ stb r8, 0(r5) -/* 8031D684 39 29 00 01 */ addi r9, r9, 1 -/* 8031D688 38 84 00 04 */ addi r4, r4, 4 -/* 8031D68C 42 00 FF 70 */ bdnz lbl_8031D5FC -/* 8031D690 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__12J3DTevBlock4Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__12J3DTevBlock4Fv.s deleted file mode 100644 index 09bd39b7581..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__12J3DTevBlock4Fv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_8031D96C: -/* 8031D96C 88 03 00 20 */ lbz r0, 0x20(r3) -/* 8031D970 39 20 00 00 */ li r9, 0 -/* 8031D974 38 80 00 00 */ li r4, 0 -/* 8031D978 7C 09 03 A6 */ mtctr r0 -/* 8031D97C 28 00 00 00 */ cmplwi r0, 0 -/* 8031D980 4C 81 00 20 */ blelr -lbl_8031D984: -/* 8031D984 38 04 00 80 */ addi r0, r4, 0x80 -/* 8031D988 7C A3 00 2E */ lwzx r5, r3, r0 -/* 8031D98C 38 09 00 10 */ addi r0, r9, 0x10 -/* 8031D990 54 00 C0 0E */ slwi r0, r0, 0x18 -/* 8031D994 7C A8 03 78 */ or r8, r5, r0 -/* 8031D998 38 E0 00 61 */ li r7, 0x61 -/* 8031D99C 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D9A0 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D9A4 38 05 00 01 */ addi r0, r5, 1 -/* 8031D9A8 90 06 00 08 */ stw r0, 8(r6) -/* 8031D9AC 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D9B0 55 07 46 3E */ srwi r7, r8, 0x18 -/* 8031D9B4 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D9B8 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D9BC 38 05 00 01 */ addi r0, r5, 1 -/* 8031D9C0 90 06 00 08 */ stw r0, 8(r6) -/* 8031D9C4 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D9C8 55 07 86 3E */ rlwinm r7, r8, 0x10, 0x18, 0x1f -/* 8031D9CC 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D9D0 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D9D4 38 05 00 01 */ addi r0, r5, 1 -/* 8031D9D8 90 06 00 08 */ stw r0, 8(r6) -/* 8031D9DC 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D9E0 55 07 C6 3E */ rlwinm r7, r8, 0x18, 0x18, 0x1f -/* 8031D9E4 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D9E8 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D9EC 38 05 00 01 */ addi r0, r5, 1 -/* 8031D9F0 90 06 00 08 */ stw r0, 8(r6) -/* 8031D9F4 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D9F8 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D9FC 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031DA00 38 05 00 01 */ addi r0, r5, 1 -/* 8031DA04 90 06 00 08 */ stw r0, 8(r6) -/* 8031DA08 99 05 00 00 */ stb r8, 0(r5) -/* 8031DA0C 39 29 00 01 */ addi r9, r9, 1 -/* 8031DA10 38 84 00 04 */ addi r4, r4, 4 -/* 8031DA14 42 00 FF 70 */ bdnz lbl_8031D984 -/* 8031DA18 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__13J3DTevBlock16Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__13J3DTevBlock16Fv.s deleted file mode 100644 index 8d113be6367..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__13J3DTevBlock16Fv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_8031DD28: -/* 8031DD28 88 03 00 58 */ lbz r0, 0x58(r3) -/* 8031DD2C 39 20 00 00 */ li r9, 0 -/* 8031DD30 38 80 00 00 */ li r4, 0 -/* 8031DD34 7C 09 03 A6 */ mtctr r0 -/* 8031DD38 28 00 00 00 */ cmplwi r0, 0 -/* 8031DD3C 4C 81 00 20 */ blelr -lbl_8031DD40: -/* 8031DD40 38 04 01 30 */ addi r0, r4, 0x130 -/* 8031DD44 7C A3 00 2E */ lwzx r5, r3, r0 -/* 8031DD48 38 09 00 10 */ addi r0, r9, 0x10 -/* 8031DD4C 54 00 C0 0E */ slwi r0, r0, 0x18 -/* 8031DD50 7C A8 03 78 */ or r8, r5, r0 -/* 8031DD54 38 E0 00 61 */ li r7, 0x61 -/* 8031DD58 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031DD5C 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031DD60 38 05 00 01 */ addi r0, r5, 1 -/* 8031DD64 90 06 00 08 */ stw r0, 8(r6) -/* 8031DD68 98 E5 00 00 */ stb r7, 0(r5) -/* 8031DD6C 55 07 46 3E */ srwi r7, r8, 0x18 -/* 8031DD70 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031DD74 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031DD78 38 05 00 01 */ addi r0, r5, 1 -/* 8031DD7C 90 06 00 08 */ stw r0, 8(r6) -/* 8031DD80 98 E5 00 00 */ stb r7, 0(r5) -/* 8031DD84 55 07 86 3E */ rlwinm r7, r8, 0x10, 0x18, 0x1f -/* 8031DD88 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031DD8C 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031DD90 38 05 00 01 */ addi r0, r5, 1 -/* 8031DD94 90 06 00 08 */ stw r0, 8(r6) -/* 8031DD98 98 E5 00 00 */ stb r7, 0(r5) -/* 8031DD9C 55 07 C6 3E */ rlwinm r7, r8, 0x18, 0x18, 0x1f -/* 8031DDA0 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031DDA4 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031DDA8 38 05 00 01 */ addi r0, r5, 1 -/* 8031DDAC 90 06 00 08 */ stw r0, 8(r6) -/* 8031DDB0 98 E5 00 00 */ stb r7, 0(r5) -/* 8031DDB4 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031DDB8 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031DDBC 38 05 00 01 */ addi r0, r5, 1 -/* 8031DDC0 90 06 00 08 */ stw r0, 8(r6) -/* 8031DDC4 99 05 00 00 */ stb r8, 0(r5) -/* 8031DDC8 39 29 00 01 */ addi r9, r9, 1 -/* 8031DDCC 38 84 00 04 */ addi r4, r4, 4 -/* 8031DDD0 42 00 FF 70 */ bdnz lbl_8031DD40 -/* 8031DDD4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__18J3DTevBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__18J3DTevBlockPatchedFv.s deleted file mode 100644 index ef3182029f8..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__18J3DTevBlockPatchedFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_8031CF78: -/* 8031CF78 88 03 00 D0 */ lbz r0, 0xd0(r3) -/* 8031CF7C 39 20 00 00 */ li r9, 0 -/* 8031CF80 38 80 00 00 */ li r4, 0 -/* 8031CF84 7C 09 03 A6 */ mtctr r0 -/* 8031CF88 28 00 00 00 */ cmplwi r0, 0 -/* 8031CF8C 4C 81 00 20 */ blelr -lbl_8031CF90: -/* 8031CF90 38 04 00 78 */ addi r0, r4, 0x78 -/* 8031CF94 7C A3 00 2E */ lwzx r5, r3, r0 -/* 8031CF98 38 09 00 10 */ addi r0, r9, 0x10 -/* 8031CF9C 54 00 C0 0E */ slwi r0, r0, 0x18 -/* 8031CFA0 7C A8 03 78 */ or r8, r5, r0 -/* 8031CFA4 38 E0 00 61 */ li r7, 0x61 -/* 8031CFA8 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031CFAC 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031CFB0 38 05 00 01 */ addi r0, r5, 1 -/* 8031CFB4 90 06 00 08 */ stw r0, 8(r6) -/* 8031CFB8 98 E5 00 00 */ stb r7, 0(r5) -/* 8031CFBC 55 07 46 3E */ srwi r7, r8, 0x18 -/* 8031CFC0 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031CFC4 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031CFC8 38 05 00 01 */ addi r0, r5, 1 -/* 8031CFCC 90 06 00 08 */ stw r0, 8(r6) -/* 8031CFD0 98 E5 00 00 */ stb r7, 0(r5) -/* 8031CFD4 55 07 86 3E */ rlwinm r7, r8, 0x10, 0x18, 0x1f -/* 8031CFD8 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031CFDC 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031CFE0 38 05 00 01 */ addi r0, r5, 1 -/* 8031CFE4 90 06 00 08 */ stw r0, 8(r6) -/* 8031CFE8 98 E5 00 00 */ stb r7, 0(r5) -/* 8031CFEC 55 07 C6 3E */ rlwinm r7, r8, 0x18, 0x18, 0x1f -/* 8031CFF0 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031CFF4 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031CFF8 38 05 00 01 */ addi r0, r5, 1 -/* 8031CFFC 90 06 00 08 */ stw r0, 8(r6) -/* 8031D000 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D004 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D008 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D00C 38 05 00 01 */ addi r0, r5, 1 -/* 8031D010 90 06 00 08 */ stw r0, 8(r6) -/* 8031D014 99 05 00 00 */ stb r8, 0(r5) -/* 8031D018 39 29 00 01 */ addi r9, r9, 1 -/* 8031D01C 38 84 00 04 */ addi r4, r4, 4 -/* 8031D020 42 00 FF 70 */ bdnz lbl_8031CF90 -/* 8031D024 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__12J3DTevBlock1Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__12J3DTevBlock1Fv.s deleted file mode 100644 index 4a6a8f5809c..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__12J3DTevBlock1Fv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_8031D1F8: -/* 8031D1F8 81 03 00 0E */ lwz r8, 0xe(r3) -/* 8031D1FC 38 E0 00 61 */ li r7, 0x61 -/* 8031D200 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031D204 80 85 00 08 */ lwz r4, 8(r5) -/* 8031D208 38 04 00 01 */ addi r0, r4, 1 -/* 8031D20C 90 05 00 08 */ stw r0, 8(r5) -/* 8031D210 98 E4 00 00 */ stb r7, 0(r4) -/* 8031D214 55 06 46 3E */ srwi r6, r8, 0x18 -/* 8031D218 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031D21C 80 85 00 08 */ lwz r4, 8(r5) -/* 8031D220 38 04 00 01 */ addi r0, r4, 1 -/* 8031D224 90 05 00 08 */ stw r0, 8(r5) -/* 8031D228 98 C4 00 00 */ stb r6, 0(r4) -/* 8031D22C 55 06 86 3E */ rlwinm r6, r8, 0x10, 0x18, 0x1f -/* 8031D230 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031D234 80 85 00 08 */ lwz r4, 8(r5) -/* 8031D238 38 04 00 01 */ addi r0, r4, 1 -/* 8031D23C 90 05 00 08 */ stw r0, 8(r5) -/* 8031D240 98 C4 00 00 */ stb r6, 0(r4) -/* 8031D244 55 06 C6 3E */ rlwinm r6, r8, 0x18, 0x18, 0x1f -/* 8031D248 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031D24C 80 85 00 08 */ lwz r4, 8(r5) -/* 8031D250 38 04 00 01 */ addi r0, r4, 1 -/* 8031D254 90 05 00 08 */ stw r0, 8(r5) -/* 8031D258 98 C4 00 00 */ stb r6, 0(r4) -/* 8031D25C 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031D260 80 85 00 08 */ lwz r4, 8(r5) -/* 8031D264 38 04 00 01 */ addi r0, r4, 1 -/* 8031D268 90 05 00 08 */ stw r0, 8(r5) -/* 8031D26C 99 04 00 00 */ stb r8, 0(r4) -/* 8031D270 80 C3 00 12 */ lwz r6, 0x12(r3) -/* 8031D274 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031D278 80 64 00 08 */ lwz r3, 8(r4) -/* 8031D27C 38 03 00 01 */ addi r0, r3, 1 -/* 8031D280 90 04 00 08 */ stw r0, 8(r4) -/* 8031D284 98 E3 00 00 */ stb r7, 0(r3) -/* 8031D288 54 C5 46 3E */ srwi r5, r6, 0x18 -/* 8031D28C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031D290 80 64 00 08 */ lwz r3, 8(r4) -/* 8031D294 38 03 00 01 */ addi r0, r3, 1 -/* 8031D298 90 04 00 08 */ stw r0, 8(r4) -/* 8031D29C 98 A3 00 00 */ stb r5, 0(r3) -/* 8031D2A0 54 C5 86 3E */ rlwinm r5, r6, 0x10, 0x18, 0x1f -/* 8031D2A4 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031D2A8 80 64 00 08 */ lwz r3, 8(r4) -/* 8031D2AC 38 03 00 01 */ addi r0, r3, 1 -/* 8031D2B0 90 04 00 08 */ stw r0, 8(r4) -/* 8031D2B4 98 A3 00 00 */ stb r5, 0(r3) -/* 8031D2B8 54 C5 C6 3E */ rlwinm r5, r6, 0x18, 0x18, 0x1f -/* 8031D2BC 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031D2C0 80 64 00 08 */ lwz r3, 8(r4) -/* 8031D2C4 38 03 00 01 */ addi r0, r3, 1 -/* 8031D2C8 90 04 00 08 */ stw r0, 8(r4) -/* 8031D2CC 98 A3 00 00 */ stb r5, 0(r3) -/* 8031D2D0 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031D2D4 80 64 00 08 */ lwz r3, 8(r4) -/* 8031D2D8 38 03 00 01 */ addi r0, r3, 1 -/* 8031D2DC 90 04 00 08 */ stw r0, 8(r4) -/* 8031D2E0 98 C3 00 00 */ stb r6, 0(r3) -/* 8031D2E4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__12J3DTevBlock2Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__12J3DTevBlock2Fv.s deleted file mode 100644 index d658cbebac0..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__12J3DTevBlock2Fv.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_8031D4D0: -/* 8031D4D0 88 03 00 34 */ lbz r0, 0x34(r3) -/* 8031D4D4 38 80 00 00 */ li r4, 0 -/* 8031D4D8 7C 09 03 A6 */ mtctr r0 -/* 8031D4DC 28 00 00 00 */ cmplwi r0, 0 -/* 8031D4E0 4C 81 00 20 */ blelr -lbl_8031D4E4: -/* 8031D4E4 39 44 00 35 */ addi r10, r4, 0x35 -/* 8031D4E8 7D 43 52 14 */ add r10, r3, r10 -/* 8031D4EC 81 2A 00 00 */ lwz r9, 0(r10) -/* 8031D4F0 39 00 00 61 */ li r8, 0x61 -/* 8031D4F4 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D4F8 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D4FC 38 05 00 01 */ addi r0, r5, 1 -/* 8031D500 90 06 00 08 */ stw r0, 8(r6) -/* 8031D504 99 05 00 00 */ stb r8, 0(r5) -/* 8031D508 55 27 46 3E */ srwi r7, r9, 0x18 -/* 8031D50C 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D510 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D514 38 05 00 01 */ addi r0, r5, 1 -/* 8031D518 90 06 00 08 */ stw r0, 8(r6) -/* 8031D51C 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D520 55 27 86 3E */ rlwinm r7, r9, 0x10, 0x18, 0x1f -/* 8031D524 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D528 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D52C 38 05 00 01 */ addi r0, r5, 1 -/* 8031D530 90 06 00 08 */ stw r0, 8(r6) -/* 8031D534 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D538 55 27 C6 3E */ rlwinm r7, r9, 0x18, 0x18, 0x1f -/* 8031D53C 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D540 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D544 38 05 00 01 */ addi r0, r5, 1 -/* 8031D548 90 06 00 08 */ stw r0, 8(r6) -/* 8031D54C 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D550 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D554 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D558 38 05 00 01 */ addi r0, r5, 1 -/* 8031D55C 90 06 00 08 */ stw r0, 8(r6) -/* 8031D560 99 25 00 00 */ stb r9, 0(r5) -/* 8031D564 81 2A 00 04 */ lwz r9, 4(r10) -/* 8031D568 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D56C 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D570 38 05 00 01 */ addi r0, r5, 1 -/* 8031D574 90 06 00 08 */ stw r0, 8(r6) -/* 8031D578 99 05 00 00 */ stb r8, 0(r5) -/* 8031D57C 55 27 46 3E */ srwi r7, r9, 0x18 -/* 8031D580 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D584 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D588 38 05 00 01 */ addi r0, r5, 1 -/* 8031D58C 90 06 00 08 */ stw r0, 8(r6) -/* 8031D590 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D594 55 27 86 3E */ rlwinm r7, r9, 0x10, 0x18, 0x1f -/* 8031D598 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D59C 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D5A0 38 05 00 01 */ addi r0, r5, 1 -/* 8031D5A4 90 06 00 08 */ stw r0, 8(r6) -/* 8031D5A8 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D5AC 55 27 C6 3E */ rlwinm r7, r9, 0x18, 0x18, 0x1f -/* 8031D5B0 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D5B4 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D5B8 38 05 00 01 */ addi r0, r5, 1 -/* 8031D5BC 90 06 00 08 */ stw r0, 8(r6) -/* 8031D5C0 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D5C4 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D5C8 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D5CC 38 05 00 01 */ addi r0, r5, 1 -/* 8031D5D0 90 06 00 08 */ stw r0, 8(r6) -/* 8031D5D4 99 25 00 00 */ stb r9, 0(r5) -/* 8031D5D8 38 84 00 08 */ addi r4, r4, 8 -/* 8031D5DC 42 00 FF 08 */ bdnz lbl_8031D4E4 -/* 8031D5E0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__12J3DTevBlock4Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__12J3DTevBlock4Fv.s deleted file mode 100644 index 9adddfed5d5..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__12J3DTevBlock4Fv.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_8031D858: -/* 8031D858 88 03 00 20 */ lbz r0, 0x20(r3) -/* 8031D85C 38 80 00 00 */ li r4, 0 -/* 8031D860 7C 09 03 A6 */ mtctr r0 -/* 8031D864 28 00 00 00 */ cmplwi r0, 0 -/* 8031D868 4C 81 00 20 */ blelr -lbl_8031D86C: -/* 8031D86C 39 44 00 21 */ addi r10, r4, 0x21 -/* 8031D870 7D 43 52 14 */ add r10, r3, r10 -/* 8031D874 81 2A 00 00 */ lwz r9, 0(r10) -/* 8031D878 39 00 00 61 */ li r8, 0x61 -/* 8031D87C 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D880 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D884 38 05 00 01 */ addi r0, r5, 1 -/* 8031D888 90 06 00 08 */ stw r0, 8(r6) -/* 8031D88C 99 05 00 00 */ stb r8, 0(r5) -/* 8031D890 55 27 46 3E */ srwi r7, r9, 0x18 -/* 8031D894 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D898 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D89C 38 05 00 01 */ addi r0, r5, 1 -/* 8031D8A0 90 06 00 08 */ stw r0, 8(r6) -/* 8031D8A4 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D8A8 55 27 86 3E */ rlwinm r7, r9, 0x10, 0x18, 0x1f -/* 8031D8AC 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D8B0 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D8B4 38 05 00 01 */ addi r0, r5, 1 -/* 8031D8B8 90 06 00 08 */ stw r0, 8(r6) -/* 8031D8BC 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D8C0 55 27 C6 3E */ rlwinm r7, r9, 0x18, 0x18, 0x1f -/* 8031D8C4 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D8C8 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D8CC 38 05 00 01 */ addi r0, r5, 1 -/* 8031D8D0 90 06 00 08 */ stw r0, 8(r6) -/* 8031D8D4 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D8D8 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D8DC 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D8E0 38 05 00 01 */ addi r0, r5, 1 -/* 8031D8E4 90 06 00 08 */ stw r0, 8(r6) -/* 8031D8E8 99 25 00 00 */ stb r9, 0(r5) -/* 8031D8EC 81 2A 00 04 */ lwz r9, 4(r10) -/* 8031D8F0 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D8F4 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D8F8 38 05 00 01 */ addi r0, r5, 1 -/* 8031D8FC 90 06 00 08 */ stw r0, 8(r6) -/* 8031D900 99 05 00 00 */ stb r8, 0(r5) -/* 8031D904 55 27 46 3E */ srwi r7, r9, 0x18 -/* 8031D908 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D90C 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D910 38 05 00 01 */ addi r0, r5, 1 -/* 8031D914 90 06 00 08 */ stw r0, 8(r6) -/* 8031D918 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D91C 55 27 86 3E */ rlwinm r7, r9, 0x10, 0x18, 0x1f -/* 8031D920 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D924 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D928 38 05 00 01 */ addi r0, r5, 1 -/* 8031D92C 90 06 00 08 */ stw r0, 8(r6) -/* 8031D930 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D934 55 27 C6 3E */ rlwinm r7, r9, 0x18, 0x18, 0x1f -/* 8031D938 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D93C 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D940 38 05 00 01 */ addi r0, r5, 1 -/* 8031D944 90 06 00 08 */ stw r0, 8(r6) -/* 8031D948 98 E5 00 00 */ stb r7, 0(r5) -/* 8031D94C 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031D950 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031D954 38 05 00 01 */ addi r0, r5, 1 -/* 8031D958 90 06 00 08 */ stw r0, 8(r6) -/* 8031D95C 99 25 00 00 */ stb r9, 0(r5) -/* 8031D960 38 84 00 08 */ addi r4, r4, 8 -/* 8031D964 42 00 FF 08 */ bdnz lbl_8031D86C -/* 8031D968 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__13J3DTevBlock16Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__13J3DTevBlock16Fv.s deleted file mode 100644 index 096e8ee7340..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__13J3DTevBlock16Fv.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_8031DC14: -/* 8031DC14 88 03 00 58 */ lbz r0, 0x58(r3) -/* 8031DC18 38 80 00 00 */ li r4, 0 -/* 8031DC1C 7C 09 03 A6 */ mtctr r0 -/* 8031DC20 28 00 00 00 */ cmplwi r0, 0 -/* 8031DC24 4C 81 00 20 */ blelr -lbl_8031DC28: -/* 8031DC28 39 44 00 59 */ addi r10, r4, 0x59 -/* 8031DC2C 7D 43 52 14 */ add r10, r3, r10 -/* 8031DC30 81 2A 00 00 */ lwz r9, 0(r10) -/* 8031DC34 39 00 00 61 */ li r8, 0x61 -/* 8031DC38 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031DC3C 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031DC40 38 05 00 01 */ addi r0, r5, 1 -/* 8031DC44 90 06 00 08 */ stw r0, 8(r6) -/* 8031DC48 99 05 00 00 */ stb r8, 0(r5) -/* 8031DC4C 55 27 46 3E */ srwi r7, r9, 0x18 -/* 8031DC50 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031DC54 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031DC58 38 05 00 01 */ addi r0, r5, 1 -/* 8031DC5C 90 06 00 08 */ stw r0, 8(r6) -/* 8031DC60 98 E5 00 00 */ stb r7, 0(r5) -/* 8031DC64 55 27 86 3E */ rlwinm r7, r9, 0x10, 0x18, 0x1f -/* 8031DC68 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031DC6C 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031DC70 38 05 00 01 */ addi r0, r5, 1 -/* 8031DC74 90 06 00 08 */ stw r0, 8(r6) -/* 8031DC78 98 E5 00 00 */ stb r7, 0(r5) -/* 8031DC7C 55 27 C6 3E */ rlwinm r7, r9, 0x18, 0x18, 0x1f -/* 8031DC80 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031DC84 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031DC88 38 05 00 01 */ addi r0, r5, 1 -/* 8031DC8C 90 06 00 08 */ stw r0, 8(r6) -/* 8031DC90 98 E5 00 00 */ stb r7, 0(r5) -/* 8031DC94 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031DC98 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031DC9C 38 05 00 01 */ addi r0, r5, 1 -/* 8031DCA0 90 06 00 08 */ stw r0, 8(r6) -/* 8031DCA4 99 25 00 00 */ stb r9, 0(r5) -/* 8031DCA8 81 2A 00 04 */ lwz r9, 4(r10) -/* 8031DCAC 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031DCB0 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031DCB4 38 05 00 01 */ addi r0, r5, 1 -/* 8031DCB8 90 06 00 08 */ stw r0, 8(r6) -/* 8031DCBC 99 05 00 00 */ stb r8, 0(r5) -/* 8031DCC0 55 27 46 3E */ srwi r7, r9, 0x18 -/* 8031DCC4 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031DCC8 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031DCCC 38 05 00 01 */ addi r0, r5, 1 -/* 8031DCD0 90 06 00 08 */ stw r0, 8(r6) -/* 8031DCD4 98 E5 00 00 */ stb r7, 0(r5) -/* 8031DCD8 55 27 86 3E */ rlwinm r7, r9, 0x10, 0x18, 0x1f -/* 8031DCDC 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031DCE0 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031DCE4 38 05 00 01 */ addi r0, r5, 1 -/* 8031DCE8 90 06 00 08 */ stw r0, 8(r6) -/* 8031DCEC 98 E5 00 00 */ stb r7, 0(r5) -/* 8031DCF0 55 27 C6 3E */ rlwinm r7, r9, 0x18, 0x18, 0x1f -/* 8031DCF4 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031DCF8 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031DCFC 38 05 00 01 */ addi r0, r5, 1 -/* 8031DD00 90 06 00 08 */ stw r0, 8(r6) -/* 8031DD04 98 E5 00 00 */ stb r7, 0(r5) -/* 8031DD08 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031DD0C 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031DD10 38 05 00 01 */ addi r0, r5, 1 -/* 8031DD14 90 06 00 08 */ stw r0, 8(r6) -/* 8031DD18 99 25 00 00 */ stb r9, 0(r5) -/* 8031DD1C 38 84 00 08 */ addi r4, r4, 8 -/* 8031DD20 42 00 FF 08 */ bdnz lbl_8031DC28 -/* 8031DD24 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__18J3DTevBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__18J3DTevBlockPatchedFv.s deleted file mode 100644 index 268d2c8ad9b..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__18J3DTevBlockPatchedFv.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_8031CE64: -/* 8031CE64 88 03 00 D0 */ lbz r0, 0xd0(r3) -/* 8031CE68 38 80 00 00 */ li r4, 0 -/* 8031CE6C 7C 09 03 A6 */ mtctr r0 -/* 8031CE70 28 00 00 00 */ cmplwi r0, 0 -/* 8031CE74 4C 81 00 20 */ blelr -lbl_8031CE78: -/* 8031CE78 39 44 00 38 */ addi r10, r4, 0x38 -/* 8031CE7C 7D 43 52 14 */ add r10, r3, r10 -/* 8031CE80 81 2A 00 00 */ lwz r9, 0(r10) -/* 8031CE84 39 00 00 61 */ li r8, 0x61 -/* 8031CE88 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031CE8C 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031CE90 38 05 00 01 */ addi r0, r5, 1 -/* 8031CE94 90 06 00 08 */ stw r0, 8(r6) -/* 8031CE98 99 05 00 00 */ stb r8, 0(r5) -/* 8031CE9C 55 27 46 3E */ srwi r7, r9, 0x18 -/* 8031CEA0 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031CEA4 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031CEA8 38 05 00 01 */ addi r0, r5, 1 -/* 8031CEAC 90 06 00 08 */ stw r0, 8(r6) -/* 8031CEB0 98 E5 00 00 */ stb r7, 0(r5) -/* 8031CEB4 55 27 86 3E */ rlwinm r7, r9, 0x10, 0x18, 0x1f -/* 8031CEB8 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031CEBC 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031CEC0 38 05 00 01 */ addi r0, r5, 1 -/* 8031CEC4 90 06 00 08 */ stw r0, 8(r6) -/* 8031CEC8 98 E5 00 00 */ stb r7, 0(r5) -/* 8031CECC 55 27 C6 3E */ rlwinm r7, r9, 0x18, 0x18, 0x1f -/* 8031CED0 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031CED4 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031CED8 38 05 00 01 */ addi r0, r5, 1 -/* 8031CEDC 90 06 00 08 */ stw r0, 8(r6) -/* 8031CEE0 98 E5 00 00 */ stb r7, 0(r5) -/* 8031CEE4 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031CEE8 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031CEEC 38 05 00 01 */ addi r0, r5, 1 -/* 8031CEF0 90 06 00 08 */ stw r0, 8(r6) -/* 8031CEF4 99 25 00 00 */ stb r9, 0(r5) -/* 8031CEF8 81 2A 00 04 */ lwz r9, 4(r10) -/* 8031CEFC 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031CF00 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031CF04 38 05 00 01 */ addi r0, r5, 1 -/* 8031CF08 90 06 00 08 */ stw r0, 8(r6) -/* 8031CF0C 99 05 00 00 */ stb r8, 0(r5) -/* 8031CF10 55 27 46 3E */ srwi r7, r9, 0x18 -/* 8031CF14 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031CF18 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031CF1C 38 05 00 01 */ addi r0, r5, 1 -/* 8031CF20 90 06 00 08 */ stw r0, 8(r6) -/* 8031CF24 98 E5 00 00 */ stb r7, 0(r5) -/* 8031CF28 55 27 86 3E */ rlwinm r7, r9, 0x10, 0x18, 0x1f -/* 8031CF2C 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031CF30 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031CF34 38 05 00 01 */ addi r0, r5, 1 -/* 8031CF38 90 06 00 08 */ stw r0, 8(r6) -/* 8031CF3C 98 E5 00 00 */ stb r7, 0(r5) -/* 8031CF40 55 27 C6 3E */ rlwinm r7, r9, 0x18, 0x18, 0x1f -/* 8031CF44 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031CF48 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031CF4C 38 05 00 01 */ addi r0, r5, 1 -/* 8031CF50 90 06 00 08 */ stw r0, 8(r6) -/* 8031CF54 98 E5 00 00 */ stb r7, 0(r5) -/* 8031CF58 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031CF5C 80 A6 00 08 */ lwz r5, 8(r6) -/* 8031CF60 38 05 00 01 */ addi r0, r5, 1 -/* 8031CF64 90 06 00 08 */ stw r0, 8(r6) -/* 8031CF68 99 25 00 00 */ stb r9, 0(r5) -/* 8031CF6C 38 84 00 08 */ addi r4, r4, 8 -/* 8031CF70 42 00 FF 08 */ bdnz lbl_8031CE78 -/* 8031CF74 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock1Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock1Fv.s deleted file mode 100644 index 5edc7172023..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock1Fv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8031D368: -/* 8031D368 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031D36C 7C 08 02 A6 */ mflr r0 -/* 8031D370 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031D374 88 03 00 0B */ lbz r0, 0xb(r3) -/* 8031D378 54 05 1E B8 */ rlwinm r5, r0, 3, 0x1a, 0x1c -/* 8031D37C 3C 80 80 43 */ lis r4, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ -/* 8031D380 38 04 4C 2C */ addi r0, r4, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ -/* 8031D384 7D 00 2A 14 */ add r8, r0, r5 -/* 8031D388 88 63 00 0A */ lbz r3, 0xa(r3) -/* 8031D38C A0 88 00 00 */ lhz r4, 0(r8) -/* 8031D390 A0 08 00 04 */ lhz r0, 4(r8) -/* 8031D394 20 00 00 01 */ subfic r0, r0, 1 -/* 8031D398 7C 00 00 34 */ cntlzw r0, r0 -/* 8031D39C 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031D3A0 38 C0 00 00 */ li r6, 0 -/* 8031D3A4 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031D3A8 A0 08 00 06 */ lhz r0, 6(r8) -/* 8031D3AC 20 00 00 01 */ subfic r0, r0, 1 -/* 8031D3B0 7C 00 00 34 */ cntlzw r0, r0 -/* 8031D3B4 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031D3B8 39 20 00 00 */ li r9, 0 -/* 8031D3BC 4B FF 0E 79 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031D3C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031D3C4 7C 08 03 A6 */ mtlr r0 -/* 8031D3C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031D3CC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock2Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock2Fv.s deleted file mode 100644 index 90e29ac1cdb..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock2Fv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_8031D694: -/* 8031D694 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031D698 7C 08 02 A6 */ mflr r0 -/* 8031D69C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031D6A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8031D6A4 7C 7F 1B 78 */ mr r31, r3 -/* 8031D6A8 88 03 00 0D */ lbz r0, 0xd(r3) -/* 8031D6AC 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031D6B0 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ -/* 8031D6B4 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ -/* 8031D6B8 7D 00 22 14 */ add r8, r0, r4 -/* 8031D6BC 88 7F 00 0C */ lbz r3, 0xc(r31) -/* 8031D6C0 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031D6C4 A0 08 00 04 */ lhz r0, 4(r8) -/* 8031D6C8 20 00 00 01 */ subfic r0, r0, 1 -/* 8031D6CC 7C 00 00 34 */ cntlzw r0, r0 -/* 8031D6D0 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031D6D4 38 C0 00 00 */ li r6, 0 -/* 8031D6D8 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031D6DC A0 08 00 06 */ lhz r0, 6(r8) -/* 8031D6E0 20 00 00 01 */ subfic r0, r0, 1 -/* 8031D6E4 7C 00 00 34 */ cntlzw r0, r0 -/* 8031D6E8 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031D6EC 39 20 00 00 */ li r9, 0 -/* 8031D6F0 4B FF 0B 45 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031D6F4 88 1F 00 11 */ lbz r0, 0x11(r31) -/* 8031D6F8 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031D6FC 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ -/* 8031D700 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ -/* 8031D704 7D 00 22 14 */ add r8, r0, r4 -/* 8031D708 88 1F 00 10 */ lbz r0, 0x10(r31) -/* 8031D70C 54 03 07 7E */ clrlwi r3, r0, 0x1d -/* 8031D710 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031D714 A0 08 00 04 */ lhz r0, 4(r8) -/* 8031D718 20 00 00 01 */ subfic r0, r0, 1 -/* 8031D71C 7C 00 00 34 */ cntlzw r0, r0 -/* 8031D720 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031D724 38 C0 00 00 */ li r6, 0 -/* 8031D728 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031D72C A0 08 00 06 */ lhz r0, 6(r8) -/* 8031D730 20 00 00 01 */ subfic r0, r0, 1 -/* 8031D734 7C 00 00 34 */ cntlzw r0, r0 -/* 8031D738 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031D73C 39 20 00 00 */ li r9, 0 -/* 8031D740 4B FF 0A F5 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031D744 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8031D748 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031D74C 7C 08 03 A6 */ mtlr r0 -/* 8031D750 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031D754 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock4Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock4Fv.s deleted file mode 100644 index 2afb3c4cf67..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock4Fv.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_8031DA1C: -/* 8031DA1C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031DA20 7C 08 02 A6 */ mflr r0 -/* 8031DA24 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031DA28 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031DA2C 48 04 47 A9 */ bl _savegpr_27 -/* 8031DA30 7C 7C 1B 78 */ mr r28, r3 -/* 8031DA34 8B C3 00 20 */ lbz r30, 0x20(r3) -/* 8031DA38 3B A0 00 00 */ li r29, 0 -/* 8031DA3C 3B 60 00 00 */ li r27, 0 -/* 8031DA40 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ -/* 8031DA44 3B E3 4C 2C */ addi r31, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ -/* 8031DA48 48 00 00 AC */ b lbl_8031DAF4 -lbl_8031DA4C: -/* 8031DA4C 7C 7C DA 14 */ add r3, r28, r27 -/* 8031DA50 88 03 00 11 */ lbz r0, 0x11(r3) -/* 8031DA54 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c -/* 8031DA58 7D 1F 02 14 */ add r8, r31, r0 -/* 8031DA5C 88 03 00 10 */ lbz r0, 0x10(r3) -/* 8031DA60 54 03 07 7E */ clrlwi r3, r0, 0x1d -/* 8031DA64 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031DA68 A0 08 00 04 */ lhz r0, 4(r8) -/* 8031DA6C 20 00 00 01 */ subfic r0, r0, 1 -/* 8031DA70 7C 00 00 34 */ cntlzw r0, r0 -/* 8031DA74 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031DA78 38 C0 00 00 */ li r6, 0 -/* 8031DA7C A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031DA80 A0 08 00 06 */ lhz r0, 6(r8) -/* 8031DA84 20 00 00 01 */ subfic r0, r0, 1 -/* 8031DA88 7C 00 00 34 */ cntlzw r0, r0 -/* 8031DA8C 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031DA90 39 20 00 00 */ li r9, 0 -/* 8031DA94 4B FF 07 A1 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031DA98 38 1D 00 01 */ addi r0, r29, 1 -/* 8031DA9C 54 00 10 3A */ slwi r0, r0, 2 -/* 8031DAA0 7C 7C 02 14 */ add r3, r28, r0 -/* 8031DAA4 88 03 00 11 */ lbz r0, 0x11(r3) -/* 8031DAA8 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c -/* 8031DAAC 7D 1F 02 14 */ add r8, r31, r0 -/* 8031DAB0 88 03 00 10 */ lbz r0, 0x10(r3) -/* 8031DAB4 54 03 07 7E */ clrlwi r3, r0, 0x1d -/* 8031DAB8 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031DABC A0 08 00 04 */ lhz r0, 4(r8) -/* 8031DAC0 20 00 00 01 */ subfic r0, r0, 1 -/* 8031DAC4 7C 00 00 34 */ cntlzw r0, r0 -/* 8031DAC8 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031DACC 38 C0 00 00 */ li r6, 0 -/* 8031DAD0 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031DAD4 A0 08 00 06 */ lhz r0, 6(r8) -/* 8031DAD8 20 00 00 01 */ subfic r0, r0, 1 -/* 8031DADC 7C 00 00 34 */ cntlzw r0, r0 -/* 8031DAE0 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031DAE4 39 20 00 00 */ li r9, 0 -/* 8031DAE8 4B FF 07 4D */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031DAEC 3B BD 00 02 */ addi r29, r29, 2 -/* 8031DAF0 3B 7B 00 08 */ addi r27, r27, 8 -lbl_8031DAF4: -/* 8031DAF4 7C 1D F0 40 */ cmplw r29, r30 -/* 8031DAF8 41 80 FF 54 */ blt lbl_8031DA4C -/* 8031DAFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031DB00 48 04 47 21 */ bl _restgpr_27 -/* 8031DB04 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031DB08 7C 08 03 A6 */ mtlr r0 -/* 8031DB0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031DB10 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__13J3DTevBlock16Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__13J3DTevBlock16Fv.s deleted file mode 100644 index f29f44a659f..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__13J3DTevBlock16Fv.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_8031DDD8: -/* 8031DDD8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031DDDC 7C 08 02 A6 */ mflr r0 -/* 8031DDE0 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031DDE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031DDE8 48 04 43 ED */ bl _savegpr_27 -/* 8031DDEC 7C 7C 1B 78 */ mr r28, r3 -/* 8031DDF0 8B C3 00 58 */ lbz r30, 0x58(r3) -/* 8031DDF4 3B A0 00 00 */ li r29, 0 -/* 8031DDF8 3B 60 00 00 */ li r27, 0 -/* 8031DDFC 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ -/* 8031DE00 3B E3 4C 2C */ addi r31, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ -/* 8031DE04 48 00 00 AC */ b lbl_8031DEB0 -lbl_8031DE08: -/* 8031DE08 7C 7C DA 14 */ add r3, r28, r27 -/* 8031DE0C 88 03 00 19 */ lbz r0, 0x19(r3) -/* 8031DE10 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c -/* 8031DE14 7D 1F 02 14 */ add r8, r31, r0 -/* 8031DE18 88 03 00 18 */ lbz r0, 0x18(r3) -/* 8031DE1C 54 03 07 7E */ clrlwi r3, r0, 0x1d -/* 8031DE20 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031DE24 A0 08 00 04 */ lhz r0, 4(r8) -/* 8031DE28 20 00 00 01 */ subfic r0, r0, 1 -/* 8031DE2C 7C 00 00 34 */ cntlzw r0, r0 -/* 8031DE30 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031DE34 38 C0 00 00 */ li r6, 0 -/* 8031DE38 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031DE3C A0 08 00 06 */ lhz r0, 6(r8) -/* 8031DE40 20 00 00 01 */ subfic r0, r0, 1 -/* 8031DE44 7C 00 00 34 */ cntlzw r0, r0 -/* 8031DE48 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031DE4C 39 20 00 00 */ li r9, 0 -/* 8031DE50 4B FF 03 E5 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031DE54 38 1D 00 01 */ addi r0, r29, 1 -/* 8031DE58 54 00 10 3A */ slwi r0, r0, 2 -/* 8031DE5C 7C 7C 02 14 */ add r3, r28, r0 -/* 8031DE60 88 03 00 19 */ lbz r0, 0x19(r3) -/* 8031DE64 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c -/* 8031DE68 7D 1F 02 14 */ add r8, r31, r0 -/* 8031DE6C 88 03 00 18 */ lbz r0, 0x18(r3) -/* 8031DE70 54 03 07 7E */ clrlwi r3, r0, 0x1d -/* 8031DE74 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031DE78 A0 08 00 04 */ lhz r0, 4(r8) -/* 8031DE7C 20 00 00 01 */ subfic r0, r0, 1 -/* 8031DE80 7C 00 00 34 */ cntlzw r0, r0 -/* 8031DE84 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031DE88 38 C0 00 00 */ li r6, 0 -/* 8031DE8C A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031DE90 A0 08 00 06 */ lhz r0, 6(r8) -/* 8031DE94 20 00 00 01 */ subfic r0, r0, 1 -/* 8031DE98 7C 00 00 34 */ cntlzw r0, r0 -/* 8031DE9C 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031DEA0 39 20 00 00 */ li r9, 0 -/* 8031DEA4 4B FF 03 91 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031DEA8 3B BD 00 02 */ addi r29, r29, 2 -/* 8031DEAC 3B 7B 00 08 */ addi r27, r27, 8 -lbl_8031DEB0: -/* 8031DEB0 7C 1D F0 40 */ cmplw r29, r30 -/* 8031DEB4 41 80 FF 54 */ blt lbl_8031DE08 -/* 8031DEB8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031DEBC 48 04 43 65 */ bl _restgpr_27 -/* 8031DEC0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031DEC4 7C 08 03 A6 */ mtlr r0 -/* 8031DEC8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031DECC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__18J3DTevBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__18J3DTevBlockPatchedFv.s deleted file mode 100644 index f2a68a7e821..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__18J3DTevBlockPatchedFv.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_8031D0C4: -/* 8031D0C4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031D0C8 7C 08 02 A6 */ mflr r0 -/* 8031D0CC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031D0D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031D0D4 48 04 51 01 */ bl _savegpr_27 -/* 8031D0D8 7C 7C 1B 78 */ mr r28, r3 -/* 8031D0DC 8B C3 00 D0 */ lbz r30, 0xd0(r3) -/* 8031D0E0 3B A0 00 00 */ li r29, 0 -/* 8031D0E4 3B 60 00 00 */ li r27, 0 -/* 8031D0E8 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ -/* 8031D0EC 3B E3 4C 2C */ addi r31, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ -/* 8031D0F0 48 00 00 AC */ b lbl_8031D19C -lbl_8031D0F4: -/* 8031D0F4 7C 7C DA 14 */ add r3, r28, r27 -/* 8031D0F8 88 03 00 19 */ lbz r0, 0x19(r3) -/* 8031D0FC 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c -/* 8031D100 7D 1F 02 14 */ add r8, r31, r0 -/* 8031D104 88 03 00 18 */ lbz r0, 0x18(r3) -/* 8031D108 54 03 07 7E */ clrlwi r3, r0, 0x1d -/* 8031D10C A0 88 00 00 */ lhz r4, 0(r8) -/* 8031D110 A0 08 00 04 */ lhz r0, 4(r8) -/* 8031D114 20 00 00 01 */ subfic r0, r0, 1 -/* 8031D118 7C 00 00 34 */ cntlzw r0, r0 -/* 8031D11C 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031D120 38 C0 00 00 */ li r6, 0 -/* 8031D124 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031D128 A0 08 00 06 */ lhz r0, 6(r8) -/* 8031D12C 20 00 00 01 */ subfic r0, r0, 1 -/* 8031D130 7C 00 00 34 */ cntlzw r0, r0 -/* 8031D134 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031D138 39 20 00 00 */ li r9, 0 -/* 8031D13C 4B FF 10 F9 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031D140 38 1D 00 01 */ addi r0, r29, 1 -/* 8031D144 54 00 10 3A */ slwi r0, r0, 2 -/* 8031D148 7C 7C 02 14 */ add r3, r28, r0 -/* 8031D14C 88 03 00 19 */ lbz r0, 0x19(r3) -/* 8031D150 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c -/* 8031D154 7D 1F 02 14 */ add r8, r31, r0 -/* 8031D158 88 03 00 18 */ lbz r0, 0x18(r3) -/* 8031D15C 54 03 07 7E */ clrlwi r3, r0, 0x1d -/* 8031D160 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031D164 A0 08 00 04 */ lhz r0, 4(r8) -/* 8031D168 20 00 00 01 */ subfic r0, r0, 1 -/* 8031D16C 7C 00 00 34 */ cntlzw r0, r0 -/* 8031D170 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031D174 38 C0 00 00 */ li r6, 0 -/* 8031D178 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031D17C A0 08 00 06 */ lhz r0, 6(r8) -/* 8031D180 20 00 00 01 */ subfic r0, r0, 1 -/* 8031D184 7C 00 00 34 */ cntlzw r0, r0 -/* 8031D188 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031D18C 39 20 00 00 */ li r9, 0 -/* 8031D190 4B FF 10 A5 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031D194 3B BD 00 02 */ addi r29, r29, 2 -/* 8031D198 3B 7B 00 08 */ addi r27, r27, 8 -lbl_8031D19C: -/* 8031D19C 7C 1D F0 40 */ cmplw r29, r30 -/* 8031D1A0 41 80 FF 54 */ blt lbl_8031D0F4 -/* 8031D1A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031D1A8 48 04 50 79 */ bl _restgpr_27 -/* 8031D1AC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031D1B0 7C 08 03 A6 */ mtlr r0 -/* 8031D1B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031D1B8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexGen__21J3DTexGenBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexGen__21J3DTexGenBlockPatchedFv.s deleted file mode 100644 index e7ae9d81c2b..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexGen__21J3DTexGenBlockPatchedFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8031AD30: -/* 8031AD30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031AD34 7C 08 02 A6 */ mflr r0 -/* 8031AD38 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031AD3C 7C 64 1B 78 */ mr r4, r3 -/* 8031AD40 80 63 00 04 */ lwz r3, 4(r3) -/* 8031AD44 28 03 00 00 */ cmplwi r3, 0 -/* 8031AD48 41 82 00 0C */ beq lbl_8031AD54 -/* 8031AD4C 38 84 00 08 */ addi r4, r4, 8 -/* 8031AD50 48 00 88 F5 */ bl loadTexCoordGens__FUlP11J3DTexCoord -lbl_8031AD54: -/* 8031AD54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031AD58 7C 08 03 A6 */ mtlr r0 -/* 8031AD5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031AD60 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexMtx__21J3DTexGenBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexMtx__21J3DTexGenBlockPatchedFv.s deleted file mode 100644 index 7d74f497710..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexMtx__21J3DTexGenBlockPatchedFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8031ACD0: -/* 8031ACD0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031ACD4 7C 08 02 A6 */ mflr r0 -/* 8031ACD8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031ACDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031ACE0 48 04 74 FD */ bl _savegpr_29 -/* 8031ACE4 7C 7D 1B 78 */ mr r29, r3 -/* 8031ACE8 3B C0 00 00 */ li r30, 0 -/* 8031ACEC 3B E0 00 00 */ li r31, 0 -lbl_8031ACF0: -/* 8031ACF0 38 1F 00 38 */ addi r0, r31, 0x38 -/* 8031ACF4 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 8031ACF8 28 03 00 00 */ cmplwi r3, 0 -/* 8031ACFC 41 82 00 0C */ beq lbl_8031AD08 -/* 8031AD00 7F C4 F3 78 */ mr r4, r30 -/* 8031AD04 48 00 8B C1 */ bl load__9J3DTexMtxCFUl -lbl_8031AD08: -/* 8031AD08 3B DE 00 01 */ addi r30, r30, 1 -/* 8031AD0C 28 1E 00 08 */ cmplwi r30, 8 -/* 8031AD10 3B FF 00 04 */ addi r31, r31, 4 -/* 8031AD14 41 80 FF DC */ blt lbl_8031ACF0 -/* 8031AD18 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031AD1C 48 04 75 0D */ bl _restgpr_29 -/* 8031AD20 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031AD24 7C 08 03 A6 */ mtlr r0 -/* 8031AD28 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031AD2C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__12J3DTevBlock1Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__12J3DTevBlock1Fv.s deleted file mode 100644 index 158a93de0fc..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__12J3DTevBlock1Fv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8031D1BC: -/* 8031D1BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031D1C0 7C 08 02 A6 */ mflr r0 -/* 8031D1C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031D1C8 7C 64 1B 78 */ mr r4, r3 -/* 8031D1CC A0 03 00 08 */ lhz r0, 8(r3) -/* 8031D1D0 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031D1D4 41 82 00 10 */ beq lbl_8031D1E4 -/* 8031D1D8 38 60 00 00 */ li r3, 0 -/* 8031D1DC 38 84 00 08 */ addi r4, r4, 8 -/* 8031D1E0 48 00 6D B5 */ bl loadTexNo__FUlRCUs -lbl_8031D1E4: -/* 8031D1E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031D1E8 7C 08 03 A6 */ mtlr r0 -/* 8031D1EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031D1F0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__12J3DTevBlock2Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__12J3DTevBlock2Fv.s deleted file mode 100644 index b8ca2c29b32..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__12J3DTevBlock2Fv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8031D3D0: -/* 8031D3D0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031D3D4 7C 08 02 A6 */ mflr r0 -/* 8031D3D8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031D3DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031D3E0 48 04 4D FD */ bl _savegpr_29 -/* 8031D3E4 7C 7D 1B 78 */ mr r29, r3 -/* 8031D3E8 3B C0 00 00 */ li r30, 0 -/* 8031D3EC 3B E0 00 00 */ li r31, 0 -lbl_8031D3F0: -/* 8031D3F0 38 9F 00 08 */ addi r4, r31, 8 -/* 8031D3F4 7C 9D 22 14 */ add r4, r29, r4 -/* 8031D3F8 A0 04 00 00 */ lhz r0, 0(r4) -/* 8031D3FC 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031D400 41 82 00 0C */ beq lbl_8031D40C -/* 8031D404 7F C3 F3 78 */ mr r3, r30 -/* 8031D408 48 00 6B 8D */ bl loadTexNo__FUlRCUs -lbl_8031D40C: -/* 8031D40C 3B DE 00 01 */ addi r30, r30, 1 -/* 8031D410 28 1E 00 02 */ cmplwi r30, 2 -/* 8031D414 3B FF 00 02 */ addi r31, r31, 2 -/* 8031D418 41 80 FF D8 */ blt lbl_8031D3F0 -/* 8031D41C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031D420 48 04 4E 09 */ bl _restgpr_29 -/* 8031D424 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031D428 7C 08 03 A6 */ mtlr r0 -/* 8031D42C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031D430 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__12J3DTevBlock4Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__12J3DTevBlock4Fv.s deleted file mode 100644 index bb262bdfa62..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__12J3DTevBlock4Fv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8031D758: -/* 8031D758 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031D75C 7C 08 02 A6 */ mflr r0 -/* 8031D760 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031D764 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031D768 48 04 4A 75 */ bl _savegpr_29 -/* 8031D76C 7C 7D 1B 78 */ mr r29, r3 -/* 8031D770 3B C0 00 00 */ li r30, 0 -/* 8031D774 3B E0 00 00 */ li r31, 0 -lbl_8031D778: -/* 8031D778 38 9F 00 08 */ addi r4, r31, 8 -/* 8031D77C 7C 9D 22 14 */ add r4, r29, r4 -/* 8031D780 A0 04 00 00 */ lhz r0, 0(r4) -/* 8031D784 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031D788 41 82 00 0C */ beq lbl_8031D794 -/* 8031D78C 7F C3 F3 78 */ mr r3, r30 -/* 8031D790 48 00 68 05 */ bl loadTexNo__FUlRCUs -lbl_8031D794: -/* 8031D794 3B DE 00 01 */ addi r30, r30, 1 -/* 8031D798 28 1E 00 04 */ cmplwi r30, 4 -/* 8031D79C 3B FF 00 02 */ addi r31, r31, 2 -/* 8031D7A0 41 80 FF D8 */ blt lbl_8031D778 -/* 8031D7A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031D7A8 48 04 4A 81 */ bl _restgpr_29 -/* 8031D7AC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031D7B0 7C 08 03 A6 */ mtlr r0 -/* 8031D7B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031D7B8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__13J3DTevBlock16Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__13J3DTevBlock16Fv.s deleted file mode 100644 index f450ecb2261..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__13J3DTevBlock16Fv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8031DB14: -/* 8031DB14 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031DB18 7C 08 02 A6 */ mflr r0 -/* 8031DB1C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031DB20 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031DB24 48 04 46 B9 */ bl _savegpr_29 -/* 8031DB28 7C 7D 1B 78 */ mr r29, r3 -/* 8031DB2C 3B C0 00 00 */ li r30, 0 -/* 8031DB30 3B E0 00 00 */ li r31, 0 -lbl_8031DB34: -/* 8031DB34 38 9F 00 08 */ addi r4, r31, 8 -/* 8031DB38 7C 9D 22 14 */ add r4, r29, r4 -/* 8031DB3C A0 04 00 00 */ lhz r0, 0(r4) -/* 8031DB40 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031DB44 41 82 00 0C */ beq lbl_8031DB50 -/* 8031DB48 7F C3 F3 78 */ mr r3, r30 -/* 8031DB4C 48 00 64 49 */ bl loadTexNo__FUlRCUs -lbl_8031DB50: -/* 8031DB50 3B DE 00 01 */ addi r30, r30, 1 -/* 8031DB54 28 1E 00 08 */ cmplwi r30, 8 -/* 8031DB58 3B FF 00 02 */ addi r31, r31, 2 -/* 8031DB5C 41 80 FF D8 */ blt lbl_8031DB34 -/* 8031DB60 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031DB64 48 04 46 C5 */ bl _restgpr_29 -/* 8031DB68 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031DB6C 7C 08 03 A6 */ mtlr r0 -/* 8031DB70 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031DB74 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__18J3DTevBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__18J3DTevBlockPatchedFv.s deleted file mode 100644 index b8f8f61c8be..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__18J3DTevBlockPatchedFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8031CE00: -/* 8031CE00 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031CE04 7C 08 02 A6 */ mflr r0 -/* 8031CE08 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031CE0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031CE10 48 04 53 CD */ bl _savegpr_29 -/* 8031CE14 7C 7D 1B 78 */ mr r29, r3 -/* 8031CE18 3B C0 00 00 */ li r30, 0 -/* 8031CE1C 3B E0 00 00 */ li r31, 0 -lbl_8031CE20: -/* 8031CE20 38 9F 00 08 */ addi r4, r31, 8 -/* 8031CE24 7C 9D 22 14 */ add r4, r29, r4 -/* 8031CE28 A0 04 00 00 */ lhz r0, 0(r4) -/* 8031CE2C 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031CE30 41 82 00 0C */ beq lbl_8031CE3C -/* 8031CE34 7F C3 F3 78 */ mr r3, r30 -/* 8031CE38 48 00 71 5D */ bl loadTexNo__FUlRCUs -lbl_8031CE3C: -/* 8031CE3C 3B DE 00 01 */ addi r30, r30, 1 -/* 8031CE40 28 1E 00 08 */ cmplwi r30, 8 -/* 8031CE44 3B FF 00 02 */ addi r31, r31, 2 -/* 8031CE48 41 80 FF D8 */ blt lbl_8031CE20 -/* 8031CE4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031CE50 48 04 53 D9 */ bl _restgpr_29 -/* 8031CE54 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031CE58 7C 08 03 A6 */ mtlr r0 -/* 8031CE5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031CE60 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__11J3DTevBlockFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__11J3DTevBlockFUl.s deleted file mode 100644 index b0506b1ad1a..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__11J3DTevBlockFUl.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_8031CD44: -/* 8031CD44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031CD48 7C 08 02 A6 */ mflr r0 -/* 8031CD4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031CD50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8031CD54 93 C1 00 08 */ stw r30, 8(r1) -/* 8031CD58 7C 7E 1B 78 */ mr r30, r3 -/* 8031CD5C 7C 9F 23 78 */ mr r31, r4 -/* 8031CD60 54 80 87 3F */ rlwinm. r0, r4, 0x10, 0x1c, 0x1f -/* 8031CD64 41 82 00 14 */ beq lbl_8031CD78 -/* 8031CD68 81 83 00 00 */ lwz r12, 0(r3) -/* 8031CD6C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8031CD70 7D 89 03 A6 */ mtctr r12 -/* 8031CD74 4E 80 04 21 */ bctrl -lbl_8031CD78: -/* 8031CD78 57 E0 01 4B */ rlwinm. r0, r31, 0, 5, 5 -/* 8031CD7C 41 82 00 18 */ beq lbl_8031CD94 -/* 8031CD80 7F C3 F3 78 */ mr r3, r30 -/* 8031CD84 81 9E 00 00 */ lwz r12, 0(r30) -/* 8031CD88 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 8031CD8C 7D 89 03 A6 */ mtctr r12 -/* 8031CD90 4E 80 04 21 */ bctrl -lbl_8031CD94: -/* 8031CD94 57 E0 67 3F */ rlwinm. r0, r31, 0xc, 0x1c, 0x1f -/* 8031CD98 41 82 00 34 */ beq lbl_8031CDCC -/* 8031CD9C 7F C3 F3 78 */ mr r3, r30 -/* 8031CDA0 81 9E 00 00 */ lwz r12, 0(r30) -/* 8031CDA4 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 8031CDA8 7D 89 03 A6 */ mtctr r12 -/* 8031CDAC 4E 80 04 21 */ bctrl -/* 8031CDB0 57 E0 01 09 */ rlwinm. r0, r31, 0, 4, 4 -/* 8031CDB4 41 82 00 18 */ beq lbl_8031CDCC -/* 8031CDB8 7F C3 F3 78 */ mr r3, r30 -/* 8031CDBC 81 9E 00 00 */ lwz r12, 0(r30) -/* 8031CDC0 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 8031CDC4 7D 89 03 A6 */ mtctr r12 -/* 8031CDC8 4E 80 04 21 */ bctrl -lbl_8031CDCC: -/* 8031CDCC 57 E0 01 CF */ rlwinm. r0, r31, 0, 7, 7 -/* 8031CDD0 41 82 00 18 */ beq lbl_8031CDE8 -/* 8031CDD4 7F C3 F3 78 */ mr r3, r30 -/* 8031CDD8 81 9E 00 00 */ lwz r12, 0(r30) -/* 8031CDDC 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8031CDE0 7D 89 03 A6 */ mtctr r12 -/* 8031CDE4 4E 80 04 21 */ bctrl -lbl_8031CDE8: -/* 8031CDE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8031CDEC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8031CDF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031CDF4 7C 08 03 A6 */ mtlr r0 -/* 8031CDF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031CDFC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__14J3DPEBlockFullFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__14J3DPEBlockFullFUl.s deleted file mode 100644 index ee4633e3677..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__14J3DPEBlockFullFUl.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_8031FCA0: -/* 8031FCA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031FCA4 7C 08 02 A6 */ mflr r0 -/* 8031FCA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031FCAC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8031FCB0 93 C1 00 08 */ stw r30, 8(r1) -/* 8031FCB4 7C 7E 1B 78 */ mr r30, r3 -/* 8031FCB8 7C 9F 23 78 */ mr r31, r4 -/* 8031FCBC 54 80 00 C7 */ rlwinm. r0, r4, 0, 3, 3 -/* 8031FCC0 41 82 00 14 */ beq lbl_8031FCD4 -/* 8031FCC4 81 83 00 00 */ lwz r12, 0(r3) -/* 8031FCC8 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8031FCCC 7D 89 03 A6 */ mtctr r12 -/* 8031FCD0 4E 80 04 21 */ bctrl -lbl_8031FCD4: -/* 8031FCD4 57 E0 00 85 */ rlwinm. r0, r31, 0, 2, 2 -/* 8031FCD8 41 82 00 18 */ beq lbl_8031FCF0 -/* 8031FCDC 7F C3 F3 78 */ mr r3, r30 -/* 8031FCE0 81 9E 00 00 */ lwz r12, 0(r30) -/* 8031FCE4 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 8031FCE8 7D 89 03 A6 */ mtctr r12 -/* 8031FCEC 4E 80 04 21 */ bctrl -lbl_8031FCF0: -/* 8031FCF0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8031FCF4 83 C1 00 08 */ lwz r30, 8(r1) -/* 8031FCF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031FCFC 7C 08 03 A6 */ mtlr r0 -/* 8031FD00 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031FD04 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__15J3DIndBlockFullFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__15J3DIndBlockFullFUl.s deleted file mode 100644 index 6e9376c5a59..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__15J3DIndBlockFullFUl.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_8031E328: -/* 8031E328 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031E32C 7C 08 02 A6 */ mflr r0 -/* 8031E330 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031E334 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8031E338 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8031E33C 7C 7E 1B 78 */ mr r30, r3 -/* 8031E340 54 80 01 09 */ rlwinm. r0, r4, 0, 4, 4 -/* 8031E344 41 82 00 AC */ beq lbl_8031E3F0 -/* 8031E348 8B FE 00 04 */ lbz r31, 4(r30) -/* 8031E34C 38 60 00 01 */ li r3, 1 -/* 8031E350 38 9E 00 18 */ addi r4, r30, 0x18 -/* 8031E354 88 1E 00 30 */ lbz r0, 0x30(r30) -/* 8031E358 7C 05 07 74 */ extsb r5, r0 -/* 8031E35C 4B FF 07 D5 */ bl J3DGDSetIndTexMtx__F14_GXIndTexMtxIDPA3_fSc -/* 8031E360 38 60 00 00 */ li r3, 0 -/* 8031E364 88 9E 00 6C */ lbz r4, 0x6c(r30) -/* 8031E368 88 BE 00 6D */ lbz r5, 0x6d(r30) -/* 8031E36C 88 DE 00 70 */ lbz r6, 0x70(r30) -/* 8031E370 88 FE 00 71 */ lbz r7, 0x71(r30) -/* 8031E374 4B FF 0A 9D */ bl J3DGDSetIndTexCoordScale__F16_GXIndTexStageID14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale -/* 8031E378 88 1E 00 06 */ lbz r0, 6(r30) -/* 8031E37C 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031E380 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ -/* 8031E384 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ -/* 8031E388 7D 00 22 14 */ add r8, r0, r4 -/* 8031E38C 88 7E 00 05 */ lbz r3, 5(r30) -/* 8031E390 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031E394 A0 08 00 04 */ lhz r0, 4(r8) -/* 8031E398 20 00 00 01 */ subfic r0, r0, 1 -/* 8031E39C 7C 00 00 34 */ cntlzw r0, r0 -/* 8031E3A0 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031E3A4 38 C0 00 00 */ li r6, 0 -/* 8031E3A8 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031E3AC A0 08 00 06 */ lhz r0, 6(r8) -/* 8031E3B0 20 00 00 01 */ subfic r0, r0, 1 -/* 8031E3B4 7C 00 00 34 */ cntlzw r0, r0 -/* 8031E3B8 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031E3BC 39 20 00 00 */ li r9, 0 -/* 8031E3C0 4B FE FE 75 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031E3C4 88 1E 00 12 */ lbz r0, 0x12(r30) -/* 8031E3C8 90 01 00 08 */ stw r0, 8(r1) -/* 8031E3CC 7F E3 FB 78 */ mr r3, r31 -/* 8031E3D0 88 9E 00 05 */ lbz r4, 5(r30) -/* 8031E3D4 88 BE 00 06 */ lbz r5, 6(r30) -/* 8031E3D8 88 DE 00 09 */ lbz r6, 9(r30) -/* 8031E3DC 88 FE 00 0A */ lbz r7, 0xa(r30) -/* 8031E3E0 89 1E 00 0D */ lbz r8, 0xd(r30) -/* 8031E3E4 89 3E 00 0E */ lbz r9, 0xe(r30) -/* 8031E3E8 89 5E 00 11 */ lbz r10, 0x11(r30) -/* 8031E3EC 4B FF 0B 1D */ bl J3DGDSetIndTexOrder__FUl13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID -lbl_8031E3F0: -/* 8031E3F0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8031E3F4 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8031E3F8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031E3FC 7C 08 03 A6 */ mtlr r0 -/* 8031E400 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031E404 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__16J3DPEBlockFogOffFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__16J3DPEBlockFogOffFUl.s deleted file mode 100644 index feac7488931..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__16J3DPEBlockFogOffFUl.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80321ACC: -/* 80321ACC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80321AD0 7C 08 02 A6 */ mflr r0 -/* 80321AD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80321AD8 54 80 00 85 */ rlwinm. r0, r4, 0, 2, 2 -/* 80321ADC 41 82 00 14 */ beq lbl_80321AF0 -/* 80321AE0 81 83 00 00 */ lwz r12, 0(r3) -/* 80321AE4 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 80321AE8 7D 89 03 A6 */ mtctr r12 -/* 80321AEC 4E 80 04 21 */ bctrl -lbl_80321AF0: -/* 80321AF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80321AF4 7C 08 03 A6 */ mtlr r0 -/* 80321AF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80321AFC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__21J3DTexGenBlockPatchedFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__21J3DTexGenBlockPatchedFUl.s deleted file mode 100644 index 659483d68af..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__21J3DTexGenBlockPatchedFUl.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8031AC68: -/* 8031AC68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031AC6C 7C 08 02 A6 */ mflr r0 -/* 8031AC70 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031AC74 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8031AC78 93 C1 00 08 */ stw r30, 8(r1) -/* 8031AC7C 7C 7E 1B 78 */ mr r30, r3 -/* 8031AC80 7C 9F 23 78 */ mr r31, r4 -/* 8031AC84 54 80 C7 3F */ rlwinm. r0, r4, 0x18, 0x1c, 0x1f -/* 8031AC88 41 82 00 30 */ beq lbl_8031ACB8 -/* 8031AC8C 81 83 00 00 */ lwz r12, 0(r3) -/* 8031AC90 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 8031AC94 7D 89 03 A6 */ mtctr r12 -/* 8031AC98 4E 80 04 21 */ bctrl -/* 8031AC9C 57 E0 04 E7 */ rlwinm. r0, r31, 0, 0x13, 0x13 -/* 8031ACA0 41 82 00 18 */ beq lbl_8031ACB8 -/* 8031ACA4 7F C3 F3 78 */ mr r3, r30 -/* 8031ACA8 81 9E 00 00 */ lwz r12, 0(r30) -/* 8031ACAC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8031ACB0 7D 89 03 A6 */ mtctr r12 -/* 8031ACB4 4E 80 04 21 */ bctrl -lbl_8031ACB8: -/* 8031ACB8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8031ACBC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8031ACC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031ACC4 7C 08 03 A6 */ mtlr r0 -/* 8031ACC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031ACCC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getAlphaComp__14J3DPEBlockFullFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getAlphaComp__14J3DPEBlockFullFv.s deleted file mode 100644 index 70087e7c704..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getAlphaComp__14J3DPEBlockFullFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_803219E0: -/* 803219E0 38 63 00 30 */ addi r3, r3, 0x30 -/* 803219E4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getAlphaComp__16J3DPEBlockFogOffFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getAlphaComp__16J3DPEBlockFogOffFv.s deleted file mode 100644 index 491ed6d2217..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getAlphaComp__16J3DPEBlockFogOffFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80321B44: -/* 80321B44 38 63 00 04 */ addi r3, r3, 4 -/* 80321B48 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getBlend__14J3DPEBlockFullFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getBlend__14J3DPEBlockFullFv.s deleted file mode 100644 index 60019d76845..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getBlend__14J3DPEBlockFullFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80321A00: -/* 80321A00 38 63 00 34 */ addi r3, r3, 0x34 -/* 80321A04 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getBlend__16J3DPEBlockFogOffFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getBlend__16J3DPEBlockFogOffFv.s deleted file mode 100644 index 28d758844c3..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getBlend__16J3DPEBlockFogOffFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80321B64: -/* 80321B64 38 63 00 08 */ addi r3, r3, 8 -/* 80321B68 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChanNum__21J3DColorBlockLightOffCFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChanNum__21J3DColorBlockLightOffCFv.s deleted file mode 100644 index f5210808e44..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChanNum__21J3DColorBlockLightOffCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_803231D8: -/* 803231D8 88 63 00 0C */ lbz r3, 0xc(r3) -/* 803231DC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChanOffset__21J3DColorBlockLightOffCFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChanOffset__21J3DColorBlockLightOffCFv.s deleted file mode 100644 index 68f209b2e6b..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChanOffset__21J3DColorBlockLightOffCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80323240: -/* 80323240 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 80323244 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChan__21J3DColorBlockLightOffFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChan__21J3DColorBlockLightOffFUl.s deleted file mode 100644 index 0c99f04a9e2..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChan__21J3DColorBlockLightOffFUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80323208: -/* 80323208 7C 60 1B 78 */ mr r0, r3 -/* 8032320C 54 83 08 3C */ slwi r3, r4, 1 -/* 80323210 38 63 00 0E */ addi r3, r3, 0xe -/* 80323214 7C 60 1A 14 */ add r3, r0, r3 -/* 80323218 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getCullMode__21J3DColorBlockLightOffCFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getCullMode__21J3DColorBlockLightOffCFv.s deleted file mode 100644 index 229315c56c7..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getCullMode__21J3DColorBlockLightOffCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80323230: -/* 80323230 88 63 00 16 */ lbz r3, 0x16(r3) -/* 80323234 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getDither__14J3DPEBlockFullCFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getDither__14J3DPEBlockFullCFv.s deleted file mode 100644 index d81dfebc926..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getDither__14J3DPEBlockFullCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80321A58: -/* 80321A58 88 63 00 3B */ lbz r3, 0x3b(r3) -/* 80321A5C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getDither__16J3DPEBlockFogOffCFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getDither__16J3DPEBlockFogOffCFv.s deleted file mode 100644 index 50594c64b01..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getDither__16J3DPEBlockFogOffCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80321BBC: -/* 80321BBC 88 63 00 0F */ lbz r3, 0xf(r3) -/* 80321BC0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getFogOffset__14J3DPEBlockFullCFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getFogOffset__14J3DPEBlockFullCFv.s deleted file mode 100644 index 8d4fdf1e414..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getFogOffset__14J3DPEBlockFullCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80321A60: -/* 80321A60 80 63 00 3C */ lwz r3, 0x3c(r3) -/* 80321A64 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getFog__14J3DPEBlockFullFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getFog__14J3DPEBlockFullFv.s deleted file mode 100644 index 4592aa376fa..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getFog__14J3DPEBlockFullFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_803219A0: -/* 803219A0 38 63 00 04 */ addi r3, r3, 4 -/* 803219A4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexCoordScale__15J3DIndBlockFullFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexCoordScale__15J3DIndBlockFullFUl.s deleted file mode 100644 index 39c58a1ec40..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexCoordScale__15J3DIndBlockFullFUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8032348C: -/* 8032348C 7C 60 1B 78 */ mr r0, r3 -/* 80323490 54 83 10 3A */ slwi r3, r4, 2 -/* 80323494 38 63 00 6C */ addi r3, r3, 0x6c -/* 80323498 7C 60 1A 14 */ add r3, r0, r3 -/* 8032349C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexMtx__15J3DIndBlockFullFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexMtx__15J3DIndBlockFullFUl.s deleted file mode 100644 index a069fbecc99..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexMtx__15J3DIndBlockFullFUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80323450: -/* 80323450 7C 60 1B 78 */ mr r0, r3 -/* 80323454 1C 64 00 1C */ mulli r3, r4, 0x1c -/* 80323458 38 63 00 18 */ addi r3, r3, 0x18 -/* 8032345C 7C 60 1A 14 */ add r3, r0, r3 -/* 80323460 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexOrder__15J3DIndBlockFullFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexOrder__15J3DIndBlockFullFUl.s deleted file mode 100644 index 7a02c3cefb7..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexOrder__15J3DIndBlockFullFUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_803233D4: -/* 803233D4 7C 60 1B 78 */ mr r0, r3 -/* 803233D8 54 83 10 3A */ slwi r3, r4, 2 -/* 803233DC 38 63 00 05 */ addi r3, r3, 5 -/* 803233E0 7C 60 1A 14 */ add r3, r0, r3 -/* 803233E4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexStageNum__15J3DIndBlockFullCFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexStageNum__15J3DIndBlockFullCFv.s deleted file mode 100644 index 486257a15bb..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexStageNum__15J3DIndBlockFullCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_803233A4: -/* 803233A4 88 63 00 04 */ lbz r3, 4(r3) -/* 803233A8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getMatColorOffset__21J3DColorBlockLightOffCFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getMatColorOffset__21J3DColorBlockLightOffCFv.s deleted file mode 100644 index 1f6f00a950f..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getMatColorOffset__21J3DColorBlockLightOffCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80323238: -/* 80323238 80 63 00 18 */ lwz r3, 0x18(r3) -/* 8032323C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getMatColor__21J3DColorBlockLightOffFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getMatColor__21J3DColorBlockLightOffFUl.s deleted file mode 100644 index fd6fcf95700..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getMatColor__21J3DColorBlockLightOffFUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_803231B0: -/* 803231B0 7C 60 1B 78 */ mr r0, r3 -/* 803231B4 54 83 10 3A */ slwi r3, r4, 2 -/* 803231B8 38 63 00 04 */ addi r3, r3, 4 -/* 803231BC 7C 60 1A 14 */ add r3, r0, r3 -/* 803231C0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getZCompLoc__14J3DPEBlockFullCFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getZCompLoc__14J3DPEBlockFullCFv.s deleted file mode 100644 index c323cec27ad..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getZCompLoc__14J3DPEBlockFullCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80321A3C: -/* 80321A3C 88 63 00 3A */ lbz r3, 0x3a(r3) -/* 80321A40 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getZCompLoc__16J3DPEBlockFogOffCFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getZCompLoc__16J3DPEBlockFogOffCFv.s deleted file mode 100644 index dded1cab814..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getZCompLoc__16J3DPEBlockFogOffCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80321BA0: -/* 80321BA0 88 63 00 0E */ lbz r3, 0xe(r3) -/* 80321BA4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getZMode__14J3DPEBlockFullFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getZMode__14J3DPEBlockFullFv.s deleted file mode 100644 index 2ab0eef0b30..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getZMode__14J3DPEBlockFullFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80321A20: -/* 80321A20 38 63 00 38 */ addi r3, r3, 0x38 -/* 80321A24 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/getZMode__16J3DPEBlockFogOffFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/getZMode__16J3DPEBlockFogOffFv.s deleted file mode 100644 index 30c78c2f0cb..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/getZMode__16J3DPEBlockFogOffFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80321B84: -/* 80321B84 38 63 00 0C */ addi r3, r3, 0xc -/* 80321B88 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/indexToPtr__13J3DTevBlock16Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/indexToPtr__13J3DTevBlock16Fv.s deleted file mode 100644 index a192275c84f..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/indexToPtr__13J3DTevBlock16Fv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80321C20: -/* 80321C20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80321C24 7C 08 02 A6 */ mflr r0 -/* 80321C28 90 01 00 14 */ stw r0, 0x14(r1) -/* 80321C2C 80 83 00 04 */ lwz r4, 4(r3) -/* 80321C30 4B FF C4 69 */ bl indexToPtr_private__11J3DTevBlockFUl -/* 80321C34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80321C38 7C 08 03 A6 */ mtlr r0 -/* 80321C3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80321C40 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/indexToPtr_private__11J3DTevBlockFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/indexToPtr_private__11J3DTevBlockFUl.s deleted file mode 100644 index 4bb1385f520..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/indexToPtr_private__11J3DTevBlockFUl.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8031E098: -/* 8031E098 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031E09C 7C 08 02 A6 */ mflr r0 -/* 8031E0A0 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031E0A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031E0A8 48 04 41 35 */ bl _savegpr_29 -/* 8031E0AC 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031E0B0 80 03 00 00 */ lwz r0, 0(r3) -/* 8031E0B4 7C 00 22 14 */ add r0, r0, r4 -/* 8031E0B8 90 03 00 08 */ stw r0, 8(r3) -/* 8031E0BC 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031E0C0 83 E3 00 08 */ lwz r31, 8(r3) -/* 8031E0C4 3B A0 00 00 */ li r29, 0 -lbl_8031E0C8: -/* 8031E0C8 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031E0CC 83 C3 00 08 */ lwz r30, 8(r3) -/* 8031E0D0 7F C3 F3 78 */ mr r3, r30 -/* 8031E0D4 48 00 5E 91 */ bl isTexNoReg__FPv -/* 8031E0D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8031E0DC 41 82 00 24 */ beq lbl_8031E100 -/* 8031E0E0 7F C3 F3 78 */ mr r3, r30 -/* 8031E0E4 48 00 5E A5 */ bl getTexNoReg__FPv -/* 8031E0E8 B0 61 00 08 */ sth r3, 8(r1) -/* 8031E0EC 7F A3 EB 78 */ mr r3, r29 -/* 8031E0F0 38 81 00 08 */ addi r4, r1, 8 -/* 8031E0F4 48 00 5E A1 */ bl loadTexNo__FUlRCUs -/* 8031E0F8 3B BD 00 01 */ addi r29, r29, 1 -/* 8031E0FC 4B FF FF CC */ b lbl_8031E0C8 -lbl_8031E100: -/* 8031E100 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031E104 80 03 00 08 */ lwz r0, 8(r3) -/* 8031E108 7F E3 FB 78 */ mr r3, r31 -/* 8031E10C 7C 9F 00 50 */ subf r4, r31, r0 -/* 8031E110 48 01 D4 CD */ bl DCStoreRange -/* 8031E114 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031E118 48 04 41 11 */ bl _restgpr_29 -/* 8031E11C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031E120 7C 08 03 A6 */ mtlr r0 -/* 8031E124 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031E128 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__12J3DTevBlock2Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__12J3DTevBlock2Fv.s deleted file mode 100644 index b6a5bf3b65c..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__12J3DTevBlock2Fv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_80317810: -/* 80317810 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80317814 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ -/* 80317818 38 04 FF FF */ addi r0, r4, 0xFFFF /* 0x0000FFFF@l */ -/* 8031781C B0 03 00 08 */ sth r0, 8(r3) -/* 80317820 B0 03 00 0A */ sth r0, 0xa(r3) -/* 80317824 38 00 00 01 */ li r0, 1 -/* 80317828 98 03 00 34 */ stb r0, 0x34(r3) -/* 8031782C 38 00 00 C0 */ li r0, 0xc0 -/* 80317830 98 03 00 35 */ stb r0, 0x35(r3) -/* 80317834 38 00 00 C1 */ li r0, 0xc1 -/* 80317838 98 03 00 39 */ stb r0, 0x39(r3) -/* 8031783C 38 00 00 C2 */ li r0, 0xc2 -/* 80317840 98 03 00 3D */ stb r0, 0x3d(r3) -/* 80317844 38 00 00 C3 */ li r0, 0xc3 -/* 80317848 98 03 00 41 */ stb r0, 0x41(r3) -/* 8031784C 38 00 00 0C */ li r0, 0xc -/* 80317850 98 03 00 55 */ stb r0, 0x55(r3) -/* 80317854 98 03 00 56 */ stb r0, 0x56(r3) -/* 80317858 38 00 00 1C */ li r0, 0x1c -/* 8031785C 98 03 00 57 */ stb r0, 0x57(r3) -/* 80317860 98 03 00 58 */ stb r0, 0x58(r3) -/* 80317864 38 80 00 00 */ li r4, 0 -/* 80317868 38 A2 C9 D4 */ la r5, j3dDefaultTevColor(r2) /* 804563D4-_SDA2_BASE_ */ -/* 8031786C 80 C2 C9 D4 */ lwz r6, j3dDefaultTevColor(r2) -/* 80317870 80 A5 00 04 */ lwz r5, 4(r5) -/* 80317874 38 00 00 03 */ li r0, 3 -/* 80317878 7C 09 03 A6 */ mtctr r0 -lbl_8031787C: -/* 8031787C 38 E4 00 14 */ addi r7, r4, 0x14 -/* 80317880 7C E3 3A 14 */ add r7, r3, r7 -/* 80317884 90 C7 00 00 */ stw r6, 0(r7) -/* 80317888 90 A7 00 04 */ stw r5, 4(r7) -/* 8031788C 38 84 00 08 */ addi r4, r4, 8 -/* 80317890 42 00 FF EC */ bdnz lbl_8031787C -/* 80317894 38 80 00 00 */ li r4, 0 -/* 80317898 80 A2 C9 E0 */ lwz r5, j3dDefaultTevKColor(r2) -/* 8031789C 38 00 00 04 */ li r0, 4 -/* 803178A0 7C 09 03 A6 */ mtctr r0 -lbl_803178A4: -/* 803178A4 90 A1 00 08 */ stw r5, 8(r1) -/* 803178A8 88 01 00 08 */ lbz r0, 8(r1) -/* 803178AC 38 C4 00 45 */ addi r6, r4, 0x45 -/* 803178B0 7C C3 32 14 */ add r6, r3, r6 -/* 803178B4 98 06 00 00 */ stb r0, 0(r6) -/* 803178B8 88 01 00 09 */ lbz r0, 9(r1) -/* 803178BC 98 06 00 01 */ stb r0, 1(r6) -/* 803178C0 88 01 00 0A */ lbz r0, 0xa(r1) -/* 803178C4 98 06 00 02 */ stb r0, 2(r6) -/* 803178C8 88 01 00 0B */ lbz r0, 0xb(r1) -/* 803178CC 98 06 00 03 */ stb r0, 3(r6) -/* 803178D0 38 84 00 04 */ addi r4, r4, 4 -/* 803178D4 42 00 FF D0 */ bdnz lbl_803178A4 -/* 803178D8 38 00 00 00 */ li r0, 0 -/* 803178DC 90 03 00 04 */ stw r0, 4(r3) -/* 803178E0 90 03 00 68 */ stw r0, 0x68(r3) -/* 803178E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 803178E8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__12J3DTevBlock4Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__12J3DTevBlock4Fv.s deleted file mode 100644 index 51488638fe8..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__12J3DTevBlock4Fv.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_803178EC: -/* 803178EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803178F0 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ -/* 803178F4 38 04 FF FF */ addi r0, r4, 0xFFFF /* 0x0000FFFF@l */ -/* 803178F8 B0 03 00 08 */ sth r0, 8(r3) -/* 803178FC B0 03 00 0A */ sth r0, 0xa(r3) -/* 80317900 B0 03 00 0C */ sth r0, 0xc(r3) -/* 80317904 B0 03 00 0E */ sth r0, 0xe(r3) -/* 80317908 38 00 00 01 */ li r0, 1 -/* 8031790C 98 03 00 20 */ stb r0, 0x20(r3) -/* 80317910 38 00 00 C0 */ li r0, 0xc0 -/* 80317914 98 03 00 21 */ stb r0, 0x21(r3) -/* 80317918 38 00 00 C1 */ li r0, 0xc1 -/* 8031791C 98 03 00 25 */ stb r0, 0x25(r3) -/* 80317920 38 00 00 C2 */ li r0, 0xc2 -/* 80317924 98 03 00 29 */ stb r0, 0x29(r3) -/* 80317928 38 00 00 C3 */ li r0, 0xc3 -/* 8031792C 98 03 00 2D */ stb r0, 0x2d(r3) -/* 80317930 38 00 00 C4 */ li r0, 0xc4 -/* 80317934 98 03 00 31 */ stb r0, 0x31(r3) -/* 80317938 38 00 00 C5 */ li r0, 0xc5 -/* 8031793C 98 03 00 35 */ stb r0, 0x35(r3) -/* 80317940 38 00 00 C6 */ li r0, 0xc6 -/* 80317944 98 03 00 39 */ stb r0, 0x39(r3) -/* 80317948 38 00 00 C7 */ li r0, 0xc7 -/* 8031794C 98 03 00 3D */ stb r0, 0x3d(r3) -/* 80317950 38 00 00 0C */ li r0, 0xc -/* 80317954 98 03 00 72 */ stb r0, 0x72(r3) -/* 80317958 98 03 00 73 */ stb r0, 0x73(r3) -/* 8031795C 98 03 00 74 */ stb r0, 0x74(r3) -/* 80317960 98 03 00 75 */ stb r0, 0x75(r3) -/* 80317964 38 00 00 1C */ li r0, 0x1c -/* 80317968 98 03 00 76 */ stb r0, 0x76(r3) -/* 8031796C 98 03 00 77 */ stb r0, 0x77(r3) -/* 80317970 98 03 00 78 */ stb r0, 0x78(r3) -/* 80317974 98 03 00 79 */ stb r0, 0x79(r3) -/* 80317978 38 80 00 00 */ li r4, 0 -/* 8031797C 38 A2 C9 D4 */ la r5, j3dDefaultTevColor(r2) /* 804563D4-_SDA2_BASE_ */ -/* 80317980 80 C2 C9 D4 */ lwz r6, j3dDefaultTevColor(r2) -/* 80317984 80 A5 00 04 */ lwz r5, 4(r5) -/* 80317988 38 00 00 03 */ li r0, 3 -/* 8031798C 7C 09 03 A6 */ mtctr r0 -lbl_80317990: -/* 80317990 38 E4 00 42 */ addi r7, r4, 0x42 -/* 80317994 7C E3 3A 14 */ add r7, r3, r7 -/* 80317998 90 C7 00 00 */ stw r6, 0(r7) -/* 8031799C 90 A7 00 04 */ stw r5, 4(r7) -/* 803179A0 38 84 00 08 */ addi r4, r4, 8 -/* 803179A4 42 00 FF EC */ bdnz lbl_80317990 -/* 803179A8 38 80 00 00 */ li r4, 0 -/* 803179AC 80 A2 C9 E0 */ lwz r5, j3dDefaultTevKColor(r2) -/* 803179B0 38 00 00 04 */ li r0, 4 -/* 803179B4 7C 09 03 A6 */ mtctr r0 -lbl_803179B8: -/* 803179B8 90 A1 00 08 */ stw r5, 8(r1) -/* 803179BC 88 01 00 08 */ lbz r0, 8(r1) -/* 803179C0 38 C4 00 62 */ addi r6, r4, 0x62 -/* 803179C4 7C C3 32 14 */ add r6, r3, r6 -/* 803179C8 98 06 00 00 */ stb r0, 0(r6) -/* 803179CC 88 01 00 09 */ lbz r0, 9(r1) -/* 803179D0 98 06 00 01 */ stb r0, 1(r6) -/* 803179D4 88 01 00 0A */ lbz r0, 0xa(r1) -/* 803179D8 98 06 00 02 */ stb r0, 2(r6) -/* 803179DC 88 01 00 0B */ lbz r0, 0xb(r1) -/* 803179E0 98 06 00 03 */ stb r0, 3(r6) -/* 803179E4 38 84 00 04 */ addi r4, r4, 4 -/* 803179E8 42 00 FF D0 */ bdnz lbl_803179B8 -/* 803179EC 38 00 00 00 */ li r0, 0 -/* 803179F0 90 03 00 04 */ stw r0, 4(r3) -/* 803179F4 90 03 00 90 */ stw r0, 0x90(r3) -/* 803179F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 803179FC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__13J3DTevBlock16Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__13J3DTevBlock16Fv.s deleted file mode 100644 index 5c2632fc120..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__13J3DTevBlock16Fv.s +++ /dev/null @@ -1,81 +0,0 @@ -lbl_80317A00: -/* 80317A00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80317A04 38 80 00 00 */ li r4, 0 -/* 80317A08 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000FFFF@ha */ -/* 80317A0C 38 A5 FF FF */ addi r5, r5, 0xFFFF /* 0x0000FFFF@l */ -/* 80317A10 38 00 00 08 */ li r0, 8 -/* 80317A14 7C 09 03 A6 */ mtctr r0 -lbl_80317A18: -/* 80317A18 38 04 00 08 */ addi r0, r4, 8 -/* 80317A1C 7C A3 03 2E */ sthx r5, r3, r0 -/* 80317A20 38 84 00 02 */ addi r4, r4, 2 -/* 80317A24 42 00 FF F4 */ bdnz lbl_80317A18 -/* 80317A28 38 00 00 01 */ li r0, 1 -/* 80317A2C 98 03 00 58 */ stb r0, 0x58(r3) -/* 80317A30 38 80 00 00 */ li r4, 0 -/* 80317A34 38 A2 C9 D4 */ la r5, j3dDefaultTevColor(r2) /* 804563D4-_SDA2_BASE_ */ -/* 80317A38 80 C2 C9 D4 */ lwz r6, j3dDefaultTevColor(r2) -/* 80317A3C 80 A5 00 04 */ lwz r5, 4(r5) -/* 80317A40 38 00 00 03 */ li r0, 3 -/* 80317A44 7C 09 03 A6 */ mtctr r0 -lbl_80317A48: -/* 80317A48 38 E4 00 DA */ addi r7, r4, 0xda -/* 80317A4C 7C E3 3A 14 */ add r7, r3, r7 -/* 80317A50 90 C7 00 00 */ stw r6, 0(r7) -/* 80317A54 90 A7 00 04 */ stw r5, 4(r7) -/* 80317A58 38 84 00 08 */ addi r4, r4, 8 -/* 80317A5C 42 00 FF EC */ bdnz lbl_80317A48 -/* 80317A60 38 80 00 00 */ li r4, 0 -/* 80317A64 80 A2 C9 E0 */ lwz r5, j3dDefaultTevKColor(r2) -/* 80317A68 38 00 00 04 */ li r0, 4 -/* 80317A6C 7C 09 03 A6 */ mtctr r0 -lbl_80317A70: -/* 80317A70 90 A1 00 08 */ stw r5, 8(r1) -/* 80317A74 88 01 00 08 */ lbz r0, 8(r1) -/* 80317A78 38 C4 00 FA */ addi r6, r4, 0xfa -/* 80317A7C 7C C3 32 14 */ add r6, r3, r6 -/* 80317A80 98 06 00 00 */ stb r0, 0(r6) -/* 80317A84 88 01 00 09 */ lbz r0, 9(r1) -/* 80317A88 98 06 00 01 */ stb r0, 1(r6) -/* 80317A8C 88 01 00 0A */ lbz r0, 0xa(r1) -/* 80317A90 98 06 00 02 */ stb r0, 2(r6) -/* 80317A94 88 01 00 0B */ lbz r0, 0xb(r1) -/* 80317A98 98 06 00 03 */ stb r0, 3(r6) -/* 80317A9C 38 84 00 04 */ addi r4, r4, 4 -/* 80317AA0 42 00 FF D0 */ bdnz lbl_80317A70 -/* 80317AA4 38 A0 00 00 */ li r5, 0 -/* 80317AA8 38 80 00 0C */ li r4, 0xc -/* 80317AAC 38 00 00 10 */ li r0, 0x10 -/* 80317AB0 7C 09 03 A6 */ mtctr r0 -lbl_80317AB4: -/* 80317AB4 38 05 01 0A */ addi r0, r5, 0x10a -/* 80317AB8 7C 83 01 AE */ stbx r4, r3, r0 -/* 80317ABC 38 A5 00 01 */ addi r5, r5, 1 -/* 80317AC0 42 00 FF F4 */ bdnz lbl_80317AB4 -/* 80317AC4 38 A0 00 00 */ li r5, 0 -/* 80317AC8 38 80 00 1C */ li r4, 0x1c -/* 80317ACC 38 00 00 10 */ li r0, 0x10 -/* 80317AD0 7C 09 03 A6 */ mtctr r0 -lbl_80317AD4: -/* 80317AD4 38 05 01 1A */ addi r0, r5, 0x11a -/* 80317AD8 7C 83 01 AE */ stbx r4, r3, r0 -/* 80317ADC 38 A5 00 01 */ addi r5, r5, 1 -/* 80317AE0 42 00 FF F4 */ bdnz lbl_80317AD4 -/* 80317AE4 38 80 00 00 */ li r4, 0 -/* 80317AE8 38 A0 00 00 */ li r5, 0 -/* 80317AEC 38 00 00 10 */ li r0, 0x10 -/* 80317AF0 7C 09 03 A6 */ mtctr r0 -lbl_80317AF4: -/* 80317AF4 38 05 00 C0 */ addi r0, r5, 0xc0 -/* 80317AF8 7C C3 22 14 */ add r6, r3, r4 -/* 80317AFC 98 06 00 59 */ stb r0, 0x59(r6) -/* 80317B00 38 05 00 C1 */ addi r0, r5, 0xc1 -/* 80317B04 98 06 00 5D */ stb r0, 0x5d(r6) -/* 80317B08 38 84 00 08 */ addi r4, r4, 8 -/* 80317B0C 38 A5 00 02 */ addi r5, r5, 2 -/* 80317B10 42 00 FF E4 */ bdnz lbl_80317AF4 -/* 80317B14 38 00 00 00 */ li r0, 0 -/* 80317B18 90 03 00 04 */ stw r0, 4(r3) -/* 80317B1C 90 03 01 70 */ stw r0, 0x170(r3) -/* 80317B20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80317B24 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__18J3DTevBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__18J3DTevBlockPatchedFv.s deleted file mode 100644 index 92e90281b3c..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__18J3DTevBlockPatchedFv.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_803176E0: -/* 803176E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803176E4 38 80 00 00 */ li r4, 0 -/* 803176E8 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000FFFF@ha */ -/* 803176EC 38 A5 FF FF */ addi r5, r5, 0xFFFF /* 0x0000FFFF@l */ -/* 803176F0 38 00 00 08 */ li r0, 8 -/* 803176F4 7C 09 03 A6 */ mtctr r0 -lbl_803176F8: -/* 803176F8 38 04 00 08 */ addi r0, r4, 8 -/* 803176FC 7C A3 03 2E */ sthx r5, r3, r0 -/* 80317700 38 84 00 02 */ addi r4, r4, 2 -/* 80317704 42 00 FF F4 */ bdnz lbl_803176F8 -/* 80317708 38 80 00 00 */ li r4, 0 -/* 8031770C 38 A0 00 00 */ li r5, 0 -/* 80317710 38 00 00 08 */ li r0, 8 -/* 80317714 7C 09 03 A6 */ mtctr r0 -lbl_80317718: -/* 80317718 38 05 00 C0 */ addi r0, r5, 0xc0 -/* 8031771C 7C C3 22 14 */ add r6, r3, r4 -/* 80317720 98 06 00 38 */ stb r0, 0x38(r6) -/* 80317724 38 05 00 C1 */ addi r0, r5, 0xc1 -/* 80317728 98 06 00 3C */ stb r0, 0x3c(r6) -/* 8031772C 38 84 00 08 */ addi r4, r4, 8 -/* 80317730 38 A5 00 02 */ addi r5, r5, 2 -/* 80317734 42 00 FF E4 */ bdnz lbl_80317718 -/* 80317738 38 80 00 00 */ li r4, 0 -/* 8031773C 38 A2 C9 D4 */ la r5, j3dDefaultTevColor(r2) /* 804563D4-_SDA2_BASE_ */ -/* 80317740 80 C2 C9 D4 */ lwz r6, j3dDefaultTevColor(r2) -/* 80317744 80 A5 00 04 */ lwz r5, 4(r5) -/* 80317748 38 00 00 03 */ li r0, 3 -/* 8031774C 7C 09 03 A6 */ mtctr r0 -lbl_80317750: -/* 80317750 38 E4 00 98 */ addi r7, r4, 0x98 -/* 80317754 7C E3 3A 14 */ add r7, r3, r7 -/* 80317758 90 C7 00 00 */ stw r6, 0(r7) -/* 8031775C 90 A7 00 04 */ stw r5, 4(r7) -/* 80317760 38 84 00 08 */ addi r4, r4, 8 -/* 80317764 42 00 FF EC */ bdnz lbl_80317750 -/* 80317768 38 80 00 00 */ li r4, 0 -/* 8031776C 80 A2 C9 E0 */ lwz r5, j3dDefaultTevKColor(r2) -/* 80317770 38 00 00 04 */ li r0, 4 -/* 80317774 7C 09 03 A6 */ mtctr r0 -lbl_80317778: -/* 80317778 90 A1 00 08 */ stw r5, 8(r1) -/* 8031777C 88 01 00 08 */ lbz r0, 8(r1) -/* 80317780 38 C4 00 B8 */ addi r6, r4, 0xb8 -/* 80317784 7C C3 32 14 */ add r6, r3, r6 -/* 80317788 98 06 00 00 */ stb r0, 0(r6) -/* 8031778C 88 01 00 09 */ lbz r0, 9(r1) -/* 80317790 98 06 00 01 */ stb r0, 1(r6) -/* 80317794 88 01 00 0A */ lbz r0, 0xa(r1) -/* 80317798 98 06 00 02 */ stb r0, 2(r6) -/* 8031779C 88 01 00 0B */ lbz r0, 0xb(r1) -/* 803177A0 98 06 00 03 */ stb r0, 3(r6) -/* 803177A4 38 84 00 04 */ addi r4, r4, 4 -/* 803177A8 42 00 FF D0 */ bdnz lbl_80317778 -/* 803177AC 38 A0 00 00 */ li r5, 0 -/* 803177B0 38 80 00 0C */ li r4, 0xc -/* 803177B4 38 00 00 08 */ li r0, 8 -/* 803177B8 7C 09 03 A6 */ mtctr r0 -lbl_803177BC: -/* 803177BC 38 05 00 C8 */ addi r0, r5, 0xc8 -/* 803177C0 7C 83 01 AE */ stbx r4, r3, r0 -/* 803177C4 38 A5 00 01 */ addi r5, r5, 1 -/* 803177C8 42 00 FF F4 */ bdnz lbl_803177BC -/* 803177CC 38 00 00 01 */ li r0, 1 -/* 803177D0 98 03 00 D0 */ stb r0, 0xd0(r3) -/* 803177D4 38 00 00 00 */ li r0, 0 -/* 803177D8 90 03 00 04 */ stw r0, 4(r3) -/* 803177DC 90 03 00 D4 */ stw r0, 0xd4(r3) -/* 803177E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 803177E4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__20J3DColorBlockLightOnFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__20J3DColorBlockLightOnFv.s deleted file mode 100644 index a9220c7477f..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__20J3DColorBlockLightOnFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_80317580: -/* 80317580 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80317584 38 A0 00 00 */ li r5, 0 -/* 80317588 98 A3 00 14 */ stb r5, 0x14(r3) -/* 8031758C 80 82 C9 C0 */ lwz r4, j3dDefaultColInfo(r2) -/* 80317590 38 00 00 02 */ li r0, 2 -/* 80317594 7C 09 03 A6 */ mtctr r0 -lbl_80317598: -/* 80317598 90 81 00 0C */ stw r4, 0xc(r1) -/* 8031759C 88 01 00 0C */ lbz r0, 0xc(r1) -/* 803175A0 38 C5 00 04 */ addi r6, r5, 4 -/* 803175A4 7C C3 32 14 */ add r6, r3, r6 -/* 803175A8 98 06 00 00 */ stb r0, 0(r6) -/* 803175AC 88 01 00 0D */ lbz r0, 0xd(r1) -/* 803175B0 98 06 00 01 */ stb r0, 1(r6) -/* 803175B4 88 01 00 0E */ lbz r0, 0xe(r1) -/* 803175B8 98 06 00 02 */ stb r0, 2(r6) -/* 803175BC 88 01 00 0F */ lbz r0, 0xf(r1) -/* 803175C0 98 06 00 03 */ stb r0, 3(r6) -/* 803175C4 38 A5 00 04 */ addi r5, r5, 4 -/* 803175C8 42 00 FF D0 */ bdnz lbl_80317598 -/* 803175CC 38 80 00 00 */ li r4, 0 -/* 803175D0 80 A2 C9 C4 */ lwz r5, j3dDefaultAmbInfo(r2) -/* 803175D4 38 00 00 02 */ li r0, 2 -/* 803175D8 7C 09 03 A6 */ mtctr r0 -lbl_803175DC: -/* 803175DC 90 A1 00 08 */ stw r5, 8(r1) -/* 803175E0 88 01 00 08 */ lbz r0, 8(r1) -/* 803175E4 38 C4 00 0C */ addi r6, r4, 0xc -/* 803175E8 7C C3 32 14 */ add r6, r3, r6 -/* 803175EC 98 06 00 00 */ stb r0, 0(r6) -/* 803175F0 88 01 00 09 */ lbz r0, 9(r1) -/* 803175F4 98 06 00 01 */ stb r0, 1(r6) -/* 803175F8 88 01 00 0A */ lbz r0, 0xa(r1) -/* 803175FC 98 06 00 02 */ stb r0, 2(r6) -/* 80317600 88 01 00 0B */ lbz r0, 0xb(r1) -/* 80317604 98 06 00 03 */ stb r0, 3(r6) -/* 80317608 38 84 00 04 */ addi r4, r4, 4 -/* 8031760C 42 00 FF D0 */ bdnz lbl_803175DC -/* 80317610 38 80 00 00 */ li r4, 0 -/* 80317614 38 A0 00 00 */ li r5, 0 -/* 80317618 38 00 00 08 */ li r0, 8 -/* 8031761C 7C 09 03 A6 */ mtctr r0 -lbl_80317620: -/* 80317620 38 04 00 20 */ addi r0, r4, 0x20 -/* 80317624 7C A3 01 2E */ stwx r5, r3, r0 -/* 80317628 38 84 00 04 */ addi r4, r4, 4 -/* 8031762C 42 00 FF F4 */ bdnz lbl_80317620 -/* 80317630 38 00 00 00 */ li r0, 0 -/* 80317634 90 03 00 44 */ stw r0, 0x44(r3) -/* 80317638 90 03 00 48 */ stw r0, 0x48(r3) -/* 8031763C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80317640 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__21J3DColorBlockLightOffFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__21J3DColorBlockLightOffFv.s deleted file mode 100644 index 7bff70f7e3f..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__21J3DColorBlockLightOffFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8031747C: -/* 8031747C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80317480 38 A0 00 00 */ li r5, 0 -/* 80317484 98 A3 00 0C */ stb r5, 0xc(r3) -/* 80317488 80 82 C9 C0 */ lwz r4, j3dDefaultColInfo(r2) -/* 8031748C 38 00 00 02 */ li r0, 2 -/* 80317490 7C 09 03 A6 */ mtctr r0 -lbl_80317494: -/* 80317494 90 81 00 08 */ stw r4, 8(r1) -/* 80317498 88 01 00 08 */ lbz r0, 8(r1) -/* 8031749C 38 C5 00 04 */ addi r6, r5, 4 -/* 803174A0 7C C3 32 14 */ add r6, r3, r6 -/* 803174A4 98 06 00 00 */ stb r0, 0(r6) -/* 803174A8 88 01 00 09 */ lbz r0, 9(r1) -/* 803174AC 98 06 00 01 */ stb r0, 1(r6) -/* 803174B0 88 01 00 0A */ lbz r0, 0xa(r1) -/* 803174B4 98 06 00 02 */ stb r0, 2(r6) -/* 803174B8 88 01 00 0B */ lbz r0, 0xb(r1) -/* 803174BC 98 06 00 03 */ stb r0, 3(r6) -/* 803174C0 38 A5 00 04 */ addi r5, r5, 4 -/* 803174C4 42 00 FF D0 */ bdnz lbl_80317494 -/* 803174C8 38 00 00 00 */ li r0, 0 -/* 803174CC 90 03 00 18 */ stw r0, 0x18(r3) -/* 803174D0 90 03 00 1C */ stw r0, 0x1c(r3) -/* 803174D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 803174D8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__22J3DColorBlockAmbientOnFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__22J3DColorBlockAmbientOnFv.s deleted file mode 100644 index 5cf2d1a10b4..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__22J3DColorBlockAmbientOnFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_803174DC: -/* 803174DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803174E0 38 A0 00 00 */ li r5, 0 -/* 803174E4 98 A3 00 0C */ stb r5, 0xc(r3) -/* 803174E8 80 82 C9 C0 */ lwz r4, j3dDefaultColInfo(r2) -/* 803174EC 38 00 00 02 */ li r0, 2 -/* 803174F0 7C 09 03 A6 */ mtctr r0 -lbl_803174F4: -/* 803174F4 90 81 00 0C */ stw r4, 0xc(r1) -/* 803174F8 88 01 00 0C */ lbz r0, 0xc(r1) -/* 803174FC 38 C5 00 04 */ addi r6, r5, 4 -/* 80317500 7C C3 32 14 */ add r6, r3, r6 -/* 80317504 98 06 00 00 */ stb r0, 0(r6) -/* 80317508 88 01 00 0D */ lbz r0, 0xd(r1) -/* 8031750C 98 06 00 01 */ stb r0, 1(r6) -/* 80317510 88 01 00 0E */ lbz r0, 0xe(r1) -/* 80317514 98 06 00 02 */ stb r0, 2(r6) -/* 80317518 88 01 00 0F */ lbz r0, 0xf(r1) -/* 8031751C 98 06 00 03 */ stb r0, 3(r6) -/* 80317520 38 A5 00 04 */ addi r5, r5, 4 -/* 80317524 42 00 FF D0 */ bdnz lbl_803174F4 -/* 80317528 38 80 00 00 */ li r4, 0 -/* 8031752C 80 A2 C9 C4 */ lwz r5, j3dDefaultAmbInfo(r2) -/* 80317530 38 00 00 02 */ li r0, 2 -/* 80317534 7C 09 03 A6 */ mtctr r0 -lbl_80317538: -/* 80317538 90 A1 00 08 */ stw r5, 8(r1) -/* 8031753C 88 01 00 08 */ lbz r0, 8(r1) -/* 80317540 38 C4 00 20 */ addi r6, r4, 0x20 -/* 80317544 7C C3 32 14 */ add r6, r3, r6 -/* 80317548 98 06 00 00 */ stb r0, 0(r6) -/* 8031754C 88 01 00 09 */ lbz r0, 9(r1) -/* 80317550 98 06 00 01 */ stb r0, 1(r6) -/* 80317554 88 01 00 0A */ lbz r0, 0xa(r1) -/* 80317558 98 06 00 02 */ stb r0, 2(r6) -/* 8031755C 88 01 00 0B */ lbz r0, 0xb(r1) -/* 80317560 98 06 00 03 */ stb r0, 3(r6) -/* 80317564 38 84 00 04 */ addi r4, r4, 4 -/* 80317568 42 00 FF D0 */ bdnz lbl_80317538 -/* 8031756C 38 00 00 00 */ li r0, 0 -/* 80317570 90 03 00 18 */ stw r0, 0x18(r3) -/* 80317574 90 03 00 1C */ stw r0, 0x1c(r3) -/* 80317578 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031757C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock1Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock1Fv.s deleted file mode 100644 index d9586b948d9..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock1Fv.s +++ /dev/null @@ -1,147 +0,0 @@ -lbl_8031AD64: -/* 8031AD64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031AD68 7C 08 02 A6 */ mflr r0 -/* 8031AD6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031AD70 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8031AD74 7C 7F 1B 78 */ mr r31, r3 -/* 8031AD78 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031AD7C 80 64 00 00 */ lwz r3, 0(r4) -/* 8031AD80 80 04 00 08 */ lwz r0, 8(r4) -/* 8031AD84 7C 03 00 50 */ subf r0, r3, r0 -/* 8031AD88 90 1F 00 04 */ stw r0, 4(r31) -/* 8031AD8C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031AD90 80 64 00 08 */ lwz r3, 8(r4) -/* 8031AD94 38 63 00 69 */ addi r3, r3, 0x69 -/* 8031AD98 80 04 00 0C */ lwz r0, 0xc(r4) -/* 8031AD9C 7C 03 00 40 */ cmplw r3, r0 -/* 8031ADA0 40 81 00 08 */ ble lbl_8031ADA8 -/* 8031ADA4 48 04 63 31 */ bl GDOverflowed -lbl_8031ADA8: -/* 8031ADA8 A0 1F 00 08 */ lhz r0, 8(r31) -/* 8031ADAC 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031ADB0 41 82 00 10 */ beq lbl_8031ADC0 -/* 8031ADB4 38 60 00 00 */ li r3, 0 -/* 8031ADB8 38 9F 00 08 */ addi r4, r31, 8 -/* 8031ADBC 48 00 91 D9 */ bl loadTexNo__FUlRCUs -lbl_8031ADC0: -/* 8031ADC0 38 60 00 00 */ li r3, 0 -/* 8031ADC4 88 9F 00 0A */ lbz r4, 0xa(r31) -/* 8031ADC8 88 BF 00 0B */ lbz r5, 0xb(r31) -/* 8031ADCC 88 DF 00 0C */ lbz r6, 0xc(r31) -/* 8031ADD0 38 E0 00 FF */ li r7, 0xff -/* 8031ADD4 39 00 00 FF */ li r8, 0xff -/* 8031ADD8 39 20 00 FF */ li r9, 0xff -/* 8031ADDC 4B FF 43 2D */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID -/* 8031ADE0 88 1F 00 0B */ lbz r0, 0xb(r31) -/* 8031ADE4 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031ADE8 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ -/* 8031ADEC 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ -/* 8031ADF0 7D 00 22 14 */ add r8, r0, r4 -/* 8031ADF4 88 7F 00 0A */ lbz r3, 0xa(r31) -/* 8031ADF8 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031ADFC A0 08 00 04 */ lhz r0, 4(r8) -/* 8031AE00 20 00 00 01 */ subfic r0, r0, 1 -/* 8031AE04 7C 00 00 34 */ cntlzw r0, r0 -/* 8031AE08 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031AE0C 38 C0 00 00 */ li r6, 0 -/* 8031AE10 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031AE14 A0 08 00 06 */ lhz r0, 6(r8) -/* 8031AE18 20 00 00 01 */ subfic r0, r0, 1 -/* 8031AE1C 7C 00 00 34 */ cntlzw r0, r0 -/* 8031AE20 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031AE24 39 20 00 00 */ li r9, 0 -/* 8031AE28 4B FF 34 0D */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031AE2C 80 FF 00 0E */ lwz r7, 0xe(r31) -/* 8031AE30 38 00 00 61 */ li r0, 0x61 -/* 8031AE34 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031AE38 80 85 00 08 */ lwz r4, 8(r5) -/* 8031AE3C 38 64 00 01 */ addi r3, r4, 1 -/* 8031AE40 90 65 00 08 */ stw r3, 8(r5) -/* 8031AE44 98 04 00 00 */ stb r0, 0(r4) -/* 8031AE48 54 E6 46 3E */ srwi r6, r7, 0x18 -/* 8031AE4C 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031AE50 80 85 00 08 */ lwz r4, 8(r5) -/* 8031AE54 38 64 00 01 */ addi r3, r4, 1 -/* 8031AE58 90 65 00 08 */ stw r3, 8(r5) -/* 8031AE5C 98 C4 00 00 */ stb r6, 0(r4) -/* 8031AE60 54 E6 86 3E */ rlwinm r6, r7, 0x10, 0x18, 0x1f -/* 8031AE64 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031AE68 80 85 00 08 */ lwz r4, 8(r5) -/* 8031AE6C 38 64 00 01 */ addi r3, r4, 1 -/* 8031AE70 90 65 00 08 */ stw r3, 8(r5) -/* 8031AE74 98 C4 00 00 */ stb r6, 0(r4) -/* 8031AE78 54 E6 C6 3E */ rlwinm r6, r7, 0x18, 0x18, 0x1f -/* 8031AE7C 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031AE80 80 85 00 08 */ lwz r4, 8(r5) -/* 8031AE84 38 64 00 01 */ addi r3, r4, 1 -/* 8031AE88 90 65 00 08 */ stw r3, 8(r5) -/* 8031AE8C 98 C4 00 00 */ stb r6, 0(r4) -/* 8031AE90 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031AE94 80 85 00 08 */ lwz r4, 8(r5) -/* 8031AE98 38 64 00 01 */ addi r3, r4, 1 -/* 8031AE9C 90 65 00 08 */ stw r3, 8(r5) -/* 8031AEA0 98 E4 00 00 */ stb r7, 0(r4) -/* 8031AEA4 80 FF 00 12 */ lwz r7, 0x12(r31) -/* 8031AEA8 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031AEAC 80 85 00 08 */ lwz r4, 8(r5) -/* 8031AEB0 38 64 00 01 */ addi r3, r4, 1 -/* 8031AEB4 90 65 00 08 */ stw r3, 8(r5) -/* 8031AEB8 98 04 00 00 */ stb r0, 0(r4) -/* 8031AEBC 54 E6 46 3E */ srwi r6, r7, 0x18 -/* 8031AEC0 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031AEC4 80 85 00 08 */ lwz r4, 8(r5) -/* 8031AEC8 38 64 00 01 */ addi r3, r4, 1 -/* 8031AECC 90 65 00 08 */ stw r3, 8(r5) -/* 8031AED0 98 C4 00 00 */ stb r6, 0(r4) -/* 8031AED4 54 E6 86 3E */ rlwinm r6, r7, 0x10, 0x18, 0x1f -/* 8031AED8 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031AEDC 80 85 00 08 */ lwz r4, 8(r5) -/* 8031AEE0 38 64 00 01 */ addi r3, r4, 1 -/* 8031AEE4 90 65 00 08 */ stw r3, 8(r5) -/* 8031AEE8 98 C4 00 00 */ stb r6, 0(r4) -/* 8031AEEC 54 E6 C6 3E */ rlwinm r6, r7, 0x18, 0x18, 0x1f -/* 8031AEF0 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031AEF4 80 85 00 08 */ lwz r4, 8(r5) -/* 8031AEF8 38 64 00 01 */ addi r3, r4, 1 -/* 8031AEFC 90 65 00 08 */ stw r3, 8(r5) -/* 8031AF00 98 C4 00 00 */ stb r6, 0(r4) -/* 8031AF04 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031AF08 80 85 00 08 */ lwz r4, 8(r5) -/* 8031AF0C 38 64 00 01 */ addi r3, r4, 1 -/* 8031AF10 90 65 00 08 */ stw r3, 8(r5) -/* 8031AF14 98 E4 00 00 */ stb r7, 0(r4) -/* 8031AF18 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8031AF1C 64 66 10 00 */ oris r6, r3, 0x1000 -/* 8031AF20 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031AF24 80 85 00 08 */ lwz r4, 8(r5) -/* 8031AF28 38 64 00 01 */ addi r3, r4, 1 -/* 8031AF2C 90 65 00 08 */ stw r3, 8(r5) -/* 8031AF30 98 04 00 00 */ stb r0, 0(r4) -/* 8031AF34 54 C5 46 3E */ srwi r5, r6, 0x18 -/* 8031AF38 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031AF3C 80 64 00 08 */ lwz r3, 8(r4) -/* 8031AF40 38 03 00 01 */ addi r0, r3, 1 -/* 8031AF44 90 04 00 08 */ stw r0, 8(r4) -/* 8031AF48 98 A3 00 00 */ stb r5, 0(r3) -/* 8031AF4C 54 C5 86 3E */ rlwinm r5, r6, 0x10, 0x18, 0x1f -/* 8031AF50 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031AF54 80 64 00 08 */ lwz r3, 8(r4) -/* 8031AF58 38 03 00 01 */ addi r0, r3, 1 -/* 8031AF5C 90 04 00 08 */ stw r0, 8(r4) -/* 8031AF60 98 A3 00 00 */ stb r5, 0(r3) -/* 8031AF64 54 C5 C6 3E */ rlwinm r5, r6, 0x18, 0x18, 0x1f -/* 8031AF68 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031AF6C 80 64 00 08 */ lwz r3, 8(r4) -/* 8031AF70 38 03 00 01 */ addi r0, r3, 1 -/* 8031AF74 90 04 00 08 */ stw r0, 8(r4) -/* 8031AF78 98 A3 00 00 */ stb r5, 0(r3) -/* 8031AF7C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031AF80 80 64 00 08 */ lwz r3, 8(r4) -/* 8031AF84 38 03 00 01 */ addi r0, r3, 1 -/* 8031AF88 90 04 00 08 */ stw r0, 8(r4) -/* 8031AF8C 98 C3 00 00 */ stb r6, 0(r3) -/* 8031AF90 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8031AF94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031AF98 7C 08 03 A6 */ mtlr r0 -/* 8031AF9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031AFA0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock2Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock2Fv.s deleted file mode 100644 index 1bef6eed4a3..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock2Fv.s +++ /dev/null @@ -1,335 +0,0 @@ -lbl_8031AFA4: -/* 8031AFA4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8031AFA8 7C 08 02 A6 */ mflr r0 -/* 8031AFAC 90 01 00 34 */ stw r0, 0x34(r1) -/* 8031AFB0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031AFB4 48 04 72 25 */ bl _savegpr_28 -/* 8031AFB8 7C 7E 1B 78 */ mr r30, r3 -/* 8031AFBC 8B E3 00 34 */ lbz r31, 0x34(r3) -/* 8031AFC0 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031AFC4 80 64 00 00 */ lwz r3, 0(r4) -/* 8031AFC8 80 04 00 08 */ lwz r0, 8(r4) -/* 8031AFCC 7C 03 00 50 */ subf r0, r3, r0 -/* 8031AFD0 90 1E 00 04 */ stw r0, 4(r30) -/* 8031AFD4 3B 80 00 00 */ li r28, 0 -/* 8031AFD8 3B A0 00 00 */ li r29, 0 -lbl_8031AFDC: -/* 8031AFDC 38 9D 00 08 */ addi r4, r29, 8 -/* 8031AFE0 7C 9E 22 14 */ add r4, r30, r4 -/* 8031AFE4 A0 04 00 00 */ lhz r0, 0(r4) -/* 8031AFE8 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031AFEC 41 82 00 0C */ beq lbl_8031AFF8 -/* 8031AFF0 7F 83 E3 78 */ mr r3, r28 -/* 8031AFF4 48 00 8F A1 */ bl loadTexNo__FUlRCUs -lbl_8031AFF8: -/* 8031AFF8 3B 9C 00 01 */ addi r28, r28, 1 -/* 8031AFFC 28 1C 00 02 */ cmplwi r28, 2 -/* 8031B000 3B BD 00 02 */ addi r29, r29, 2 -/* 8031B004 41 80 FF D8 */ blt lbl_8031AFDC -/* 8031B008 38 60 00 00 */ li r3, 0 -/* 8031B00C 88 9E 00 0C */ lbz r4, 0xc(r30) -/* 8031B010 88 BE 00 0D */ lbz r5, 0xd(r30) -/* 8031B014 88 DE 00 0E */ lbz r6, 0xe(r30) -/* 8031B018 88 FE 00 10 */ lbz r7, 0x10(r30) -/* 8031B01C 89 1E 00 11 */ lbz r8, 0x11(r30) -/* 8031B020 89 3E 00 12 */ lbz r9, 0x12(r30) -/* 8031B024 4B FF 40 E5 */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID -/* 8031B028 88 1E 00 0D */ lbz r0, 0xd(r30) -/* 8031B02C 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031B030 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ -/* 8031B034 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ -/* 8031B038 7D 00 22 14 */ add r8, r0, r4 -/* 8031B03C 88 7E 00 0C */ lbz r3, 0xc(r30) -/* 8031B040 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031B044 A0 08 00 04 */ lhz r0, 4(r8) -/* 8031B048 20 00 00 01 */ subfic r0, r0, 1 -/* 8031B04C 7C 00 00 34 */ cntlzw r0, r0 -/* 8031B050 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031B054 38 C0 00 00 */ li r6, 0 -/* 8031B058 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031B05C A0 08 00 06 */ lhz r0, 6(r8) -/* 8031B060 20 00 00 01 */ subfic r0, r0, 1 -/* 8031B064 7C 00 00 34 */ cntlzw r0, r0 -/* 8031B068 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031B06C 39 20 00 00 */ li r9, 0 -/* 8031B070 4B FF 31 C5 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031B074 88 1E 00 11 */ lbz r0, 0x11(r30) -/* 8031B078 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031B07C 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ -/* 8031B080 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ -/* 8031B084 7D 00 22 14 */ add r8, r0, r4 -/* 8031B088 88 1E 00 10 */ lbz r0, 0x10(r30) -/* 8031B08C 54 03 07 7E */ clrlwi r3, r0, 0x1d -/* 8031B090 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031B094 A0 08 00 04 */ lhz r0, 4(r8) -/* 8031B098 20 00 00 01 */ subfic r0, r0, 1 -/* 8031B09C 7C 00 00 34 */ cntlzw r0, r0 -/* 8031B0A0 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031B0A4 38 C0 00 00 */ li r6, 0 -/* 8031B0A8 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031B0AC A0 08 00 06 */ lhz r0, 6(r8) -/* 8031B0B0 20 00 00 01 */ subfic r0, r0, 1 -/* 8031B0B4 7C 00 00 34 */ cntlzw r0, r0 -/* 8031B0B8 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031B0BC 39 20 00 00 */ li r9, 0 -/* 8031B0C0 4B FF 31 75 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031B0C4 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031B0C8 80 64 00 00 */ lwz r3, 0(r4) -/* 8031B0CC 80 04 00 08 */ lwz r0, 8(r4) -/* 8031B0D0 7C 03 00 50 */ subf r0, r3, r0 -/* 8031B0D4 90 1E 00 68 */ stw r0, 0x68(r30) -/* 8031B0D8 3B 80 00 00 */ li r28, 0 -/* 8031B0DC 3B A0 00 00 */ li r29, 0 -lbl_8031B0E0: -/* 8031B0E0 38 1D 00 14 */ addi r0, r29, 0x14 -/* 8031B0E4 7C 9E 02 14 */ add r4, r30, r0 -/* 8031B0E8 80 64 00 00 */ lwz r3, 0(r4) -/* 8031B0EC 80 04 00 04 */ lwz r0, 4(r4) -/* 8031B0F0 90 61 00 0C */ stw r3, 0xc(r1) -/* 8031B0F4 90 01 00 10 */ stw r0, 0x10(r1) -/* 8031B0F8 38 7C 00 01 */ addi r3, r28, 1 -/* 8031B0FC 38 81 00 0C */ addi r4, r1, 0xc -/* 8031B100 4B FF 42 FD */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 -/* 8031B104 3B 9C 00 01 */ addi r28, r28, 1 -/* 8031B108 28 1C 00 03 */ cmplwi r28, 3 -/* 8031B10C 3B BD 00 08 */ addi r29, r29, 8 -/* 8031B110 41 80 FF D0 */ blt lbl_8031B0E0 -/* 8031B114 3B 80 00 00 */ li r28, 0 -/* 8031B118 3B A0 00 00 */ li r29, 0 -lbl_8031B11C: -/* 8031B11C 38 1D 00 45 */ addi r0, r29, 0x45 -/* 8031B120 7C 1E 00 2E */ lwzx r0, r30, r0 -/* 8031B124 90 01 00 08 */ stw r0, 8(r1) -/* 8031B128 7F 83 E3 78 */ mr r3, r28 -/* 8031B12C 38 81 00 08 */ addi r4, r1, 8 -/* 8031B130 4B FF 41 65 */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor -/* 8031B134 3B 9C 00 01 */ addi r28, r28, 1 -/* 8031B138 28 1C 00 04 */ cmplwi r28, 4 -/* 8031B13C 3B BD 00 04 */ addi r29, r29, 4 -/* 8031B140 41 80 FF DC */ blt lbl_8031B11C -/* 8031B144 38 60 00 00 */ li r3, 0 -/* 8031B148 38 80 00 00 */ li r4, 0 -/* 8031B14C 38 A0 00 00 */ li r5, 0 -/* 8031B150 7F E9 03 A6 */ mtctr r31 -/* 8031B154 28 1F 00 00 */ cmplwi r31, 0 -/* 8031B158 40 81 01 8C */ ble lbl_8031B2E4 -lbl_8031B15C: -/* 8031B15C 39 65 00 35 */ addi r11, r5, 0x35 -/* 8031B160 7D 7E 5A 14 */ add r11, r30, r11 -/* 8031B164 81 4B 00 00 */ lwz r10, 0(r11) -/* 8031B168 38 00 00 61 */ li r0, 0x61 -/* 8031B16C 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B170 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B174 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B178 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B17C 98 07 00 00 */ stb r0, 0(r7) -/* 8031B180 55 49 46 3E */ srwi r9, r10, 0x18 -/* 8031B184 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B188 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B18C 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B190 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B194 99 27 00 00 */ stb r9, 0(r7) -/* 8031B198 55 49 86 3E */ rlwinm r9, r10, 0x10, 0x18, 0x1f -/* 8031B19C 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B1A0 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B1A4 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B1A8 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B1AC 99 27 00 00 */ stb r9, 0(r7) -/* 8031B1B0 55 49 C6 3E */ rlwinm r9, r10, 0x18, 0x18, 0x1f -/* 8031B1B4 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B1B8 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B1BC 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B1C0 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B1C4 99 27 00 00 */ stb r9, 0(r7) -/* 8031B1C8 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B1CC 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B1D0 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B1D4 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B1D8 99 47 00 00 */ stb r10, 0(r7) -/* 8031B1DC 81 4B 00 04 */ lwz r10, 4(r11) -/* 8031B1E0 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B1E4 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B1E8 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B1EC 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B1F0 98 07 00 00 */ stb r0, 0(r7) -/* 8031B1F4 55 49 46 3E */ srwi r9, r10, 0x18 -/* 8031B1F8 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B1FC 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B200 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B204 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B208 99 27 00 00 */ stb r9, 0(r7) -/* 8031B20C 55 49 86 3E */ rlwinm r9, r10, 0x10, 0x18, 0x1f -/* 8031B210 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B214 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B218 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B21C 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B220 99 27 00 00 */ stb r9, 0(r7) -/* 8031B224 55 49 C6 3E */ rlwinm r9, r10, 0x18, 0x18, 0x1f -/* 8031B228 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B22C 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B230 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B234 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B238 99 27 00 00 */ stb r9, 0(r7) -/* 8031B23C 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B240 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B244 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B248 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B24C 99 47 00 00 */ stb r10, 0(r7) -/* 8031B250 38 C4 00 60 */ addi r6, r4, 0x60 -/* 8031B254 7C FE 30 2E */ lwzx r7, r30, r6 -/* 8031B258 38 C3 00 10 */ addi r6, r3, 0x10 -/* 8031B25C 54 C6 C0 0E */ slwi r6, r6, 0x18 -/* 8031B260 7C E9 33 78 */ or r9, r7, r6 -/* 8031B264 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B268 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B26C 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B270 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B274 98 07 00 00 */ stb r0, 0(r7) -/* 8031B278 55 28 46 3E */ srwi r8, r9, 0x18 -/* 8031B27C 80 ED 94 00 */ lwz r7, __GDCurrentDL(r13) -/* 8031B280 80 C7 00 08 */ lwz r6, 8(r7) -/* 8031B284 38 06 00 01 */ addi r0, r6, 1 -/* 8031B288 90 07 00 08 */ stw r0, 8(r7) -/* 8031B28C 99 06 00 00 */ stb r8, 0(r6) -/* 8031B290 55 28 86 3E */ rlwinm r8, r9, 0x10, 0x18, 0x1f -/* 8031B294 80 ED 94 00 */ lwz r7, __GDCurrentDL(r13) -/* 8031B298 80 C7 00 08 */ lwz r6, 8(r7) -/* 8031B29C 38 06 00 01 */ addi r0, r6, 1 -/* 8031B2A0 90 07 00 08 */ stw r0, 8(r7) -/* 8031B2A4 99 06 00 00 */ stb r8, 0(r6) -/* 8031B2A8 55 28 C6 3E */ rlwinm r8, r9, 0x18, 0x18, 0x1f -/* 8031B2AC 80 ED 94 00 */ lwz r7, __GDCurrentDL(r13) -/* 8031B2B0 80 C7 00 08 */ lwz r6, 8(r7) -/* 8031B2B4 38 06 00 01 */ addi r0, r6, 1 -/* 8031B2B8 90 07 00 08 */ stw r0, 8(r7) -/* 8031B2BC 99 06 00 00 */ stb r8, 0(r6) -/* 8031B2C0 80 ED 94 00 */ lwz r7, __GDCurrentDL(r13) -/* 8031B2C4 80 C7 00 08 */ lwz r6, 8(r7) -/* 8031B2C8 38 06 00 01 */ addi r0, r6, 1 -/* 8031B2CC 90 07 00 08 */ stw r0, 8(r7) -/* 8031B2D0 99 26 00 00 */ stb r9, 0(r6) -/* 8031B2D4 38 63 00 01 */ addi r3, r3, 1 -/* 8031B2D8 38 84 00 04 */ addi r4, r4, 4 -/* 8031B2DC 38 A5 00 08 */ addi r5, r5, 8 -/* 8031B2E0 42 00 FE 7C */ bdnz lbl_8031B15C -lbl_8031B2E4: -/* 8031B2E4 38 A0 00 00 */ li r5, 0 -/* 8031B2E8 3C 60 80 43 */ lis r3, j3dTevSwapTableTable@ha /* 0x80436A60@ha */ -/* 8031B2EC 38 63 6A 60 */ addi r3, r3, j3dTevSwapTableTable@l /* 0x80436A60@l */ -/* 8031B2F0 38 00 00 04 */ li r0, 4 -/* 8031B2F4 7C 09 03 A6 */ mtctr r0 -lbl_8031B2F8: -/* 8031B2F8 54 A4 F0 BE */ srwi r4, r5, 2 -/* 8031B2FC 38 84 00 59 */ addi r4, r4, 0x59 -/* 8031B300 7C 1E 20 AE */ lbzx r0, r30, r4 -/* 8031B304 54 00 10 3A */ slwi r0, r0, 2 -/* 8031B308 7C C3 02 14 */ add r6, r3, r0 -/* 8031B30C 8B 86 00 01 */ lbz r28, 1(r6) -/* 8031B310 8B E6 00 00 */ lbz r31, 0(r6) -/* 8031B314 89 5E 00 58 */ lbz r10, 0x58(r30) -/* 8031B318 89 3E 00 56 */ lbz r9, 0x56(r30) -/* 8031B31C 8B BE 00 57 */ lbz r29, 0x57(r30) -/* 8031B320 89 9E 00 55 */ lbz r12, 0x55(r30) -/* 8031B324 38 00 00 61 */ li r0, 0x61 -/* 8031B328 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B32C 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B330 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B334 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B338 98 07 00 00 */ stb r0, 0(r7) -/* 8031B33C 7C A6 0E 70 */ srawi r6, r5, 1 -/* 8031B340 7C C6 01 94 */ addze r6, r6 -/* 8031B344 39 66 00 F6 */ addi r11, r6, 0xf6 -/* 8031B348 55 4A 98 18 */ slwi r10, r10, 0x13 -/* 8031B34C 55 29 70 22 */ slwi r9, r9, 0xe -/* 8031B350 57 A8 48 2C */ slwi r8, r29, 9 -/* 8031B354 55 87 20 36 */ slwi r7, r12, 4 -/* 8031B358 57 86 10 3A */ slwi r6, r28, 2 -/* 8031B35C 7F E6 33 78 */ or r6, r31, r6 -/* 8031B360 7C E6 33 78 */ or r6, r7, r6 -/* 8031B364 7D 06 33 78 */ or r6, r8, r6 -/* 8031B368 7D 26 33 78 */ or r6, r9, r6 -/* 8031B36C 7D 4A 33 78 */ or r10, r10, r6 -/* 8031B370 51 6A C0 0E */ rlwimi r10, r11, 0x18, 0, 7 -/* 8031B374 55 49 46 3E */ srwi r9, r10, 0x18 -/* 8031B378 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B37C 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B380 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B384 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B388 99 27 00 00 */ stb r9, 0(r7) -/* 8031B38C 55 49 86 3E */ rlwinm r9, r10, 0x10, 0x18, 0x1f -/* 8031B390 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B394 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B398 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B39C 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B3A0 99 27 00 00 */ stb r9, 0(r7) -/* 8031B3A4 55 49 C6 3E */ rlwinm r9, r10, 0x18, 0x18, 0x1f -/* 8031B3A8 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B3AC 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B3B0 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B3B4 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B3B8 99 27 00 00 */ stb r9, 0(r7) -/* 8031B3BC 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B3C0 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B3C4 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B3C8 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B3CC 99 47 00 00 */ stb r10, 0(r7) -/* 8031B3D0 7C 9E 20 AE */ lbzx r4, r30, r4 -/* 8031B3D4 54 84 10 3A */ slwi r4, r4, 2 -/* 8031B3D8 7C 83 22 14 */ add r4, r3, r4 -/* 8031B3DC 8B A4 00 03 */ lbz r29, 3(r4) -/* 8031B3E0 8B 84 00 02 */ lbz r28, 2(r4) -/* 8031B3E4 89 1E 00 58 */ lbz r8, 0x58(r30) -/* 8031B3E8 89 9E 00 56 */ lbz r12, 0x56(r30) -/* 8031B3EC 89 7E 00 57 */ lbz r11, 0x57(r30) -/* 8031B3F0 89 5E 00 55 */ lbz r10, 0x55(r30) -/* 8031B3F4 80 ED 94 00 */ lwz r7, __GDCurrentDL(r13) -/* 8031B3F8 80 C7 00 08 */ lwz r6, 8(r7) -/* 8031B3FC 38 86 00 01 */ addi r4, r6, 1 -/* 8031B400 90 87 00 08 */ stw r4, 8(r7) -/* 8031B404 98 06 00 00 */ stb r0, 0(r6) -/* 8031B408 38 05 00 02 */ addi r0, r5, 2 -/* 8031B40C 7C 00 0E 70 */ srawi r0, r0, 1 -/* 8031B410 7C 80 01 94 */ addze r4, r0 -/* 8031B414 39 24 00 F6 */ addi r9, r4, 0xf6 -/* 8031B418 55 08 98 18 */ slwi r8, r8, 0x13 -/* 8031B41C 55 87 70 22 */ slwi r7, r12, 0xe -/* 8031B420 55 66 48 2C */ slwi r6, r11, 9 -/* 8031B424 55 44 20 36 */ slwi r4, r10, 4 -/* 8031B428 57 A0 10 3A */ slwi r0, r29, 2 -/* 8031B42C 7F 80 03 78 */ or r0, r28, r0 -/* 8031B430 7C 80 03 78 */ or r0, r4, r0 -/* 8031B434 7C C0 03 78 */ or r0, r6, r0 -/* 8031B438 7C E0 03 78 */ or r0, r7, r0 -/* 8031B43C 7D 08 03 78 */ or r8, r8, r0 -/* 8031B440 51 28 C0 0E */ rlwimi r8, r9, 0x18, 0, 7 -/* 8031B444 55 07 46 3E */ srwi r7, r8, 0x18 -/* 8031B448 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031B44C 80 86 00 08 */ lwz r4, 8(r6) -/* 8031B450 38 04 00 01 */ addi r0, r4, 1 -/* 8031B454 90 06 00 08 */ stw r0, 8(r6) -/* 8031B458 98 E4 00 00 */ stb r7, 0(r4) -/* 8031B45C 55 07 86 3E */ rlwinm r7, r8, 0x10, 0x18, 0x1f -/* 8031B460 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031B464 80 86 00 08 */ lwz r4, 8(r6) -/* 8031B468 38 04 00 01 */ addi r0, r4, 1 -/* 8031B46C 90 06 00 08 */ stw r0, 8(r6) -/* 8031B470 98 E4 00 00 */ stb r7, 0(r4) -/* 8031B474 55 07 C6 3E */ rlwinm r7, r8, 0x18, 0x18, 0x1f -/* 8031B478 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031B47C 80 86 00 08 */ lwz r4, 8(r6) -/* 8031B480 38 04 00 01 */ addi r0, r4, 1 -/* 8031B484 90 06 00 08 */ stw r0, 8(r6) -/* 8031B488 98 E4 00 00 */ stb r7, 0(r4) -/* 8031B48C 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031B490 80 86 00 08 */ lwz r4, 8(r6) -/* 8031B494 38 04 00 01 */ addi r0, r4, 1 -/* 8031B498 90 06 00 08 */ stw r0, 8(r6) -/* 8031B49C 99 04 00 00 */ stb r8, 0(r4) -/* 8031B4A0 38 A5 00 04 */ addi r5, r5, 4 -/* 8031B4A4 42 00 FE 54 */ bdnz lbl_8031B2F8 -/* 8031B4A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031B4AC 48 04 6D 79 */ bl _restgpr_28 -/* 8031B4B0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8031B4B4 7C 08 03 A6 */ mtlr r0 -/* 8031B4B8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031B4BC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock4Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock4Fv.s deleted file mode 100644 index 608a81fea70..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock4Fv.s +++ /dev/null @@ -1,347 +0,0 @@ -lbl_8031B4C0: -/* 8031B4C0 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8031B4C4 7C 08 02 A6 */ mflr r0 -/* 8031B4C8 90 01 00 44 */ stw r0, 0x44(r1) -/* 8031B4CC 39 61 00 40 */ addi r11, r1, 0x40 -/* 8031B4D0 48 04 6C FD */ bl _savegpr_25 -/* 8031B4D4 7C 7F 1B 78 */ mr r31, r3 -/* 8031B4D8 8B 83 00 20 */ lbz r28, 0x20(r3) -/* 8031B4DC 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031B4E0 80 64 00 00 */ lwz r3, 0(r4) -/* 8031B4E4 80 04 00 08 */ lwz r0, 8(r4) -/* 8031B4E8 7C 03 00 50 */ subf r0, r3, r0 -/* 8031B4EC 90 1F 00 04 */ stw r0, 4(r31) -/* 8031B4F0 3B 20 00 00 */ li r25, 0 -/* 8031B4F4 3B 40 00 00 */ li r26, 0 -lbl_8031B4F8: -/* 8031B4F8 38 9A 00 08 */ addi r4, r26, 8 -/* 8031B4FC 7C 9F 22 14 */ add r4, r31, r4 -/* 8031B500 A0 04 00 00 */ lhz r0, 0(r4) -/* 8031B504 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031B508 41 82 00 0C */ beq lbl_8031B514 -/* 8031B50C 7F 23 CB 78 */ mr r3, r25 -/* 8031B510 48 00 8A 85 */ bl loadTexNo__FUlRCUs -lbl_8031B514: -/* 8031B514 3B 39 00 01 */ addi r25, r25, 1 -/* 8031B518 28 19 00 04 */ cmplwi r25, 4 -/* 8031B51C 3B 5A 00 02 */ addi r26, r26, 2 -/* 8031B520 41 80 FF D8 */ blt lbl_8031B4F8 -/* 8031B524 3B 60 00 00 */ li r27, 0 -/* 8031B528 3B 40 00 00 */ li r26, 0 -/* 8031B52C 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ -/* 8031B530 3B C3 4C 2C */ addi r30, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ -/* 8031B534 48 00 00 CC */ b lbl_8031B600 -lbl_8031B538: -/* 8031B538 38 1B 00 01 */ addi r0, r27, 1 -/* 8031B53C 54 00 10 3A */ slwi r0, r0, 2 -/* 8031B540 7F BF 02 14 */ add r29, r31, r0 -/* 8031B544 7F 3F D2 14 */ add r25, r31, r26 -/* 8031B548 7F 63 DB 78 */ mr r3, r27 -/* 8031B54C 88 99 00 10 */ lbz r4, 0x10(r25) -/* 8031B550 88 B9 00 11 */ lbz r5, 0x11(r25) -/* 8031B554 88 D9 00 12 */ lbz r6, 0x12(r25) -/* 8031B558 88 FD 00 10 */ lbz r7, 0x10(r29) -/* 8031B55C 89 1D 00 11 */ lbz r8, 0x11(r29) -/* 8031B560 89 3D 00 12 */ lbz r9, 0x12(r29) -/* 8031B564 4B FF 3B A5 */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID -/* 8031B568 88 19 00 11 */ lbz r0, 0x11(r25) -/* 8031B56C 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c -/* 8031B570 7D 1E 02 14 */ add r8, r30, r0 -/* 8031B574 88 19 00 10 */ lbz r0, 0x10(r25) -/* 8031B578 54 03 07 7E */ clrlwi r3, r0, 0x1d -/* 8031B57C A0 88 00 00 */ lhz r4, 0(r8) -/* 8031B580 A0 08 00 04 */ lhz r0, 4(r8) -/* 8031B584 20 00 00 01 */ subfic r0, r0, 1 -/* 8031B588 7C 00 00 34 */ cntlzw r0, r0 -/* 8031B58C 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031B590 38 C0 00 00 */ li r6, 0 -/* 8031B594 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031B598 A0 08 00 06 */ lhz r0, 6(r8) -/* 8031B59C 20 00 00 01 */ subfic r0, r0, 1 -/* 8031B5A0 7C 00 00 34 */ cntlzw r0, r0 -/* 8031B5A4 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031B5A8 39 20 00 00 */ li r9, 0 -/* 8031B5AC 4B FF 2C 89 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031B5B0 88 1D 00 11 */ lbz r0, 0x11(r29) -/* 8031B5B4 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c -/* 8031B5B8 7D 1E 02 14 */ add r8, r30, r0 -/* 8031B5BC 88 1D 00 10 */ lbz r0, 0x10(r29) -/* 8031B5C0 54 03 07 7E */ clrlwi r3, r0, 0x1d -/* 8031B5C4 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031B5C8 A0 08 00 04 */ lhz r0, 4(r8) -/* 8031B5CC 20 00 00 01 */ subfic r0, r0, 1 -/* 8031B5D0 7C 00 00 34 */ cntlzw r0, r0 -/* 8031B5D4 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031B5D8 38 C0 00 00 */ li r6, 0 -/* 8031B5DC A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031B5E0 A0 08 00 06 */ lhz r0, 6(r8) -/* 8031B5E4 20 00 00 01 */ subfic r0, r0, 1 -/* 8031B5E8 7C 00 00 34 */ cntlzw r0, r0 -/* 8031B5EC 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031B5F0 39 20 00 00 */ li r9, 0 -/* 8031B5F4 4B FF 2C 41 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031B5F8 3B 7B 00 02 */ addi r27, r27, 2 -/* 8031B5FC 3B 5A 00 08 */ addi r26, r26, 8 -lbl_8031B600: -/* 8031B600 7C 1B E0 40 */ cmplw r27, r28 -/* 8031B604 41 80 FF 34 */ blt lbl_8031B538 -/* 8031B608 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031B60C 80 64 00 00 */ lwz r3, 0(r4) -/* 8031B610 80 04 00 08 */ lwz r0, 8(r4) -/* 8031B614 7C 03 00 50 */ subf r0, r3, r0 -/* 8031B618 90 1F 00 90 */ stw r0, 0x90(r31) -/* 8031B61C 3B 20 00 00 */ li r25, 0 -/* 8031B620 3B 60 00 00 */ li r27, 0 -lbl_8031B624: -/* 8031B624 38 1B 00 42 */ addi r0, r27, 0x42 -/* 8031B628 7C 9F 02 14 */ add r4, r31, r0 -/* 8031B62C 80 64 00 00 */ lwz r3, 0(r4) -/* 8031B630 80 04 00 04 */ lwz r0, 4(r4) -/* 8031B634 90 61 00 0C */ stw r3, 0xc(r1) -/* 8031B638 90 01 00 10 */ stw r0, 0x10(r1) -/* 8031B63C 38 79 00 01 */ addi r3, r25, 1 -/* 8031B640 38 81 00 0C */ addi r4, r1, 0xc -/* 8031B644 4B FF 3D B9 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 -/* 8031B648 3B 39 00 01 */ addi r25, r25, 1 -/* 8031B64C 28 19 00 03 */ cmplwi r25, 3 -/* 8031B650 3B 7B 00 08 */ addi r27, r27, 8 -/* 8031B654 41 80 FF D0 */ blt lbl_8031B624 -/* 8031B658 3B 20 00 00 */ li r25, 0 -/* 8031B65C 3B 60 00 00 */ li r27, 0 -lbl_8031B660: -/* 8031B660 38 1B 00 62 */ addi r0, r27, 0x62 -/* 8031B664 7C 1F 00 2E */ lwzx r0, r31, r0 -/* 8031B668 90 01 00 08 */ stw r0, 8(r1) -/* 8031B66C 7F 23 CB 78 */ mr r3, r25 -/* 8031B670 38 81 00 08 */ addi r4, r1, 8 -/* 8031B674 4B FF 3C 21 */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor -/* 8031B678 3B 39 00 01 */ addi r25, r25, 1 -/* 8031B67C 28 19 00 04 */ cmplwi r25, 4 -/* 8031B680 3B 7B 00 04 */ addi r27, r27, 4 -/* 8031B684 41 80 FF DC */ blt lbl_8031B660 -/* 8031B688 38 60 00 00 */ li r3, 0 -/* 8031B68C 38 80 00 00 */ li r4, 0 -/* 8031B690 38 A0 00 00 */ li r5, 0 -/* 8031B694 7F 89 03 A6 */ mtctr r28 -/* 8031B698 28 1C 00 00 */ cmplwi r28, 0 -/* 8031B69C 40 81 01 8C */ ble lbl_8031B828 -lbl_8031B6A0: -/* 8031B6A0 39 65 00 21 */ addi r11, r5, 0x21 -/* 8031B6A4 7D 7F 5A 14 */ add r11, r31, r11 -/* 8031B6A8 81 4B 00 00 */ lwz r10, 0(r11) -/* 8031B6AC 38 00 00 61 */ li r0, 0x61 -/* 8031B6B0 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B6B4 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B6B8 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B6BC 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B6C0 98 07 00 00 */ stb r0, 0(r7) -/* 8031B6C4 55 49 46 3E */ srwi r9, r10, 0x18 -/* 8031B6C8 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B6CC 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B6D0 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B6D4 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B6D8 99 27 00 00 */ stb r9, 0(r7) -/* 8031B6DC 55 49 86 3E */ rlwinm r9, r10, 0x10, 0x18, 0x1f -/* 8031B6E0 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B6E4 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B6E8 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B6EC 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B6F0 99 27 00 00 */ stb r9, 0(r7) -/* 8031B6F4 55 49 C6 3E */ rlwinm r9, r10, 0x18, 0x18, 0x1f -/* 8031B6F8 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B6FC 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B700 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B704 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B708 99 27 00 00 */ stb r9, 0(r7) -/* 8031B70C 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B710 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B714 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B718 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B71C 99 47 00 00 */ stb r10, 0(r7) -/* 8031B720 81 4B 00 04 */ lwz r10, 4(r11) -/* 8031B724 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B728 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B72C 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B730 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B734 98 07 00 00 */ stb r0, 0(r7) -/* 8031B738 55 49 46 3E */ srwi r9, r10, 0x18 -/* 8031B73C 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B740 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B744 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B748 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B74C 99 27 00 00 */ stb r9, 0(r7) -/* 8031B750 55 49 86 3E */ rlwinm r9, r10, 0x10, 0x18, 0x1f -/* 8031B754 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B758 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B75C 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B760 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B764 99 27 00 00 */ stb r9, 0(r7) -/* 8031B768 55 49 C6 3E */ rlwinm r9, r10, 0x18, 0x18, 0x1f -/* 8031B76C 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B770 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B774 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B778 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B77C 99 27 00 00 */ stb r9, 0(r7) -/* 8031B780 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B784 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B788 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B78C 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B790 99 47 00 00 */ stb r10, 0(r7) -/* 8031B794 38 C4 00 80 */ addi r6, r4, 0x80 -/* 8031B798 7C FF 30 2E */ lwzx r7, r31, r6 -/* 8031B79C 38 C3 00 10 */ addi r6, r3, 0x10 -/* 8031B7A0 54 C6 C0 0E */ slwi r6, r6, 0x18 -/* 8031B7A4 7C E9 33 78 */ or r9, r7, r6 -/* 8031B7A8 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B7AC 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B7B0 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B7B4 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B7B8 98 07 00 00 */ stb r0, 0(r7) -/* 8031B7BC 55 28 46 3E */ srwi r8, r9, 0x18 -/* 8031B7C0 80 ED 94 00 */ lwz r7, __GDCurrentDL(r13) -/* 8031B7C4 80 C7 00 08 */ lwz r6, 8(r7) -/* 8031B7C8 38 06 00 01 */ addi r0, r6, 1 -/* 8031B7CC 90 07 00 08 */ stw r0, 8(r7) -/* 8031B7D0 99 06 00 00 */ stb r8, 0(r6) -/* 8031B7D4 55 28 86 3E */ rlwinm r8, r9, 0x10, 0x18, 0x1f -/* 8031B7D8 80 ED 94 00 */ lwz r7, __GDCurrentDL(r13) -/* 8031B7DC 80 C7 00 08 */ lwz r6, 8(r7) -/* 8031B7E0 38 06 00 01 */ addi r0, r6, 1 -/* 8031B7E4 90 07 00 08 */ stw r0, 8(r7) -/* 8031B7E8 99 06 00 00 */ stb r8, 0(r6) -/* 8031B7EC 55 28 C6 3E */ rlwinm r8, r9, 0x18, 0x18, 0x1f -/* 8031B7F0 80 ED 94 00 */ lwz r7, __GDCurrentDL(r13) -/* 8031B7F4 80 C7 00 08 */ lwz r6, 8(r7) -/* 8031B7F8 38 06 00 01 */ addi r0, r6, 1 -/* 8031B7FC 90 07 00 08 */ stw r0, 8(r7) -/* 8031B800 99 06 00 00 */ stb r8, 0(r6) -/* 8031B804 80 ED 94 00 */ lwz r7, __GDCurrentDL(r13) -/* 8031B808 80 C7 00 08 */ lwz r6, 8(r7) -/* 8031B80C 38 06 00 01 */ addi r0, r6, 1 -/* 8031B810 90 07 00 08 */ stw r0, 8(r7) -/* 8031B814 99 26 00 00 */ stb r9, 0(r6) -/* 8031B818 38 63 00 01 */ addi r3, r3, 1 -/* 8031B81C 38 84 00 04 */ addi r4, r4, 4 -/* 8031B820 38 A5 00 08 */ addi r5, r5, 8 -/* 8031B824 42 00 FE 7C */ bdnz lbl_8031B6A0 -lbl_8031B828: -/* 8031B828 38 A0 00 00 */ li r5, 0 -/* 8031B82C 3C 60 80 43 */ lis r3, j3dTevSwapTableTable@ha /* 0x80436A60@ha */ -/* 8031B830 38 63 6A 60 */ addi r3, r3, j3dTevSwapTableTable@l /* 0x80436A60@l */ -/* 8031B834 38 00 00 04 */ li r0, 4 -/* 8031B838 7C 09 03 A6 */ mtctr r0 -lbl_8031B83C: -/* 8031B83C 54 A4 F0 BE */ srwi r4, r5, 2 -/* 8031B840 38 84 00 7A */ addi r4, r4, 0x7a -/* 8031B844 7C 1F 20 AE */ lbzx r0, r31, r4 -/* 8031B848 54 00 10 3A */ slwi r0, r0, 2 -/* 8031B84C 7C C3 02 14 */ add r6, r3, r0 -/* 8031B850 8B 86 00 01 */ lbz r28, 1(r6) -/* 8031B854 8B 66 00 00 */ lbz r27, 0(r6) -/* 8031B858 89 5F 00 77 */ lbz r10, 0x77(r31) -/* 8031B85C 89 3F 00 73 */ lbz r9, 0x73(r31) -/* 8031B860 8B 5F 00 76 */ lbz r26, 0x76(r31) -/* 8031B864 89 9F 00 72 */ lbz r12, 0x72(r31) -/* 8031B868 38 00 00 61 */ li r0, 0x61 -/* 8031B86C 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B870 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B874 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B878 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B87C 98 07 00 00 */ stb r0, 0(r7) -/* 8031B880 7C A6 0E 70 */ srawi r6, r5, 1 -/* 8031B884 7C C6 01 94 */ addze r6, r6 -/* 8031B888 39 66 00 F6 */ addi r11, r6, 0xf6 -/* 8031B88C 55 4A 98 18 */ slwi r10, r10, 0x13 -/* 8031B890 55 29 70 22 */ slwi r9, r9, 0xe -/* 8031B894 57 48 48 2C */ slwi r8, r26, 9 -/* 8031B898 55 87 20 36 */ slwi r7, r12, 4 -/* 8031B89C 57 86 10 3A */ slwi r6, r28, 2 -/* 8031B8A0 7F 66 33 78 */ or r6, r27, r6 -/* 8031B8A4 7C E6 33 78 */ or r6, r7, r6 -/* 8031B8A8 7D 06 33 78 */ or r6, r8, r6 -/* 8031B8AC 7D 26 33 78 */ or r6, r9, r6 -/* 8031B8B0 7D 4A 33 78 */ or r10, r10, r6 -/* 8031B8B4 51 6A C0 0E */ rlwimi r10, r11, 0x18, 0, 7 -/* 8031B8B8 55 49 46 3E */ srwi r9, r10, 0x18 -/* 8031B8BC 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B8C0 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B8C4 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B8C8 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B8CC 99 27 00 00 */ stb r9, 0(r7) -/* 8031B8D0 55 49 86 3E */ rlwinm r9, r10, 0x10, 0x18, 0x1f -/* 8031B8D4 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B8D8 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B8DC 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B8E0 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B8E4 99 27 00 00 */ stb r9, 0(r7) -/* 8031B8E8 55 49 C6 3E */ rlwinm r9, r10, 0x18, 0x18, 0x1f -/* 8031B8EC 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B8F0 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B8F4 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B8F8 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B8FC 99 27 00 00 */ stb r9, 0(r7) -/* 8031B900 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031B904 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031B908 38 C7 00 01 */ addi r6, r7, 1 -/* 8031B90C 90 C8 00 08 */ stw r6, 8(r8) -/* 8031B910 99 47 00 00 */ stb r10, 0(r7) -/* 8031B914 7C 9F 20 AE */ lbzx r4, r31, r4 -/* 8031B918 54 84 10 3A */ slwi r4, r4, 2 -/* 8031B91C 7C 83 22 14 */ add r4, r3, r4 -/* 8031B920 8B 64 00 03 */ lbz r27, 3(r4) -/* 8031B924 8B 44 00 02 */ lbz r26, 2(r4) -/* 8031B928 89 1F 00 79 */ lbz r8, 0x79(r31) -/* 8031B92C 89 9F 00 75 */ lbz r12, 0x75(r31) -/* 8031B930 89 7F 00 78 */ lbz r11, 0x78(r31) -/* 8031B934 89 5F 00 74 */ lbz r10, 0x74(r31) -/* 8031B938 80 ED 94 00 */ lwz r7, __GDCurrentDL(r13) -/* 8031B93C 80 C7 00 08 */ lwz r6, 8(r7) -/* 8031B940 38 86 00 01 */ addi r4, r6, 1 -/* 8031B944 90 87 00 08 */ stw r4, 8(r7) -/* 8031B948 98 06 00 00 */ stb r0, 0(r6) -/* 8031B94C 38 05 00 02 */ addi r0, r5, 2 -/* 8031B950 7C 00 0E 70 */ srawi r0, r0, 1 -/* 8031B954 7C 80 01 94 */ addze r4, r0 -/* 8031B958 39 24 00 F6 */ addi r9, r4, 0xf6 -/* 8031B95C 55 08 98 18 */ slwi r8, r8, 0x13 -/* 8031B960 55 87 70 22 */ slwi r7, r12, 0xe -/* 8031B964 55 66 48 2C */ slwi r6, r11, 9 -/* 8031B968 55 44 20 36 */ slwi r4, r10, 4 -/* 8031B96C 57 60 10 3A */ slwi r0, r27, 2 -/* 8031B970 7F 40 03 78 */ or r0, r26, r0 -/* 8031B974 7C 80 03 78 */ or r0, r4, r0 -/* 8031B978 7C C0 03 78 */ or r0, r6, r0 -/* 8031B97C 7C E0 03 78 */ or r0, r7, r0 -/* 8031B980 7D 08 03 78 */ or r8, r8, r0 -/* 8031B984 51 28 C0 0E */ rlwimi r8, r9, 0x18, 0, 7 -/* 8031B988 55 07 46 3E */ srwi r7, r8, 0x18 -/* 8031B98C 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031B990 80 86 00 08 */ lwz r4, 8(r6) -/* 8031B994 38 04 00 01 */ addi r0, r4, 1 -/* 8031B998 90 06 00 08 */ stw r0, 8(r6) -/* 8031B99C 98 E4 00 00 */ stb r7, 0(r4) -/* 8031B9A0 55 07 86 3E */ rlwinm r7, r8, 0x10, 0x18, 0x1f -/* 8031B9A4 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031B9A8 80 86 00 08 */ lwz r4, 8(r6) -/* 8031B9AC 38 04 00 01 */ addi r0, r4, 1 -/* 8031B9B0 90 06 00 08 */ stw r0, 8(r6) -/* 8031B9B4 98 E4 00 00 */ stb r7, 0(r4) -/* 8031B9B8 55 07 C6 3E */ rlwinm r7, r8, 0x18, 0x18, 0x1f -/* 8031B9BC 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031B9C0 80 86 00 08 */ lwz r4, 8(r6) -/* 8031B9C4 38 04 00 01 */ addi r0, r4, 1 -/* 8031B9C8 90 06 00 08 */ stw r0, 8(r6) -/* 8031B9CC 98 E4 00 00 */ stb r7, 0(r4) -/* 8031B9D0 80 CD 94 00 */ lwz r6, __GDCurrentDL(r13) -/* 8031B9D4 80 86 00 08 */ lwz r4, 8(r6) -/* 8031B9D8 38 04 00 01 */ addi r0, r4, 1 -/* 8031B9DC 90 06 00 08 */ stw r0, 8(r6) -/* 8031B9E0 99 04 00 00 */ stb r8, 0(r4) -/* 8031B9E4 38 A5 00 04 */ addi r5, r5, 4 -/* 8031B9E8 42 00 FE 54 */ bdnz lbl_8031B83C -/* 8031B9EC 39 61 00 40 */ addi r11, r1, 0x40 -/* 8031B9F0 48 04 68 29 */ bl _restgpr_25 -/* 8031B9F4 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8031B9F8 7C 08 03 A6 */ mtlr r0 -/* 8031B9FC 38 21 00 40 */ addi r1, r1, 0x40 -/* 8031BA00 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__13J3DTevBlock16Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__13J3DTevBlock16Fv.s deleted file mode 100644 index df729e2437d..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__13J3DTevBlock16Fv.s +++ /dev/null @@ -1,348 +0,0 @@ -lbl_8031BA04: -/* 8031BA04 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8031BA08 7C 08 02 A6 */ mflr r0 -/* 8031BA0C 90 01 00 44 */ stw r0, 0x44(r1) -/* 8031BA10 39 61 00 40 */ addi r11, r1, 0x40 -/* 8031BA14 48 04 67 B9 */ bl _savegpr_25 -/* 8031BA18 7C 7F 1B 78 */ mr r31, r3 -/* 8031BA1C 8B 83 00 58 */ lbz r28, 0x58(r3) -/* 8031BA20 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031BA24 80 64 00 00 */ lwz r3, 0(r4) -/* 8031BA28 80 04 00 08 */ lwz r0, 8(r4) -/* 8031BA2C 7C 03 00 50 */ subf r0, r3, r0 -/* 8031BA30 90 1F 00 04 */ stw r0, 4(r31) -/* 8031BA34 3B 20 00 00 */ li r25, 0 -/* 8031BA38 3B 40 00 00 */ li r26, 0 -lbl_8031BA3C: -/* 8031BA3C 38 9A 00 08 */ addi r4, r26, 8 -/* 8031BA40 7C 9F 22 14 */ add r4, r31, r4 -/* 8031BA44 A0 04 00 00 */ lhz r0, 0(r4) -/* 8031BA48 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031BA4C 41 82 00 0C */ beq lbl_8031BA58 -/* 8031BA50 7F 23 CB 78 */ mr r3, r25 -/* 8031BA54 48 00 85 41 */ bl loadTexNo__FUlRCUs -lbl_8031BA58: -/* 8031BA58 3B 39 00 01 */ addi r25, r25, 1 -/* 8031BA5C 28 19 00 08 */ cmplwi r25, 8 -/* 8031BA60 3B 5A 00 02 */ addi r26, r26, 2 -/* 8031BA64 41 80 FF D8 */ blt lbl_8031BA3C -/* 8031BA68 3B 60 00 00 */ li r27, 0 -/* 8031BA6C 3B 40 00 00 */ li r26, 0 -/* 8031BA70 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ -/* 8031BA74 3B C3 4C 2C */ addi r30, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ -/* 8031BA78 48 00 00 CC */ b lbl_8031BB44 -lbl_8031BA7C: -/* 8031BA7C 38 1B 00 01 */ addi r0, r27, 1 -/* 8031BA80 54 00 10 3A */ slwi r0, r0, 2 -/* 8031BA84 7F BF 02 14 */ add r29, r31, r0 -/* 8031BA88 7F 3F D2 14 */ add r25, r31, r26 -/* 8031BA8C 7F 63 DB 78 */ mr r3, r27 -/* 8031BA90 88 99 00 18 */ lbz r4, 0x18(r25) -/* 8031BA94 88 B9 00 19 */ lbz r5, 0x19(r25) -/* 8031BA98 88 D9 00 1A */ lbz r6, 0x1a(r25) -/* 8031BA9C 88 FD 00 18 */ lbz r7, 0x18(r29) -/* 8031BAA0 89 1D 00 19 */ lbz r8, 0x19(r29) -/* 8031BAA4 89 3D 00 1A */ lbz r9, 0x1a(r29) -/* 8031BAA8 4B FF 36 61 */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID -/* 8031BAAC 88 19 00 19 */ lbz r0, 0x19(r25) -/* 8031BAB0 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c -/* 8031BAB4 7D 1E 02 14 */ add r8, r30, r0 -/* 8031BAB8 88 19 00 18 */ lbz r0, 0x18(r25) -/* 8031BABC 54 03 07 7E */ clrlwi r3, r0, 0x1d -/* 8031BAC0 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031BAC4 A0 08 00 04 */ lhz r0, 4(r8) -/* 8031BAC8 20 00 00 01 */ subfic r0, r0, 1 -/* 8031BACC 7C 00 00 34 */ cntlzw r0, r0 -/* 8031BAD0 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031BAD4 38 C0 00 00 */ li r6, 0 -/* 8031BAD8 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031BADC A0 08 00 06 */ lhz r0, 6(r8) -/* 8031BAE0 20 00 00 01 */ subfic r0, r0, 1 -/* 8031BAE4 7C 00 00 34 */ cntlzw r0, r0 -/* 8031BAE8 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031BAEC 39 20 00 00 */ li r9, 0 -/* 8031BAF0 4B FF 27 45 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031BAF4 88 1D 00 19 */ lbz r0, 0x19(r29) -/* 8031BAF8 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c -/* 8031BAFC 7D 1E 02 14 */ add r8, r30, r0 -/* 8031BB00 88 1D 00 18 */ lbz r0, 0x18(r29) -/* 8031BB04 54 03 07 7E */ clrlwi r3, r0, 0x1d -/* 8031BB08 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031BB0C A0 08 00 04 */ lhz r0, 4(r8) -/* 8031BB10 20 00 00 01 */ subfic r0, r0, 1 -/* 8031BB14 7C 00 00 34 */ cntlzw r0, r0 -/* 8031BB18 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031BB1C 38 C0 00 00 */ li r6, 0 -/* 8031BB20 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031BB24 A0 08 00 06 */ lhz r0, 6(r8) -/* 8031BB28 20 00 00 01 */ subfic r0, r0, 1 -/* 8031BB2C 7C 00 00 34 */ cntlzw r0, r0 -/* 8031BB30 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031BB34 39 20 00 00 */ li r9, 0 -/* 8031BB38 4B FF 26 FD */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031BB3C 3B 7B 00 02 */ addi r27, r27, 2 -/* 8031BB40 3B 5A 00 08 */ addi r26, r26, 8 -lbl_8031BB44: -/* 8031BB44 7C 1B E0 40 */ cmplw r27, r28 -/* 8031BB48 41 80 FF 34 */ blt lbl_8031BA7C -/* 8031BB4C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031BB50 80 64 00 00 */ lwz r3, 0(r4) -/* 8031BB54 80 04 00 08 */ lwz r0, 8(r4) -/* 8031BB58 7C 03 00 50 */ subf r0, r3, r0 -/* 8031BB5C 90 1F 01 70 */ stw r0, 0x170(r31) -/* 8031BB60 3B 20 00 00 */ li r25, 0 -/* 8031BB64 3B 60 00 00 */ li r27, 0 -lbl_8031BB68: -/* 8031BB68 38 1B 00 DA */ addi r0, r27, 0xda -/* 8031BB6C 7C 9F 02 14 */ add r4, r31, r0 -/* 8031BB70 80 64 00 00 */ lwz r3, 0(r4) -/* 8031BB74 80 04 00 04 */ lwz r0, 4(r4) -/* 8031BB78 90 61 00 0C */ stw r3, 0xc(r1) -/* 8031BB7C 90 01 00 10 */ stw r0, 0x10(r1) -/* 8031BB80 38 79 00 01 */ addi r3, r25, 1 -/* 8031BB84 38 81 00 0C */ addi r4, r1, 0xc -/* 8031BB88 4B FF 38 75 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 -/* 8031BB8C 3B 39 00 01 */ addi r25, r25, 1 -/* 8031BB90 28 19 00 03 */ cmplwi r25, 3 -/* 8031BB94 3B 7B 00 08 */ addi r27, r27, 8 -/* 8031BB98 41 80 FF D0 */ blt lbl_8031BB68 -/* 8031BB9C 3B 20 00 00 */ li r25, 0 -/* 8031BBA0 3B 60 00 00 */ li r27, 0 -lbl_8031BBA4: -/* 8031BBA4 38 1B 00 FA */ addi r0, r27, 0xfa -/* 8031BBA8 7C 1F 00 2E */ lwzx r0, r31, r0 -/* 8031BBAC 90 01 00 08 */ stw r0, 8(r1) -/* 8031BBB0 7F 23 CB 78 */ mr r3, r25 -/* 8031BBB4 38 81 00 08 */ addi r4, r1, 8 -/* 8031BBB8 4B FF 36 DD */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor -/* 8031BBBC 3B 39 00 01 */ addi r25, r25, 1 -/* 8031BBC0 28 19 00 04 */ cmplwi r25, 4 -/* 8031BBC4 3B 7B 00 04 */ addi r27, r27, 4 -/* 8031BBC8 41 80 FF DC */ blt lbl_8031BBA4 -/* 8031BBCC 38 60 00 00 */ li r3, 0 -/* 8031BBD0 38 80 00 00 */ li r4, 0 -/* 8031BBD4 38 A0 00 00 */ li r5, 0 -/* 8031BBD8 7F 89 03 A6 */ mtctr r28 -/* 8031BBDC 28 1C 00 00 */ cmplwi r28, 0 -/* 8031BBE0 40 81 01 8C */ ble lbl_8031BD6C -lbl_8031BBE4: -/* 8031BBE4 39 65 00 59 */ addi r11, r5, 0x59 -/* 8031BBE8 7D 7F 5A 14 */ add r11, r31, r11 -/* 8031BBEC 81 4B 00 00 */ lwz r10, 0(r11) -/* 8031BBF0 38 00 00 61 */ li r0, 0x61 -/* 8031BBF4 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031BBF8 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031BBFC 38 C7 00 01 */ addi r6, r7, 1 -/* 8031BC00 90 C8 00 08 */ stw r6, 8(r8) -/* 8031BC04 98 07 00 00 */ stb r0, 0(r7) -/* 8031BC08 55 49 46 3E */ srwi r9, r10, 0x18 -/* 8031BC0C 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031BC10 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031BC14 38 C7 00 01 */ addi r6, r7, 1 -/* 8031BC18 90 C8 00 08 */ stw r6, 8(r8) -/* 8031BC1C 99 27 00 00 */ stb r9, 0(r7) -/* 8031BC20 55 49 86 3E */ rlwinm r9, r10, 0x10, 0x18, 0x1f -/* 8031BC24 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031BC28 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031BC2C 38 C7 00 01 */ addi r6, r7, 1 -/* 8031BC30 90 C8 00 08 */ stw r6, 8(r8) -/* 8031BC34 99 27 00 00 */ stb r9, 0(r7) -/* 8031BC38 55 49 C6 3E */ rlwinm r9, r10, 0x18, 0x18, 0x1f -/* 8031BC3C 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031BC40 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031BC44 38 C7 00 01 */ addi r6, r7, 1 -/* 8031BC48 90 C8 00 08 */ stw r6, 8(r8) -/* 8031BC4C 99 27 00 00 */ stb r9, 0(r7) -/* 8031BC50 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031BC54 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031BC58 38 C7 00 01 */ addi r6, r7, 1 -/* 8031BC5C 90 C8 00 08 */ stw r6, 8(r8) -/* 8031BC60 99 47 00 00 */ stb r10, 0(r7) -/* 8031BC64 81 4B 00 04 */ lwz r10, 4(r11) -/* 8031BC68 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031BC6C 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031BC70 38 C7 00 01 */ addi r6, r7, 1 -/* 8031BC74 90 C8 00 08 */ stw r6, 8(r8) -/* 8031BC78 98 07 00 00 */ stb r0, 0(r7) -/* 8031BC7C 55 49 46 3E */ srwi r9, r10, 0x18 -/* 8031BC80 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031BC84 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031BC88 38 C7 00 01 */ addi r6, r7, 1 -/* 8031BC8C 90 C8 00 08 */ stw r6, 8(r8) -/* 8031BC90 99 27 00 00 */ stb r9, 0(r7) -/* 8031BC94 55 49 86 3E */ rlwinm r9, r10, 0x10, 0x18, 0x1f -/* 8031BC98 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031BC9C 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031BCA0 38 C7 00 01 */ addi r6, r7, 1 -/* 8031BCA4 90 C8 00 08 */ stw r6, 8(r8) -/* 8031BCA8 99 27 00 00 */ stb r9, 0(r7) -/* 8031BCAC 55 49 C6 3E */ rlwinm r9, r10, 0x18, 0x18, 0x1f -/* 8031BCB0 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031BCB4 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031BCB8 38 C7 00 01 */ addi r6, r7, 1 -/* 8031BCBC 90 C8 00 08 */ stw r6, 8(r8) -/* 8031BCC0 99 27 00 00 */ stb r9, 0(r7) -/* 8031BCC4 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031BCC8 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031BCCC 38 C7 00 01 */ addi r6, r7, 1 -/* 8031BCD0 90 C8 00 08 */ stw r6, 8(r8) -/* 8031BCD4 99 47 00 00 */ stb r10, 0(r7) -/* 8031BCD8 38 C4 01 30 */ addi r6, r4, 0x130 -/* 8031BCDC 7C FF 30 2E */ lwzx r7, r31, r6 -/* 8031BCE0 38 C3 00 10 */ addi r6, r3, 0x10 -/* 8031BCE4 54 C6 C0 0E */ slwi r6, r6, 0x18 -/* 8031BCE8 7C E9 33 78 */ or r9, r7, r6 -/* 8031BCEC 81 0D 94 00 */ lwz r8, __GDCurrentDL(r13) -/* 8031BCF0 80 E8 00 08 */ lwz r7, 8(r8) -/* 8031BCF4 38 C7 00 01 */ addi r6, r7, 1 -/* 8031BCF8 90 C8 00 08 */ stw r6, 8(r8) -/* 8031BCFC 98 07 00 00 */ stb r0, 0(r7) -/* 8031BD00 55 28 46 3E */ srwi r8, r9, 0x18 -/* 8031BD04 80 ED 94 00 */ lwz r7, __GDCurrentDL(r13) -/* 8031BD08 80 C7 00 08 */ lwz r6, 8(r7) -/* 8031BD0C 38 06 00 01 */ addi r0, r6, 1 -/* 8031BD10 90 07 00 08 */ stw r0, 8(r7) -/* 8031BD14 99 06 00 00 */ stb r8, 0(r6) -/* 8031BD18 55 28 86 3E */ rlwinm r8, r9, 0x10, 0x18, 0x1f -/* 8031BD1C 80 ED 94 00 */ lwz r7, __GDCurrentDL(r13) -/* 8031BD20 80 C7 00 08 */ lwz r6, 8(r7) -/* 8031BD24 38 06 00 01 */ addi r0, r6, 1 -/* 8031BD28 90 07 00 08 */ stw r0, 8(r7) -/* 8031BD2C 99 06 00 00 */ stb r8, 0(r6) -/* 8031BD30 55 28 C6 3E */ rlwinm r8, r9, 0x18, 0x18, 0x1f -/* 8031BD34 80 ED 94 00 */ lwz r7, __GDCurrentDL(r13) -/* 8031BD38 80 C7 00 08 */ lwz r6, 8(r7) -/* 8031BD3C 38 06 00 01 */ addi r0, r6, 1 -/* 8031BD40 90 07 00 08 */ stw r0, 8(r7) -/* 8031BD44 99 06 00 00 */ stb r8, 0(r6) -/* 8031BD48 80 ED 94 00 */ lwz r7, __GDCurrentDL(r13) -/* 8031BD4C 80 C7 00 08 */ lwz r6, 8(r7) -/* 8031BD50 38 06 00 01 */ addi r0, r6, 1 -/* 8031BD54 90 07 00 08 */ stw r0, 8(r7) -/* 8031BD58 99 26 00 00 */ stb r9, 0(r6) -/* 8031BD5C 38 63 00 01 */ addi r3, r3, 1 -/* 8031BD60 38 84 00 04 */ addi r4, r4, 4 -/* 8031BD64 38 A5 00 08 */ addi r5, r5, 8 -/* 8031BD68 42 00 FE 7C */ bdnz lbl_8031BBE4 -lbl_8031BD6C: -/* 8031BD6C 38 C0 00 00 */ li r6, 0 -/* 8031BD70 3C 60 80 43 */ lis r3, j3dTevSwapTableTable@ha /* 0x80436A60@ha */ -/* 8031BD74 38 63 6A 60 */ addi r3, r3, j3dTevSwapTableTable@l /* 0x80436A60@l */ -/* 8031BD78 38 00 00 04 */ li r0, 4 -/* 8031BD7C 7C 09 03 A6 */ mtctr r0 -lbl_8031BD80: -/* 8031BD80 54 C4 F0 BE */ srwi r4, r6, 2 -/* 8031BD84 38 A4 01 2A */ addi r5, r4, 0x12a -/* 8031BD88 7C 1F 28 AE */ lbzx r0, r31, r5 -/* 8031BD8C 54 00 10 3A */ slwi r0, r0, 2 -/* 8031BD90 7C 83 02 14 */ add r4, r3, r0 -/* 8031BD94 8B A4 00 01 */ lbz r29, 1(r4) -/* 8031BD98 8B 84 00 00 */ lbz r28, 0(r4) -/* 8031BD9C 7C 9F 32 14 */ add r4, r31, r6 -/* 8031BDA0 89 64 01 1B */ lbz r11, 0x11b(r4) -/* 8031BDA4 89 44 01 0B */ lbz r10, 0x10b(r4) -/* 8031BDA8 8B 64 01 1A */ lbz r27, 0x11a(r4) -/* 8031BDAC 8B 44 01 0A */ lbz r26, 0x10a(r4) -/* 8031BDB0 38 00 00 61 */ li r0, 0x61 -/* 8031BDB4 81 2D 94 00 */ lwz r9, __GDCurrentDL(r13) -/* 8031BDB8 81 09 00 08 */ lwz r8, 8(r9) -/* 8031BDBC 38 E8 00 01 */ addi r7, r8, 1 -/* 8031BDC0 90 E9 00 08 */ stw r7, 8(r9) -/* 8031BDC4 98 08 00 00 */ stb r0, 0(r8) -/* 8031BDC8 7C C7 0E 70 */ srawi r7, r6, 1 -/* 8031BDCC 7C E7 01 94 */ addze r7, r7 -/* 8031BDD0 39 87 00 F6 */ addi r12, r7, 0xf6 -/* 8031BDD4 55 6B 98 18 */ slwi r11, r11, 0x13 -/* 8031BDD8 55 4A 70 22 */ slwi r10, r10, 0xe -/* 8031BDDC 57 69 48 2C */ slwi r9, r27, 9 -/* 8031BDE0 57 48 20 36 */ slwi r8, r26, 4 -/* 8031BDE4 57 A7 10 3A */ slwi r7, r29, 2 -/* 8031BDE8 7F 87 3B 78 */ or r7, r28, r7 -/* 8031BDEC 7D 07 3B 78 */ or r7, r8, r7 -/* 8031BDF0 7D 27 3B 78 */ or r7, r9, r7 -/* 8031BDF4 7D 47 3B 78 */ or r7, r10, r7 -/* 8031BDF8 7D 6B 3B 78 */ or r11, r11, r7 -/* 8031BDFC 51 8B C0 0E */ rlwimi r11, r12, 0x18, 0, 7 -/* 8031BE00 55 6A 46 3E */ srwi r10, r11, 0x18 -/* 8031BE04 81 2D 94 00 */ lwz r9, __GDCurrentDL(r13) -/* 8031BE08 81 09 00 08 */ lwz r8, 8(r9) -/* 8031BE0C 38 E8 00 01 */ addi r7, r8, 1 -/* 8031BE10 90 E9 00 08 */ stw r7, 8(r9) -/* 8031BE14 99 48 00 00 */ stb r10, 0(r8) -/* 8031BE18 55 6A 86 3E */ rlwinm r10, r11, 0x10, 0x18, 0x1f -/* 8031BE1C 81 2D 94 00 */ lwz r9, __GDCurrentDL(r13) -/* 8031BE20 81 09 00 08 */ lwz r8, 8(r9) -/* 8031BE24 38 E8 00 01 */ addi r7, r8, 1 -/* 8031BE28 90 E9 00 08 */ stw r7, 8(r9) -/* 8031BE2C 99 48 00 00 */ stb r10, 0(r8) -/* 8031BE30 55 6A C6 3E */ rlwinm r10, r11, 0x18, 0x18, 0x1f -/* 8031BE34 81 2D 94 00 */ lwz r9, __GDCurrentDL(r13) -/* 8031BE38 81 09 00 08 */ lwz r8, 8(r9) -/* 8031BE3C 38 E8 00 01 */ addi r7, r8, 1 -/* 8031BE40 90 E9 00 08 */ stw r7, 8(r9) -/* 8031BE44 99 48 00 00 */ stb r10, 0(r8) -/* 8031BE48 81 2D 94 00 */ lwz r9, __GDCurrentDL(r13) -/* 8031BE4C 81 09 00 08 */ lwz r8, 8(r9) -/* 8031BE50 38 E8 00 01 */ addi r7, r8, 1 -/* 8031BE54 90 E9 00 08 */ stw r7, 8(r9) -/* 8031BE58 99 68 00 00 */ stb r11, 0(r8) -/* 8031BE5C 7C BF 28 AE */ lbzx r5, r31, r5 -/* 8031BE60 54 A5 10 3A */ slwi r5, r5, 2 -/* 8031BE64 7C A3 2A 14 */ add r5, r3, r5 -/* 8031BE68 8B 65 00 03 */ lbz r27, 3(r5) -/* 8031BE6C 8B 45 00 02 */ lbz r26, 2(r5) -/* 8031BE70 89 04 01 1D */ lbz r8, 0x11d(r4) -/* 8031BE74 89 84 01 0D */ lbz r12, 0x10d(r4) -/* 8031BE78 89 64 01 1C */ lbz r11, 0x11c(r4) -/* 8031BE7C 89 44 01 0C */ lbz r10, 0x10c(r4) -/* 8031BE80 80 ED 94 00 */ lwz r7, __GDCurrentDL(r13) -/* 8031BE84 80 A7 00 08 */ lwz r5, 8(r7) -/* 8031BE88 38 85 00 01 */ addi r4, r5, 1 -/* 8031BE8C 90 87 00 08 */ stw r4, 8(r7) -/* 8031BE90 98 05 00 00 */ stb r0, 0(r5) -/* 8031BE94 38 06 00 02 */ addi r0, r6, 2 -/* 8031BE98 7C 00 0E 70 */ srawi r0, r0, 1 -/* 8031BE9C 7C 80 01 94 */ addze r4, r0 -/* 8031BEA0 39 24 00 F6 */ addi r9, r4, 0xf6 -/* 8031BEA4 55 08 98 18 */ slwi r8, r8, 0x13 -/* 8031BEA8 55 87 70 22 */ slwi r7, r12, 0xe -/* 8031BEAC 55 65 48 2C */ slwi r5, r11, 9 -/* 8031BEB0 55 44 20 36 */ slwi r4, r10, 4 -/* 8031BEB4 57 60 10 3A */ slwi r0, r27, 2 -/* 8031BEB8 7F 40 03 78 */ or r0, r26, r0 -/* 8031BEBC 7C 80 03 78 */ or r0, r4, r0 -/* 8031BEC0 7C A0 03 78 */ or r0, r5, r0 -/* 8031BEC4 7C E0 03 78 */ or r0, r7, r0 -/* 8031BEC8 7D 08 03 78 */ or r8, r8, r0 -/* 8031BECC 51 28 C0 0E */ rlwimi r8, r9, 0x18, 0, 7 -/* 8031BED0 55 07 46 3E */ srwi r7, r8, 0x18 -/* 8031BED4 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031BED8 80 85 00 08 */ lwz r4, 8(r5) -/* 8031BEDC 38 04 00 01 */ addi r0, r4, 1 -/* 8031BEE0 90 05 00 08 */ stw r0, 8(r5) -/* 8031BEE4 98 E4 00 00 */ stb r7, 0(r4) -/* 8031BEE8 55 07 86 3E */ rlwinm r7, r8, 0x10, 0x18, 0x1f -/* 8031BEEC 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031BEF0 80 85 00 08 */ lwz r4, 8(r5) -/* 8031BEF4 38 04 00 01 */ addi r0, r4, 1 -/* 8031BEF8 90 05 00 08 */ stw r0, 8(r5) -/* 8031BEFC 98 E4 00 00 */ stb r7, 0(r4) -/* 8031BF00 55 07 C6 3E */ rlwinm r7, r8, 0x18, 0x18, 0x1f -/* 8031BF04 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031BF08 80 85 00 08 */ lwz r4, 8(r5) -/* 8031BF0C 38 04 00 01 */ addi r0, r4, 1 -/* 8031BF10 90 05 00 08 */ stw r0, 8(r5) -/* 8031BF14 98 E4 00 00 */ stb r7, 0(r4) -/* 8031BF18 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031BF1C 80 85 00 08 */ lwz r4, 8(r5) -/* 8031BF20 38 04 00 01 */ addi r0, r4, 1 -/* 8031BF24 90 05 00 08 */ stw r0, 8(r5) -/* 8031BF28 99 04 00 00 */ stb r8, 0(r4) -/* 8031BF2C 38 C6 00 04 */ addi r6, r6, 4 -/* 8031BF30 42 00 FE 50 */ bdnz lbl_8031BD80 -/* 8031BF34 39 61 00 40 */ addi r11, r1, 0x40 -/* 8031BF38 48 04 62 E1 */ bl _restgpr_25 -/* 8031BF3C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8031BF40 7C 08 03 A6 */ mtlr r0 -/* 8031BF44 38 21 00 40 */ addi r1, r1, 0x40 -/* 8031BF48 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__14J3DPEBlockFullFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__14J3DPEBlockFullFv.s deleted file mode 100644 index b08a3203863..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__14J3DPEBlockFullFv.s +++ /dev/null @@ -1,318 +0,0 @@ -lbl_8031F3C0: -/* 8031F3C0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031F3C4 7C 08 02 A6 */ mflr r0 -/* 8031F3C8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031F3CC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8031F3D0 7C 7F 1B 78 */ mr r31, r3 -/* 8031F3D4 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F3D8 80 64 00 00 */ lwz r3, 0(r4) -/* 8031F3DC 80 04 00 08 */ lwz r0, 8(r4) -/* 8031F3E0 7C 03 00 50 */ subf r0, r3, r0 -/* 8031F3E4 90 1F 00 3C */ stw r0, 0x3c(r31) -/* 8031F3E8 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F3EC 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F3F0 38 63 00 55 */ addi r3, r3, 0x55 -/* 8031F3F4 80 04 00 0C */ lwz r0, 0xc(r4) -/* 8031F3F8 7C 03 00 40 */ cmplw r3, r0 -/* 8031F3FC 40 81 00 08 */ ble lbl_8031F404 -/* 8031F400 48 04 1C D5 */ bl GDOverflowed -lbl_8031F404: -/* 8031F404 80 1F 00 18 */ lwz r0, 0x18(r31) -/* 8031F408 90 01 00 08 */ stw r0, 8(r1) -/* 8031F40C 88 7F 00 04 */ lbz r3, 4(r31) -/* 8031F410 C0 3F 00 08 */ lfs f1, 8(r31) -/* 8031F414 C0 5F 00 0C */ lfs f2, 0xc(r31) -/* 8031F418 C0 7F 00 10 */ lfs f3, 0x10(r31) -/* 8031F41C C0 9F 00 14 */ lfs f4, 0x14(r31) -/* 8031F420 38 81 00 08 */ addi r4, r1, 8 -/* 8031F424 4B FF 02 0D */ bl J3DGDSetFog__F10_GXFogTypeffff8_GXColor -/* 8031F428 88 7F 00 05 */ lbz r3, 5(r31) -/* 8031F42C A0 9F 00 06 */ lhz r4, 6(r31) -/* 8031F430 38 BF 00 1C */ addi r5, r31, 0x1c -/* 8031F434 4B FF 05 61 */ bl J3DGDSetFogRangeAdj__FUcUsP14_GXFogAdjTable -/* 8031F438 88 FF 00 33 */ lbz r7, 0x33(r31) -/* 8031F43C 3C 60 80 43 */ lis r3, j3dAlphaCmpTable@ha /* 0x80436E60@ha */ -/* 8031F440 38 83 6E 60 */ addi r4, r3, j3dAlphaCmpTable@l /* 0x80436E60@l */ -/* 8031F444 A0 1F 00 30 */ lhz r0, 0x30(r31) -/* 8031F448 1C 00 00 03 */ mulli r0, r0, 3 -/* 8031F44C 7C 64 02 14 */ add r3, r4, r0 -/* 8031F450 89 43 00 02 */ lbz r10, 2(r3) -/* 8031F454 89 23 00 01 */ lbz r9, 1(r3) -/* 8031F458 88 DF 00 32 */ lbz r6, 0x32(r31) -/* 8031F45C 7D 04 00 AE */ lbzx r8, r4, r0 -/* 8031F460 38 60 00 61 */ li r3, 0x61 -/* 8031F464 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F468 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F46C 38 04 00 01 */ addi r0, r4, 1 -/* 8031F470 90 05 00 08 */ stw r0, 8(r5) -/* 8031F474 98 64 00 00 */ stb r3, 0(r4) -/* 8031F478 55 24 B0 12 */ slwi r4, r9, 0x16 -/* 8031F47C 55 40 98 18 */ slwi r0, r10, 0x13 -/* 8031F480 50 E6 44 2E */ rlwimi r6, r7, 8, 0x10, 0x17 -/* 8031F484 51 06 82 1E */ rlwimi r6, r8, 0x10, 8, 0xf -/* 8031F488 7C 00 33 78 */ or r0, r0, r6 -/* 8031F48C 7C 80 03 78 */ or r0, r4, r0 -/* 8031F490 64 07 F3 00 */ oris r7, r0, 0xf300 -/* 8031F494 54 E6 46 3E */ srwi r6, r7, 0x18 -/* 8031F498 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F49C 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F4A0 38 04 00 01 */ addi r0, r4, 1 -/* 8031F4A4 90 05 00 08 */ stw r0, 8(r5) -/* 8031F4A8 98 C4 00 00 */ stb r6, 0(r4) -/* 8031F4AC 54 E6 86 3E */ rlwinm r6, r7, 0x10, 0x18, 0x1f -/* 8031F4B0 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F4B4 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F4B8 38 04 00 01 */ addi r0, r4, 1 -/* 8031F4BC 90 05 00 08 */ stw r0, 8(r5) -/* 8031F4C0 98 C4 00 00 */ stb r6, 0(r4) -/* 8031F4C4 54 E6 C6 3E */ rlwinm r6, r7, 0x18, 0x18, 0x1f -/* 8031F4C8 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F4CC 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F4D0 38 04 00 01 */ addi r0, r4, 1 -/* 8031F4D4 90 05 00 08 */ stw r0, 8(r5) -/* 8031F4D8 98 C4 00 00 */ stb r6, 0(r4) -/* 8031F4DC 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F4E0 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F4E4 38 04 00 01 */ addi r0, r4, 1 -/* 8031F4E8 90 05 00 08 */ stw r0, 8(r5) -/* 8031F4EC 98 E4 00 00 */ stb r7, 0(r4) -/* 8031F4F0 88 9F 00 3B */ lbz r4, 0x3b(r31) -/* 8031F4F4 89 1F 00 37 */ lbz r8, 0x37(r31) -/* 8031F4F8 88 FF 00 36 */ lbz r7, 0x36(r31) -/* 8031F4FC 88 DF 00 35 */ lbz r6, 0x35(r31) -/* 8031F500 88 BF 00 34 */ lbz r5, 0x34(r31) -/* 8031F504 81 4D 94 00 */ lwz r10, __GDCurrentDL(r13) -/* 8031F508 81 2A 00 08 */ lwz r9, 8(r10) -/* 8031F50C 38 09 00 01 */ addi r0, r9, 1 -/* 8031F510 90 0A 00 08 */ stw r0, 8(r10) -/* 8031F514 98 69 00 00 */ stb r3, 0(r9) -/* 8031F518 39 60 00 FE */ li r11, 0xfe -/* 8031F51C 81 4D 94 00 */ lwz r10, __GDCurrentDL(r13) -/* 8031F520 81 2A 00 08 */ lwz r9, 8(r10) -/* 8031F524 38 09 00 01 */ addi r0, r9, 1 -/* 8031F528 90 0A 00 08 */ stw r0, 8(r10) -/* 8031F52C 99 69 00 00 */ stb r11, 0(r9) -/* 8031F530 38 00 00 00 */ li r0, 0 -/* 8031F534 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031F538 81 4B 00 08 */ lwz r10, 8(r11) -/* 8031F53C 39 2A 00 01 */ addi r9, r10, 1 -/* 8031F540 91 2B 00 08 */ stw r9, 8(r11) -/* 8031F544 98 0A 00 00 */ stb r0, 0(r10) -/* 8031F548 39 80 00 FF */ li r12, 0xff -/* 8031F54C 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031F550 81 4B 00 08 */ lwz r10, 8(r11) -/* 8031F554 39 2A 00 01 */ addi r9, r10, 1 -/* 8031F558 91 2B 00 08 */ stw r9, 8(r11) -/* 8031F55C 99 8A 00 00 */ stb r12, 0(r10) -/* 8031F560 39 80 00 E7 */ li r12, 0xe7 -/* 8031F564 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031F568 81 4B 00 08 */ lwz r10, 8(r11) -/* 8031F56C 39 2A 00 01 */ addi r9, r10, 1 -/* 8031F570 91 2B 00 08 */ stw r9, 8(r11) -/* 8031F574 99 8A 00 00 */ stb r12, 0(r10) -/* 8031F578 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031F57C 81 4B 00 08 */ lwz r10, 8(r11) -/* 8031F580 39 2A 00 01 */ addi r9, r10, 1 -/* 8031F584 91 2B 00 08 */ stw r9, 8(r11) -/* 8031F588 98 6A 00 00 */ stb r3, 0(r10) -/* 8031F58C 2C 05 00 01 */ cmpwi r5, 1 -/* 8031F590 41 82 00 0C */ beq lbl_8031F59C -/* 8031F594 2C 05 00 03 */ cmpwi r5, 3 -/* 8031F598 40 82 00 08 */ bne lbl_8031F5A0 -lbl_8031F59C: -/* 8031F59C 38 00 00 01 */ li r0, 1 -lbl_8031F5A0: -/* 8031F5A0 55 0A 60 26 */ slwi r10, r8, 0xc -/* 8031F5A4 20 65 00 03 */ subfic r3, r5, 3 -/* 8031F5A8 7C 63 00 34 */ cntlzw r3, r3 -/* 8031F5AC 54 69 33 68 */ rlwinm r9, r3, 6, 0xd, 0x14 -/* 8031F5B0 54 C8 40 2E */ slwi r8, r6, 8 -/* 8031F5B4 54 E6 28 34 */ slwi r6, r7, 5 -/* 8031F5B8 54 84 15 BA */ rlwinm r4, r4, 2, 0x16, 0x1d -/* 8031F5BC 20 65 00 02 */ subfic r3, r5, 2 -/* 8031F5C0 7C 63 00 34 */ cntlzw r3, r3 -/* 8031F5C4 54 63 E5 FC */ rlwinm r3, r3, 0x1c, 0x17, 0x1e -/* 8031F5C8 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8031F5CC 7C 60 03 78 */ or r0, r3, r0 -/* 8031F5D0 7C 80 03 78 */ or r0, r4, r0 -/* 8031F5D4 7C C0 03 78 */ or r0, r6, r0 -/* 8031F5D8 7D 00 03 78 */ or r0, r8, r0 -/* 8031F5DC 7D 20 03 78 */ or r0, r9, r0 -/* 8031F5E0 7D 40 03 78 */ or r0, r10, r0 -/* 8031F5E4 64 00 41 00 */ oris r0, r0, 0x4100 -/* 8031F5E8 54 0C 46 3E */ srwi r12, r0, 0x18 -/* 8031F5EC 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031F5F0 80 EB 00 08 */ lwz r7, 8(r11) -/* 8031F5F4 38 07 00 01 */ addi r0, r7, 1 -/* 8031F5F8 90 0B 00 08 */ stw r0, 8(r11) -/* 8031F5FC 99 87 00 00 */ stb r12, 0(r7) -/* 8031F600 38 00 00 00 */ li r0, 0 -/* 8031F604 2C 05 00 01 */ cmpwi r5, 1 -/* 8031F608 41 82 00 0C */ beq lbl_8031F614 -/* 8031F60C 2C 05 00 03 */ cmpwi r5, 3 -/* 8031F610 40 82 00 08 */ bne lbl_8031F618 -lbl_8031F614: -/* 8031F614 38 00 00 01 */ li r0, 1 -lbl_8031F618: -/* 8031F618 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8031F61C 7C 60 03 78 */ or r0, r3, r0 -/* 8031F620 7C 80 03 78 */ or r0, r4, r0 -/* 8031F624 7C C0 03 78 */ or r0, r6, r0 -/* 8031F628 7D 00 03 78 */ or r0, r8, r0 -/* 8031F62C 7D 20 03 78 */ or r0, r9, r0 -/* 8031F630 7D 40 03 78 */ or r0, r10, r0 -/* 8031F634 64 00 41 00 */ oris r0, r0, 0x4100 -/* 8031F638 54 0C 86 3E */ rlwinm r12, r0, 0x10, 0x18, 0x1f -/* 8031F63C 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031F640 80 EB 00 08 */ lwz r7, 8(r11) -/* 8031F644 38 07 00 01 */ addi r0, r7, 1 -/* 8031F648 90 0B 00 08 */ stw r0, 8(r11) -/* 8031F64C 99 87 00 00 */ stb r12, 0(r7) -/* 8031F650 38 00 00 00 */ li r0, 0 -/* 8031F654 2C 05 00 01 */ cmpwi r5, 1 -/* 8031F658 41 82 00 0C */ beq lbl_8031F664 -/* 8031F65C 2C 05 00 03 */ cmpwi r5, 3 -/* 8031F660 40 82 00 08 */ bne lbl_8031F668 -lbl_8031F664: -/* 8031F664 38 00 00 01 */ li r0, 1 -lbl_8031F668: -/* 8031F668 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8031F66C 7C 60 03 78 */ or r0, r3, r0 -/* 8031F670 7C 80 03 78 */ or r0, r4, r0 -/* 8031F674 7C C0 03 78 */ or r0, r6, r0 -/* 8031F678 7D 00 03 78 */ or r0, r8, r0 -/* 8031F67C 7D 20 03 78 */ or r0, r9, r0 -/* 8031F680 7D 40 03 78 */ or r0, r10, r0 -/* 8031F684 64 00 41 00 */ oris r0, r0, 0x4100 -/* 8031F688 54 0C C6 3E */ rlwinm r12, r0, 0x18, 0x18, 0x1f -/* 8031F68C 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031F690 80 EB 00 08 */ lwz r7, 8(r11) -/* 8031F694 38 07 00 01 */ addi r0, r7, 1 -/* 8031F698 90 0B 00 08 */ stw r0, 8(r11) -/* 8031F69C 99 87 00 00 */ stb r12, 0(r7) -/* 8031F6A0 38 00 00 00 */ li r0, 0 -/* 8031F6A4 2C 05 00 01 */ cmpwi r5, 1 -/* 8031F6A8 41 82 00 0C */ beq lbl_8031F6B4 -/* 8031F6AC 2C 05 00 03 */ cmpwi r5, 3 -/* 8031F6B0 40 82 00 08 */ bne lbl_8031F6B8 -lbl_8031F6B4: -/* 8031F6B4 38 00 00 01 */ li r0, 1 -lbl_8031F6B8: -/* 8031F6B8 7C 60 03 78 */ or r0, r3, r0 -/* 8031F6BC 7C 80 03 78 */ or r0, r4, r0 -/* 8031F6C0 7C C0 03 78 */ or r0, r6, r0 -/* 8031F6C4 7D 00 03 78 */ or r0, r8, r0 -/* 8031F6C8 7D 20 03 78 */ or r0, r9, r0 -/* 8031F6CC 7D 40 03 78 */ or r0, r10, r0 -/* 8031F6D0 60 05 00 00 */ ori r5, r0, 0 -/* 8031F6D4 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F6D8 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F6DC 38 03 00 01 */ addi r0, r3, 1 -/* 8031F6E0 90 04 00 08 */ stw r0, 8(r4) -/* 8031F6E4 98 A3 00 00 */ stb r5, 0(r3) -/* 8031F6E8 3C 60 80 43 */ lis r3, j3dZModeTable@ha /* 0x80437160@ha */ -/* 8031F6EC 38 83 71 60 */ addi r4, r3, j3dZModeTable@l /* 0x80437160@l */ -/* 8031F6F0 A0 1F 00 38 */ lhz r0, 0x38(r31) -/* 8031F6F4 1C 00 00 03 */ mulli r0, r0, 3 -/* 8031F6F8 7C 64 02 14 */ add r3, r4, r0 -/* 8031F6FC 88 E3 00 02 */ lbz r7, 2(r3) -/* 8031F700 88 C3 00 01 */ lbz r6, 1(r3) -/* 8031F704 7D 04 00 AE */ lbzx r8, r4, r0 -/* 8031F708 38 00 00 61 */ li r0, 0x61 -/* 8031F70C 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F710 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F714 38 64 00 01 */ addi r3, r4, 1 -/* 8031F718 90 65 00 08 */ stw r3, 8(r5) -/* 8031F71C 98 04 00 00 */ stb r0, 0(r4) -/* 8031F720 54 E4 25 36 */ rlwinm r4, r7, 4, 0x14, 0x1b -/* 8031F724 54 C3 08 3C */ slwi r3, r6, 1 -/* 8031F728 7D 03 1B 78 */ or r3, r8, r3 -/* 8031F72C 7C 83 1B 78 */ or r3, r4, r3 -/* 8031F730 64 67 40 00 */ oris r7, r3, 0x4000 -/* 8031F734 54 E6 46 3E */ srwi r6, r7, 0x18 -/* 8031F738 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F73C 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F740 38 64 00 01 */ addi r3, r4, 1 -/* 8031F744 90 65 00 08 */ stw r3, 8(r5) -/* 8031F748 98 C4 00 00 */ stb r6, 0(r4) -/* 8031F74C 54 E6 86 3E */ rlwinm r6, r7, 0x10, 0x18, 0x1f -/* 8031F750 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F754 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F758 38 64 00 01 */ addi r3, r4, 1 -/* 8031F75C 90 65 00 08 */ stw r3, 8(r5) -/* 8031F760 98 C4 00 00 */ stb r6, 0(r4) -/* 8031F764 54 E6 C6 3E */ rlwinm r6, r7, 0x18, 0x18, 0x1f -/* 8031F768 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F76C 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F770 38 64 00 01 */ addi r3, r4, 1 -/* 8031F774 90 65 00 08 */ stw r3, 8(r5) -/* 8031F778 98 C4 00 00 */ stb r6, 0(r4) -/* 8031F77C 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F780 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F784 38 64 00 01 */ addi r3, r4, 1 -/* 8031F788 90 65 00 08 */ stw r3, 8(r5) -/* 8031F78C 98 E4 00 00 */ stb r7, 0(r4) -/* 8031F790 88 FF 00 3A */ lbz r7, 0x3a(r31) -/* 8031F794 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F798 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F79C 38 64 00 01 */ addi r3, r4, 1 -/* 8031F7A0 90 65 00 08 */ stw r3, 8(r5) -/* 8031F7A4 98 04 00 00 */ stb r0, 0(r4) -/* 8031F7A8 38 C0 00 FE */ li r6, 0xfe -/* 8031F7AC 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F7B0 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F7B4 38 64 00 01 */ addi r3, r4, 1 -/* 8031F7B8 90 65 00 08 */ stw r3, 8(r5) -/* 8031F7BC 98 C4 00 00 */ stb r6, 0(r4) -/* 8031F7C0 38 C0 00 00 */ li r6, 0 -/* 8031F7C4 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F7C8 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F7CC 38 64 00 01 */ addi r3, r4, 1 -/* 8031F7D0 90 65 00 08 */ stw r3, 8(r5) -/* 8031F7D4 98 C4 00 00 */ stb r6, 0(r4) -/* 8031F7D8 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F7DC 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F7E0 38 64 00 01 */ addi r3, r4, 1 -/* 8031F7E4 90 65 00 08 */ stw r3, 8(r5) -/* 8031F7E8 98 C4 00 00 */ stb r6, 0(r4) -/* 8031F7EC 38 C0 00 40 */ li r6, 0x40 -/* 8031F7F0 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F7F4 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F7F8 38 64 00 01 */ addi r3, r4, 1 -/* 8031F7FC 90 65 00 08 */ stw r3, 8(r5) -/* 8031F800 98 C4 00 00 */ stb r6, 0(r4) -/* 8031F804 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F808 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F80C 38 64 00 01 */ addi r3, r4, 1 -/* 8031F810 90 65 00 08 */ stw r3, 8(r5) -/* 8031F814 98 04 00 00 */ stb r0, 0(r4) -/* 8031F818 54 E0 34 B2 */ rlwinm r0, r7, 6, 0x12, 0x19 -/* 8031F81C 64 06 43 00 */ oris r6, r0, 0x4300 -/* 8031F820 54 C5 46 3E */ srwi r5, r6, 0x18 -/* 8031F824 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F828 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F82C 38 03 00 01 */ addi r0, r3, 1 -/* 8031F830 90 04 00 08 */ stw r0, 8(r4) -/* 8031F834 98 A3 00 00 */ stb r5, 0(r3) -/* 8031F838 54 C5 86 3E */ rlwinm r5, r6, 0x10, 0x18, 0x1f -/* 8031F83C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F840 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F844 38 03 00 01 */ addi r0, r3, 1 -/* 8031F848 90 04 00 08 */ stw r0, 8(r4) -/* 8031F84C 98 A3 00 00 */ stb r5, 0(r3) -/* 8031F850 54 C5 C6 3E */ rlwinm r5, r6, 0x18, 0x18, 0x1f -/* 8031F854 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F858 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F85C 38 03 00 01 */ addi r0, r3, 1 -/* 8031F860 90 04 00 08 */ stw r0, 8(r4) -/* 8031F864 98 A3 00 00 */ stb r5, 0(r3) -/* 8031F868 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F86C 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F870 38 03 00 01 */ addi r0, r3, 1 -/* 8031F874 90 04 00 08 */ stw r0, 8(r4) -/* 8031F878 98 C3 00 00 */ stb r6, 0(r3) -/* 8031F87C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8031F880 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031F884 7C 08 03 A6 */ mtlr r0 -/* 8031F888 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031F88C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__16J3DPEBlockFogOffFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__16J3DPEBlockFogOffFv.s deleted file mode 100644 index a7750897276..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__16J3DPEBlockFogOffFv.s +++ /dev/null @@ -1,300 +0,0 @@ -lbl_8031EC50: -/* 8031EC50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031EC54 7C 08 02 A6 */ mflr r0 -/* 8031EC58 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031EC5C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8031EC60 7C 7F 1B 78 */ mr r31, r3 -/* 8031EC64 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031EC68 80 64 00 08 */ lwz r3, 8(r4) -/* 8031EC6C 38 63 00 1E */ addi r3, r3, 0x1e -/* 8031EC70 80 04 00 0C */ lwz r0, 0xc(r4) -/* 8031EC74 7C 03 00 40 */ cmplw r3, r0 -/* 8031EC78 40 81 00 08 */ ble lbl_8031EC80 -/* 8031EC7C 48 04 24 59 */ bl GDOverflowed -lbl_8031EC80: -/* 8031EC80 88 FF 00 07 */ lbz r7, 7(r31) -/* 8031EC84 3C 60 80 43 */ lis r3, j3dAlphaCmpTable@ha /* 0x80436E60@ha */ -/* 8031EC88 38 83 6E 60 */ addi r4, r3, j3dAlphaCmpTable@l /* 0x80436E60@l */ -/* 8031EC8C A0 1F 00 04 */ lhz r0, 4(r31) -/* 8031EC90 1C 00 00 03 */ mulli r0, r0, 3 -/* 8031EC94 7C 64 02 14 */ add r3, r4, r0 -/* 8031EC98 89 43 00 02 */ lbz r10, 2(r3) -/* 8031EC9C 89 23 00 01 */ lbz r9, 1(r3) -/* 8031ECA0 88 DF 00 06 */ lbz r6, 6(r31) -/* 8031ECA4 7D 04 00 AE */ lbzx r8, r4, r0 -/* 8031ECA8 38 60 00 61 */ li r3, 0x61 -/* 8031ECAC 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031ECB0 80 85 00 08 */ lwz r4, 8(r5) -/* 8031ECB4 38 04 00 01 */ addi r0, r4, 1 -/* 8031ECB8 90 05 00 08 */ stw r0, 8(r5) -/* 8031ECBC 98 64 00 00 */ stb r3, 0(r4) -/* 8031ECC0 55 24 B0 12 */ slwi r4, r9, 0x16 -/* 8031ECC4 55 40 98 18 */ slwi r0, r10, 0x13 -/* 8031ECC8 50 E6 44 2E */ rlwimi r6, r7, 8, 0x10, 0x17 -/* 8031ECCC 51 06 82 1E */ rlwimi r6, r8, 0x10, 8, 0xf -/* 8031ECD0 7C 00 33 78 */ or r0, r0, r6 -/* 8031ECD4 7C 80 03 78 */ or r0, r4, r0 -/* 8031ECD8 64 07 F3 00 */ oris r7, r0, 0xf300 -/* 8031ECDC 54 E6 46 3E */ srwi r6, r7, 0x18 -/* 8031ECE0 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031ECE4 80 85 00 08 */ lwz r4, 8(r5) -/* 8031ECE8 38 04 00 01 */ addi r0, r4, 1 -/* 8031ECEC 90 05 00 08 */ stw r0, 8(r5) -/* 8031ECF0 98 C4 00 00 */ stb r6, 0(r4) -/* 8031ECF4 54 E6 86 3E */ rlwinm r6, r7, 0x10, 0x18, 0x1f -/* 8031ECF8 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031ECFC 80 85 00 08 */ lwz r4, 8(r5) -/* 8031ED00 38 04 00 01 */ addi r0, r4, 1 -/* 8031ED04 90 05 00 08 */ stw r0, 8(r5) -/* 8031ED08 98 C4 00 00 */ stb r6, 0(r4) -/* 8031ED0C 54 E6 C6 3E */ rlwinm r6, r7, 0x18, 0x18, 0x1f -/* 8031ED10 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031ED14 80 85 00 08 */ lwz r4, 8(r5) -/* 8031ED18 38 04 00 01 */ addi r0, r4, 1 -/* 8031ED1C 90 05 00 08 */ stw r0, 8(r5) -/* 8031ED20 98 C4 00 00 */ stb r6, 0(r4) -/* 8031ED24 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031ED28 80 85 00 08 */ lwz r4, 8(r5) -/* 8031ED2C 38 04 00 01 */ addi r0, r4, 1 -/* 8031ED30 90 05 00 08 */ stw r0, 8(r5) -/* 8031ED34 98 E4 00 00 */ stb r7, 0(r4) -/* 8031ED38 88 9F 00 0F */ lbz r4, 0xf(r31) -/* 8031ED3C 89 1F 00 0B */ lbz r8, 0xb(r31) -/* 8031ED40 88 FF 00 0A */ lbz r7, 0xa(r31) -/* 8031ED44 88 DF 00 09 */ lbz r6, 9(r31) -/* 8031ED48 88 BF 00 08 */ lbz r5, 8(r31) -/* 8031ED4C 81 4D 94 00 */ lwz r10, __GDCurrentDL(r13) -/* 8031ED50 81 2A 00 08 */ lwz r9, 8(r10) -/* 8031ED54 38 09 00 01 */ addi r0, r9, 1 -/* 8031ED58 90 0A 00 08 */ stw r0, 8(r10) -/* 8031ED5C 98 69 00 00 */ stb r3, 0(r9) -/* 8031ED60 39 60 00 FE */ li r11, 0xfe -/* 8031ED64 81 4D 94 00 */ lwz r10, __GDCurrentDL(r13) -/* 8031ED68 81 2A 00 08 */ lwz r9, 8(r10) -/* 8031ED6C 38 09 00 01 */ addi r0, r9, 1 -/* 8031ED70 90 0A 00 08 */ stw r0, 8(r10) -/* 8031ED74 99 69 00 00 */ stb r11, 0(r9) -/* 8031ED78 38 00 00 00 */ li r0, 0 -/* 8031ED7C 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031ED80 81 4B 00 08 */ lwz r10, 8(r11) -/* 8031ED84 39 2A 00 01 */ addi r9, r10, 1 -/* 8031ED88 91 2B 00 08 */ stw r9, 8(r11) -/* 8031ED8C 98 0A 00 00 */ stb r0, 0(r10) -/* 8031ED90 39 80 00 FF */ li r12, 0xff -/* 8031ED94 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031ED98 81 4B 00 08 */ lwz r10, 8(r11) -/* 8031ED9C 39 2A 00 01 */ addi r9, r10, 1 -/* 8031EDA0 91 2B 00 08 */ stw r9, 8(r11) -/* 8031EDA4 99 8A 00 00 */ stb r12, 0(r10) -/* 8031EDA8 39 80 00 E7 */ li r12, 0xe7 -/* 8031EDAC 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031EDB0 81 4B 00 08 */ lwz r10, 8(r11) -/* 8031EDB4 39 2A 00 01 */ addi r9, r10, 1 -/* 8031EDB8 91 2B 00 08 */ stw r9, 8(r11) -/* 8031EDBC 99 8A 00 00 */ stb r12, 0(r10) -/* 8031EDC0 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031EDC4 81 4B 00 08 */ lwz r10, 8(r11) -/* 8031EDC8 39 2A 00 01 */ addi r9, r10, 1 -/* 8031EDCC 91 2B 00 08 */ stw r9, 8(r11) -/* 8031EDD0 98 6A 00 00 */ stb r3, 0(r10) -/* 8031EDD4 2C 05 00 01 */ cmpwi r5, 1 -/* 8031EDD8 41 82 00 0C */ beq lbl_8031EDE4 -/* 8031EDDC 2C 05 00 03 */ cmpwi r5, 3 -/* 8031EDE0 40 82 00 08 */ bne lbl_8031EDE8 -lbl_8031EDE4: -/* 8031EDE4 38 00 00 01 */ li r0, 1 -lbl_8031EDE8: -/* 8031EDE8 55 0A 60 26 */ slwi r10, r8, 0xc -/* 8031EDEC 20 65 00 03 */ subfic r3, r5, 3 -/* 8031EDF0 7C 63 00 34 */ cntlzw r3, r3 -/* 8031EDF4 54 69 33 68 */ rlwinm r9, r3, 6, 0xd, 0x14 -/* 8031EDF8 54 C8 40 2E */ slwi r8, r6, 8 -/* 8031EDFC 54 E6 28 34 */ slwi r6, r7, 5 -/* 8031EE00 54 84 15 BA */ rlwinm r4, r4, 2, 0x16, 0x1d -/* 8031EE04 20 65 00 02 */ subfic r3, r5, 2 -/* 8031EE08 7C 63 00 34 */ cntlzw r3, r3 -/* 8031EE0C 54 63 E5 FC */ rlwinm r3, r3, 0x1c, 0x17, 0x1e -/* 8031EE10 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8031EE14 7C 60 03 78 */ or r0, r3, r0 -/* 8031EE18 7C 80 03 78 */ or r0, r4, r0 -/* 8031EE1C 7C C0 03 78 */ or r0, r6, r0 -/* 8031EE20 7D 00 03 78 */ or r0, r8, r0 -/* 8031EE24 7D 20 03 78 */ or r0, r9, r0 -/* 8031EE28 7D 40 03 78 */ or r0, r10, r0 -/* 8031EE2C 64 00 41 00 */ oris r0, r0, 0x4100 -/* 8031EE30 54 0C 46 3E */ srwi r12, r0, 0x18 -/* 8031EE34 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031EE38 80 EB 00 08 */ lwz r7, 8(r11) -/* 8031EE3C 38 07 00 01 */ addi r0, r7, 1 -/* 8031EE40 90 0B 00 08 */ stw r0, 8(r11) -/* 8031EE44 99 87 00 00 */ stb r12, 0(r7) -/* 8031EE48 38 00 00 00 */ li r0, 0 -/* 8031EE4C 2C 05 00 01 */ cmpwi r5, 1 -/* 8031EE50 41 82 00 0C */ beq lbl_8031EE5C -/* 8031EE54 2C 05 00 03 */ cmpwi r5, 3 -/* 8031EE58 40 82 00 08 */ bne lbl_8031EE60 -lbl_8031EE5C: -/* 8031EE5C 38 00 00 01 */ li r0, 1 -lbl_8031EE60: -/* 8031EE60 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8031EE64 7C 60 03 78 */ or r0, r3, r0 -/* 8031EE68 7C 80 03 78 */ or r0, r4, r0 -/* 8031EE6C 7C C0 03 78 */ or r0, r6, r0 -/* 8031EE70 7D 00 03 78 */ or r0, r8, r0 -/* 8031EE74 7D 20 03 78 */ or r0, r9, r0 -/* 8031EE78 7D 40 03 78 */ or r0, r10, r0 -/* 8031EE7C 64 00 41 00 */ oris r0, r0, 0x4100 -/* 8031EE80 54 0C 86 3E */ rlwinm r12, r0, 0x10, 0x18, 0x1f -/* 8031EE84 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031EE88 80 EB 00 08 */ lwz r7, 8(r11) -/* 8031EE8C 38 07 00 01 */ addi r0, r7, 1 -/* 8031EE90 90 0B 00 08 */ stw r0, 8(r11) -/* 8031EE94 99 87 00 00 */ stb r12, 0(r7) -/* 8031EE98 38 00 00 00 */ li r0, 0 -/* 8031EE9C 2C 05 00 01 */ cmpwi r5, 1 -/* 8031EEA0 41 82 00 0C */ beq lbl_8031EEAC -/* 8031EEA4 2C 05 00 03 */ cmpwi r5, 3 -/* 8031EEA8 40 82 00 08 */ bne lbl_8031EEB0 -lbl_8031EEAC: -/* 8031EEAC 38 00 00 01 */ li r0, 1 -lbl_8031EEB0: -/* 8031EEB0 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8031EEB4 7C 60 03 78 */ or r0, r3, r0 -/* 8031EEB8 7C 80 03 78 */ or r0, r4, r0 -/* 8031EEBC 7C C0 03 78 */ or r0, r6, r0 -/* 8031EEC0 7D 00 03 78 */ or r0, r8, r0 -/* 8031EEC4 7D 20 03 78 */ or r0, r9, r0 -/* 8031EEC8 7D 40 03 78 */ or r0, r10, r0 -/* 8031EECC 64 00 41 00 */ oris r0, r0, 0x4100 -/* 8031EED0 54 0C C6 3E */ rlwinm r12, r0, 0x18, 0x18, 0x1f -/* 8031EED4 81 6D 94 00 */ lwz r11, __GDCurrentDL(r13) -/* 8031EED8 80 EB 00 08 */ lwz r7, 8(r11) -/* 8031EEDC 38 07 00 01 */ addi r0, r7, 1 -/* 8031EEE0 90 0B 00 08 */ stw r0, 8(r11) -/* 8031EEE4 99 87 00 00 */ stb r12, 0(r7) -/* 8031EEE8 38 00 00 00 */ li r0, 0 -/* 8031EEEC 2C 05 00 01 */ cmpwi r5, 1 -/* 8031EEF0 41 82 00 0C */ beq lbl_8031EEFC -/* 8031EEF4 2C 05 00 03 */ cmpwi r5, 3 -/* 8031EEF8 40 82 00 08 */ bne lbl_8031EF00 -lbl_8031EEFC: -/* 8031EEFC 38 00 00 01 */ li r0, 1 -lbl_8031EF00: -/* 8031EF00 7C 60 03 78 */ or r0, r3, r0 -/* 8031EF04 7C 80 03 78 */ or r0, r4, r0 -/* 8031EF08 7C C0 03 78 */ or r0, r6, r0 -/* 8031EF0C 7D 00 03 78 */ or r0, r8, r0 -/* 8031EF10 7D 20 03 78 */ or r0, r9, r0 -/* 8031EF14 7D 40 03 78 */ or r0, r10, r0 -/* 8031EF18 60 05 00 00 */ ori r5, r0, 0 -/* 8031EF1C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031EF20 80 64 00 08 */ lwz r3, 8(r4) -/* 8031EF24 38 03 00 01 */ addi r0, r3, 1 -/* 8031EF28 90 04 00 08 */ stw r0, 8(r4) -/* 8031EF2C 98 A3 00 00 */ stb r5, 0(r3) -/* 8031EF30 3C 60 80 43 */ lis r3, j3dZModeTable@ha /* 0x80437160@ha */ -/* 8031EF34 38 83 71 60 */ addi r4, r3, j3dZModeTable@l /* 0x80437160@l */ -/* 8031EF38 A0 1F 00 0C */ lhz r0, 0xc(r31) -/* 8031EF3C 1C 00 00 03 */ mulli r0, r0, 3 -/* 8031EF40 7C 64 02 14 */ add r3, r4, r0 -/* 8031EF44 88 E3 00 02 */ lbz r7, 2(r3) -/* 8031EF48 88 C3 00 01 */ lbz r6, 1(r3) -/* 8031EF4C 7D 04 00 AE */ lbzx r8, r4, r0 -/* 8031EF50 38 00 00 61 */ li r0, 0x61 -/* 8031EF54 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031EF58 80 85 00 08 */ lwz r4, 8(r5) -/* 8031EF5C 38 64 00 01 */ addi r3, r4, 1 -/* 8031EF60 90 65 00 08 */ stw r3, 8(r5) -/* 8031EF64 98 04 00 00 */ stb r0, 0(r4) -/* 8031EF68 54 E4 25 36 */ rlwinm r4, r7, 4, 0x14, 0x1b -/* 8031EF6C 54 C3 08 3C */ slwi r3, r6, 1 -/* 8031EF70 7D 03 1B 78 */ or r3, r8, r3 -/* 8031EF74 7C 83 1B 78 */ or r3, r4, r3 -/* 8031EF78 64 67 40 00 */ oris r7, r3, 0x4000 -/* 8031EF7C 54 E6 46 3E */ srwi r6, r7, 0x18 -/* 8031EF80 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031EF84 80 85 00 08 */ lwz r4, 8(r5) -/* 8031EF88 38 64 00 01 */ addi r3, r4, 1 -/* 8031EF8C 90 65 00 08 */ stw r3, 8(r5) -/* 8031EF90 98 C4 00 00 */ stb r6, 0(r4) -/* 8031EF94 54 E6 86 3E */ rlwinm r6, r7, 0x10, 0x18, 0x1f -/* 8031EF98 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031EF9C 80 85 00 08 */ lwz r4, 8(r5) -/* 8031EFA0 38 64 00 01 */ addi r3, r4, 1 -/* 8031EFA4 90 65 00 08 */ stw r3, 8(r5) -/* 8031EFA8 98 C4 00 00 */ stb r6, 0(r4) -/* 8031EFAC 54 E6 C6 3E */ rlwinm r6, r7, 0x18, 0x18, 0x1f -/* 8031EFB0 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031EFB4 80 85 00 08 */ lwz r4, 8(r5) -/* 8031EFB8 38 64 00 01 */ addi r3, r4, 1 -/* 8031EFBC 90 65 00 08 */ stw r3, 8(r5) -/* 8031EFC0 98 C4 00 00 */ stb r6, 0(r4) -/* 8031EFC4 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031EFC8 80 85 00 08 */ lwz r4, 8(r5) -/* 8031EFCC 38 64 00 01 */ addi r3, r4, 1 -/* 8031EFD0 90 65 00 08 */ stw r3, 8(r5) -/* 8031EFD4 98 E4 00 00 */ stb r7, 0(r4) -/* 8031EFD8 88 FF 00 0E */ lbz r7, 0xe(r31) -/* 8031EFDC 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031EFE0 80 85 00 08 */ lwz r4, 8(r5) -/* 8031EFE4 38 64 00 01 */ addi r3, r4, 1 -/* 8031EFE8 90 65 00 08 */ stw r3, 8(r5) -/* 8031EFEC 98 04 00 00 */ stb r0, 0(r4) -/* 8031EFF0 38 C0 00 FE */ li r6, 0xfe -/* 8031EFF4 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031EFF8 80 85 00 08 */ lwz r4, 8(r5) -/* 8031EFFC 38 64 00 01 */ addi r3, r4, 1 -/* 8031F000 90 65 00 08 */ stw r3, 8(r5) -/* 8031F004 98 C4 00 00 */ stb r6, 0(r4) -/* 8031F008 38 C0 00 00 */ li r6, 0 -/* 8031F00C 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F010 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F014 38 64 00 01 */ addi r3, r4, 1 -/* 8031F018 90 65 00 08 */ stw r3, 8(r5) -/* 8031F01C 98 C4 00 00 */ stb r6, 0(r4) -/* 8031F020 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F024 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F028 38 64 00 01 */ addi r3, r4, 1 -/* 8031F02C 90 65 00 08 */ stw r3, 8(r5) -/* 8031F030 98 C4 00 00 */ stb r6, 0(r4) -/* 8031F034 38 C0 00 40 */ li r6, 0x40 -/* 8031F038 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F03C 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F040 38 64 00 01 */ addi r3, r4, 1 -/* 8031F044 90 65 00 08 */ stw r3, 8(r5) -/* 8031F048 98 C4 00 00 */ stb r6, 0(r4) -/* 8031F04C 80 AD 94 00 */ lwz r5, __GDCurrentDL(r13) -/* 8031F050 80 85 00 08 */ lwz r4, 8(r5) -/* 8031F054 38 64 00 01 */ addi r3, r4, 1 -/* 8031F058 90 65 00 08 */ stw r3, 8(r5) -/* 8031F05C 98 04 00 00 */ stb r0, 0(r4) -/* 8031F060 54 E0 34 B2 */ rlwinm r0, r7, 6, 0x12, 0x19 -/* 8031F064 64 06 43 00 */ oris r6, r0, 0x4300 -/* 8031F068 54 C5 46 3E */ srwi r5, r6, 0x18 -/* 8031F06C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F070 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F074 38 03 00 01 */ addi r0, r3, 1 -/* 8031F078 90 04 00 08 */ stw r0, 8(r4) -/* 8031F07C 98 A3 00 00 */ stb r5, 0(r3) -/* 8031F080 54 C5 86 3E */ rlwinm r5, r6, 0x10, 0x18, 0x1f -/* 8031F084 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F088 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F08C 38 03 00 01 */ addi r0, r3, 1 -/* 8031F090 90 04 00 08 */ stw r0, 8(r4) -/* 8031F094 98 A3 00 00 */ stb r5, 0(r3) -/* 8031F098 54 C5 C6 3E */ rlwinm r5, r6, 0x18, 0x18, 0x1f -/* 8031F09C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F0A0 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F0A4 38 03 00 01 */ addi r0, r3, 1 -/* 8031F0A8 90 04 00 08 */ stw r0, 8(r4) -/* 8031F0AC 98 A3 00 00 */ stb r5, 0(r3) -/* 8031F0B0 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F0B4 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F0B8 38 03 00 01 */ addi r0, r3, 1 -/* 8031F0BC 90 04 00 08 */ stw r0, 8(r4) -/* 8031F0C0 98 C3 00 00 */ stb r6, 0(r3) -/* 8031F0C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8031F0C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031F0CC 7C 08 03 A6 */ mtlr r0 -/* 8031F0D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031F0D4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__12J3DTevBlock2Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__12J3DTevBlock2Fv.s deleted file mode 100644 index cc830a1073d..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__12J3DTevBlock2Fv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_8031C48C: -/* 8031C48C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8031C490 7C 08 02 A6 */ mflr r0 -/* 8031C494 90 01 00 34 */ stw r0, 0x34(r1) -/* 8031C498 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031C49C 48 04 5D 3D */ bl _savegpr_28 -/* 8031C4A0 7C 7C 1B 78 */ mr r28, r3 -/* 8031C4A4 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031C4A8 80 64 00 00 */ lwz r3, 0(r4) -/* 8031C4AC 80 1C 00 68 */ lwz r0, 0x68(r28) -/* 8031C4B0 7C 03 02 14 */ add r0, r3, r0 -/* 8031C4B4 90 04 00 08 */ stw r0, 8(r4) -/* 8031C4B8 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C4BC 83 C3 00 08 */ lwz r30, 8(r3) -/* 8031C4C0 3B A0 00 00 */ li r29, 0 -/* 8031C4C4 3B E0 00 00 */ li r31, 0 -lbl_8031C4C8: -/* 8031C4C8 38 1F 00 14 */ addi r0, r31, 0x14 -/* 8031C4CC 7C 9C 02 14 */ add r4, r28, r0 -/* 8031C4D0 80 64 00 00 */ lwz r3, 0(r4) -/* 8031C4D4 80 04 00 04 */ lwz r0, 4(r4) -/* 8031C4D8 90 61 00 0C */ stw r3, 0xc(r1) -/* 8031C4DC 90 01 00 10 */ stw r0, 0x10(r1) -/* 8031C4E0 38 7D 00 01 */ addi r3, r29, 1 -/* 8031C4E4 38 81 00 0C */ addi r4, r1, 0xc -/* 8031C4E8 4B FF 2F 15 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 -/* 8031C4EC 3B BD 00 01 */ addi r29, r29, 1 -/* 8031C4F0 28 1D 00 03 */ cmplwi r29, 3 -/* 8031C4F4 3B FF 00 08 */ addi r31, r31, 8 -/* 8031C4F8 41 80 FF D0 */ blt lbl_8031C4C8 -/* 8031C4FC 3B A0 00 00 */ li r29, 0 -/* 8031C500 3B E0 00 00 */ li r31, 0 -lbl_8031C504: -/* 8031C504 38 1F 00 45 */ addi r0, r31, 0x45 -/* 8031C508 7C 1C 00 2E */ lwzx r0, r28, r0 -/* 8031C50C 90 01 00 08 */ stw r0, 8(r1) -/* 8031C510 7F A3 EB 78 */ mr r3, r29 -/* 8031C514 38 81 00 08 */ addi r4, r1, 8 -/* 8031C518 4B FF 2D 7D */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor -/* 8031C51C 3B BD 00 01 */ addi r29, r29, 1 -/* 8031C520 28 1D 00 04 */ cmplwi r29, 4 -/* 8031C524 3B FF 00 04 */ addi r31, r31, 4 -/* 8031C528 41 80 FF DC */ blt lbl_8031C504 -/* 8031C52C 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C530 80 03 00 08 */ lwz r0, 8(r3) -/* 8031C534 7F C3 F3 78 */ mr r3, r30 -/* 8031C538 7C 9E 00 50 */ subf r4, r30, r0 -/* 8031C53C 48 01 F0 A1 */ bl DCStoreRange -/* 8031C540 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031C544 48 04 5C E1 */ bl _restgpr_28 -/* 8031C548 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8031C54C 7C 08 03 A6 */ mtlr r0 -/* 8031C550 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031C554 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__12J3DTevBlock4Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__12J3DTevBlock4Fv.s deleted file mode 100644 index 1d13e20a74a..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__12J3DTevBlock4Fv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_8031C788: -/* 8031C788 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8031C78C 7C 08 02 A6 */ mflr r0 -/* 8031C790 90 01 00 34 */ stw r0, 0x34(r1) -/* 8031C794 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031C798 48 04 5A 41 */ bl _savegpr_28 -/* 8031C79C 7C 7C 1B 78 */ mr r28, r3 -/* 8031C7A0 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031C7A4 80 64 00 00 */ lwz r3, 0(r4) -/* 8031C7A8 80 1C 00 90 */ lwz r0, 0x90(r28) -/* 8031C7AC 7C 03 02 14 */ add r0, r3, r0 -/* 8031C7B0 90 04 00 08 */ stw r0, 8(r4) -/* 8031C7B4 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C7B8 83 C3 00 08 */ lwz r30, 8(r3) -/* 8031C7BC 3B A0 00 00 */ li r29, 0 -/* 8031C7C0 3B E0 00 00 */ li r31, 0 -lbl_8031C7C4: -/* 8031C7C4 38 1F 00 42 */ addi r0, r31, 0x42 -/* 8031C7C8 7C 9C 02 14 */ add r4, r28, r0 -/* 8031C7CC 80 64 00 00 */ lwz r3, 0(r4) -/* 8031C7D0 80 04 00 04 */ lwz r0, 4(r4) -/* 8031C7D4 90 61 00 0C */ stw r3, 0xc(r1) -/* 8031C7D8 90 01 00 10 */ stw r0, 0x10(r1) -/* 8031C7DC 38 7D 00 01 */ addi r3, r29, 1 -/* 8031C7E0 38 81 00 0C */ addi r4, r1, 0xc -/* 8031C7E4 4B FF 2C 19 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 -/* 8031C7E8 3B BD 00 01 */ addi r29, r29, 1 -/* 8031C7EC 28 1D 00 03 */ cmplwi r29, 3 -/* 8031C7F0 3B FF 00 08 */ addi r31, r31, 8 -/* 8031C7F4 41 80 FF D0 */ blt lbl_8031C7C4 -/* 8031C7F8 3B A0 00 00 */ li r29, 0 -/* 8031C7FC 3B E0 00 00 */ li r31, 0 -lbl_8031C800: -/* 8031C800 38 1F 00 62 */ addi r0, r31, 0x62 -/* 8031C804 7C 1C 00 2E */ lwzx r0, r28, r0 -/* 8031C808 90 01 00 08 */ stw r0, 8(r1) -/* 8031C80C 7F A3 EB 78 */ mr r3, r29 -/* 8031C810 38 81 00 08 */ addi r4, r1, 8 -/* 8031C814 4B FF 2A 81 */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor -/* 8031C818 3B BD 00 01 */ addi r29, r29, 1 -/* 8031C81C 28 1D 00 04 */ cmplwi r29, 4 -/* 8031C820 3B FF 00 04 */ addi r31, r31, 4 -/* 8031C824 41 80 FF DC */ blt lbl_8031C800 -/* 8031C828 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C82C 80 03 00 08 */ lwz r0, 8(r3) -/* 8031C830 7F C3 F3 78 */ mr r3, r30 -/* 8031C834 7C 9E 00 50 */ subf r4, r30, r0 -/* 8031C838 48 01 ED A5 */ bl DCStoreRange -/* 8031C83C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031C840 48 04 59 E5 */ bl _restgpr_28 -/* 8031C844 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8031C848 7C 08 03 A6 */ mtlr r0 -/* 8031C84C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031C850 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__13J3DTevBlock16Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__13J3DTevBlock16Fv.s deleted file mode 100644 index f8ebe65cc51..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__13J3DTevBlock16Fv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_8031CAB0: -/* 8031CAB0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8031CAB4 7C 08 02 A6 */ mflr r0 -/* 8031CAB8 90 01 00 34 */ stw r0, 0x34(r1) -/* 8031CABC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031CAC0 48 04 57 19 */ bl _savegpr_28 -/* 8031CAC4 7C 7C 1B 78 */ mr r28, r3 -/* 8031CAC8 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031CACC 80 64 00 00 */ lwz r3, 0(r4) -/* 8031CAD0 80 1C 01 70 */ lwz r0, 0x170(r28) -/* 8031CAD4 7C 03 02 14 */ add r0, r3, r0 -/* 8031CAD8 90 04 00 08 */ stw r0, 8(r4) -/* 8031CADC 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031CAE0 83 C3 00 08 */ lwz r30, 8(r3) -/* 8031CAE4 3B A0 00 00 */ li r29, 0 -/* 8031CAE8 3B E0 00 00 */ li r31, 0 -lbl_8031CAEC: -/* 8031CAEC 38 1F 00 DA */ addi r0, r31, 0xda -/* 8031CAF0 7C 9C 02 14 */ add r4, r28, r0 -/* 8031CAF4 80 64 00 00 */ lwz r3, 0(r4) -/* 8031CAF8 80 04 00 04 */ lwz r0, 4(r4) -/* 8031CAFC 90 61 00 0C */ stw r3, 0xc(r1) -/* 8031CB00 90 01 00 10 */ stw r0, 0x10(r1) -/* 8031CB04 38 7D 00 01 */ addi r3, r29, 1 -/* 8031CB08 38 81 00 0C */ addi r4, r1, 0xc -/* 8031CB0C 4B FF 28 F1 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 -/* 8031CB10 3B BD 00 01 */ addi r29, r29, 1 -/* 8031CB14 28 1D 00 03 */ cmplwi r29, 3 -/* 8031CB18 3B FF 00 08 */ addi r31, r31, 8 -/* 8031CB1C 41 80 FF D0 */ blt lbl_8031CAEC -/* 8031CB20 3B A0 00 00 */ li r29, 0 -/* 8031CB24 3B E0 00 00 */ li r31, 0 -lbl_8031CB28: -/* 8031CB28 38 1F 00 FA */ addi r0, r31, 0xfa -/* 8031CB2C 7C 1C 00 2E */ lwzx r0, r28, r0 -/* 8031CB30 90 01 00 08 */ stw r0, 8(r1) -/* 8031CB34 7F A3 EB 78 */ mr r3, r29 -/* 8031CB38 38 81 00 08 */ addi r4, r1, 8 -/* 8031CB3C 4B FF 27 59 */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor -/* 8031CB40 3B BD 00 01 */ addi r29, r29, 1 -/* 8031CB44 28 1D 00 04 */ cmplwi r29, 4 -/* 8031CB48 3B FF 00 04 */ addi r31, r31, 4 -/* 8031CB4C 41 80 FF DC */ blt lbl_8031CB28 -/* 8031CB50 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031CB54 80 03 00 08 */ lwz r0, 8(r3) -/* 8031CB58 7F C3 F3 78 */ mr r3, r30 -/* 8031CB5C 7C 9E 00 50 */ subf r4, r30, r0 -/* 8031CB60 48 01 EA 7D */ bl DCStoreRange -/* 8031CB64 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031CB68 48 04 56 BD */ bl _restgpr_28 -/* 8031CB6C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8031CB70 7C 08 03 A6 */ mtlr r0 -/* 8031CB74 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031CB78 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__18J3DTevBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__18J3DTevBlockPatchedFv.s deleted file mode 100644 index 75376730282..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__18J3DTevBlockPatchedFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_8031BFE0: -/* 8031BFE0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8031BFE4 7C 08 02 A6 */ mflr r0 -/* 8031BFE8 90 01 00 34 */ stw r0, 0x34(r1) -/* 8031BFEC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031BFF0 48 04 61 E9 */ bl _savegpr_28 -/* 8031BFF4 7C 7C 1B 78 */ mr r28, r3 -/* 8031BFF8 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031BFFC 80 64 00 00 */ lwz r3, 0(r4) -/* 8031C000 80 1C 00 D4 */ lwz r0, 0xd4(r28) -/* 8031C004 7C 03 02 14 */ add r0, r3, r0 -/* 8031C008 90 04 00 08 */ stw r0, 8(r4) -/* 8031C00C 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C010 83 C3 00 08 */ lwz r30, 8(r3) -/* 8031C014 3B A0 00 00 */ li r29, 0 -/* 8031C018 3B E0 00 00 */ li r31, 0 -lbl_8031C01C: -/* 8031C01C 38 1F 00 98 */ addi r0, r31, 0x98 -/* 8031C020 7C 9C 02 14 */ add r4, r28, r0 -/* 8031C024 80 64 00 00 */ lwz r3, 0(r4) -/* 8031C028 80 04 00 04 */ lwz r0, 4(r4) -/* 8031C02C 90 61 00 0C */ stw r3, 0xc(r1) -/* 8031C030 90 01 00 10 */ stw r0, 0x10(r1) -/* 8031C034 38 7D 00 01 */ addi r3, r29, 1 -/* 8031C038 38 81 00 0C */ addi r4, r1, 0xc -/* 8031C03C 4B FF 33 C1 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 -/* 8031C040 3B BD 00 01 */ addi r29, r29, 1 -/* 8031C044 28 1D 00 03 */ cmplwi r29, 3 -/* 8031C048 3B FF 00 08 */ addi r31, r31, 8 -/* 8031C04C 41 80 FF D0 */ blt lbl_8031C01C -/* 8031C050 3B A0 00 00 */ li r29, 0 -/* 8031C054 3B E0 00 00 */ li r31, 0 -lbl_8031C058: -/* 8031C058 38 1F 00 B8 */ addi r0, r31, 0xb8 -/* 8031C05C 7C 1C 00 2E */ lwzx r0, r28, r0 -/* 8031C060 90 01 00 08 */ stw r0, 8(r1) -/* 8031C064 7F A3 EB 78 */ mr r3, r29 -/* 8031C068 38 81 00 08 */ addi r4, r1, 8 -/* 8031C06C 4B FF 32 29 */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor -/* 8031C070 3B BD 00 01 */ addi r29, r29, 1 -/* 8031C074 28 1D 00 04 */ cmplwi r29, 4 -/* 8031C078 3B FF 00 04 */ addi r31, r31, 4 -/* 8031C07C 41 80 FF DC */ blt lbl_8031C058 -/* 8031C080 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C084 80 03 00 08 */ lwz r0, 8(r3) -/* 8031C088 7F C3 F3 78 */ mr r3, r30 -/* 8031C08C 7C 9E 00 50 */ subf r4, r30, r0 -/* 8031C090 48 01 F5 4D */ bl DCStoreRange -/* 8031C094 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031C098 48 04 61 8D */ bl _restgpr_28 -/* 8031C09C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8031C0A0 7C 08 03 A6 */ mtlr r0 -/* 8031C0A4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031C0A8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock1Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock1Fv.s deleted file mode 100644 index 4f1a21e8a1f..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock1Fv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_8031C2E8: -/* 8031C2E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031C2EC 7C 08 02 A6 */ mflr r0 -/* 8031C2F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031C2F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8031C2F8 93 C1 00 08 */ stw r30, 8(r1) -/* 8031C2FC 7C 7E 1B 78 */ mr r30, r3 -/* 8031C300 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031C304 80 64 00 00 */ lwz r3, 0(r4) -/* 8031C308 80 1E 00 04 */ lwz r0, 4(r30) -/* 8031C30C 7C 03 02 14 */ add r0, r3, r0 -/* 8031C310 90 04 00 08 */ stw r0, 8(r4) -/* 8031C314 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C318 83 E3 00 08 */ lwz r31, 8(r3) -/* 8031C31C A0 1E 00 08 */ lhz r0, 8(r30) -/* 8031C320 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031C324 41 82 00 10 */ beq lbl_8031C334 -/* 8031C328 38 60 00 00 */ li r3, 0 -/* 8031C32C 38 9E 00 08 */ addi r4, r30, 8 -/* 8031C330 48 00 7C 65 */ bl loadTexNo__FUlRCUs -lbl_8031C334: -/* 8031C334 38 60 00 00 */ li r3, 0 -/* 8031C338 88 9E 00 0A */ lbz r4, 0xa(r30) -/* 8031C33C 88 BE 00 0B */ lbz r5, 0xb(r30) -/* 8031C340 88 DE 00 0C */ lbz r6, 0xc(r30) -/* 8031C344 38 E0 00 FF */ li r7, 0xff -/* 8031C348 39 00 00 FF */ li r8, 0xff -/* 8031C34C 39 20 00 FF */ li r9, 0xff -/* 8031C350 4B FF 2D B9 */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID -/* 8031C354 88 1E 00 0B */ lbz r0, 0xb(r30) -/* 8031C358 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031C35C 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ -/* 8031C360 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ -/* 8031C364 7D 00 22 14 */ add r8, r0, r4 -/* 8031C368 88 7E 00 0A */ lbz r3, 0xa(r30) -/* 8031C36C A0 88 00 00 */ lhz r4, 0(r8) -/* 8031C370 A0 08 00 04 */ lhz r0, 4(r8) -/* 8031C374 20 00 00 01 */ subfic r0, r0, 1 -/* 8031C378 7C 00 00 34 */ cntlzw r0, r0 -/* 8031C37C 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031C380 38 C0 00 00 */ li r6, 0 -/* 8031C384 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031C388 A0 08 00 06 */ lhz r0, 6(r8) -/* 8031C38C 20 00 00 01 */ subfic r0, r0, 1 -/* 8031C390 7C 00 00 34 */ cntlzw r0, r0 -/* 8031C394 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031C398 39 20 00 00 */ li r9, 0 -/* 8031C39C 4B FF 1E 99 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031C3A0 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C3A4 80 03 00 08 */ lwz r0, 8(r3) -/* 8031C3A8 7F E3 FB 78 */ mr r3, r31 -/* 8031C3AC 7C 9F 00 50 */ subf r4, r31, r0 -/* 8031C3B0 48 01 F2 2D */ bl DCStoreRange -/* 8031C3B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8031C3B8 83 C1 00 08 */ lwz r30, 8(r1) -/* 8031C3BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031C3C0 7C 08 03 A6 */ mtlr r0 -/* 8031C3C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031C3C8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock2Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock2Fv.s deleted file mode 100644 index c697fe9893c..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock2Fv.s +++ /dev/null @@ -1,87 +0,0 @@ -lbl_8031C558: -/* 8031C558 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031C55C 7C 08 02 A6 */ mflr r0 -/* 8031C560 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031C564 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031C568 48 04 5C 71 */ bl _savegpr_28 -/* 8031C56C 7C 7E 1B 78 */ mr r30, r3 -/* 8031C570 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031C574 80 64 00 00 */ lwz r3, 0(r4) -/* 8031C578 80 1E 00 04 */ lwz r0, 4(r30) -/* 8031C57C 7C 03 02 14 */ add r0, r3, r0 -/* 8031C580 90 04 00 08 */ stw r0, 8(r4) -/* 8031C584 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C588 83 E3 00 08 */ lwz r31, 8(r3) -/* 8031C58C 3B 80 00 00 */ li r28, 0 -/* 8031C590 3B A0 00 00 */ li r29, 0 -lbl_8031C594: -/* 8031C594 38 9D 00 08 */ addi r4, r29, 8 -/* 8031C598 7C 9E 22 14 */ add r4, r30, r4 -/* 8031C59C A0 04 00 00 */ lhz r0, 0(r4) -/* 8031C5A0 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031C5A4 41 82 00 0C */ beq lbl_8031C5B0 -/* 8031C5A8 7F 83 E3 78 */ mr r3, r28 -/* 8031C5AC 48 00 79 E9 */ bl loadTexNo__FUlRCUs -lbl_8031C5B0: -/* 8031C5B0 3B 9C 00 01 */ addi r28, r28, 1 -/* 8031C5B4 28 1C 00 02 */ cmplwi r28, 2 -/* 8031C5B8 3B BD 00 02 */ addi r29, r29, 2 -/* 8031C5BC 41 80 FF D8 */ blt lbl_8031C594 -/* 8031C5C0 38 60 00 00 */ li r3, 0 -/* 8031C5C4 88 9E 00 0C */ lbz r4, 0xc(r30) -/* 8031C5C8 88 BE 00 0D */ lbz r5, 0xd(r30) -/* 8031C5CC 88 DE 00 0E */ lbz r6, 0xe(r30) -/* 8031C5D0 88 FE 00 10 */ lbz r7, 0x10(r30) -/* 8031C5D4 89 1E 00 11 */ lbz r8, 0x11(r30) -/* 8031C5D8 89 3E 00 12 */ lbz r9, 0x12(r30) -/* 8031C5DC 4B FF 2B 2D */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID -/* 8031C5E0 88 1E 00 0D */ lbz r0, 0xd(r30) -/* 8031C5E4 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031C5E8 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ -/* 8031C5EC 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ -/* 8031C5F0 7D 00 22 14 */ add r8, r0, r4 -/* 8031C5F4 88 7E 00 0C */ lbz r3, 0xc(r30) -/* 8031C5F8 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031C5FC A0 08 00 04 */ lhz r0, 4(r8) -/* 8031C600 20 00 00 01 */ subfic r0, r0, 1 -/* 8031C604 7C 00 00 34 */ cntlzw r0, r0 -/* 8031C608 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031C60C 38 C0 00 00 */ li r6, 0 -/* 8031C610 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031C614 A0 08 00 06 */ lhz r0, 6(r8) -/* 8031C618 20 00 00 01 */ subfic r0, r0, 1 -/* 8031C61C 7C 00 00 34 */ cntlzw r0, r0 -/* 8031C620 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031C624 39 20 00 00 */ li r9, 0 -/* 8031C628 4B FF 1C 0D */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031C62C 88 1E 00 11 */ lbz r0, 0x11(r30) -/* 8031C630 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031C634 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ -/* 8031C638 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ -/* 8031C63C 7D 00 22 14 */ add r8, r0, r4 -/* 8031C640 88 1E 00 10 */ lbz r0, 0x10(r30) -/* 8031C644 54 03 07 7E */ clrlwi r3, r0, 0x1d -/* 8031C648 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031C64C A0 08 00 04 */ lhz r0, 4(r8) -/* 8031C650 20 00 00 01 */ subfic r0, r0, 1 -/* 8031C654 7C 00 00 34 */ cntlzw r0, r0 -/* 8031C658 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031C65C 38 C0 00 00 */ li r6, 0 -/* 8031C660 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031C664 A0 08 00 06 */ lhz r0, 6(r8) -/* 8031C668 20 00 00 01 */ subfic r0, r0, 1 -/* 8031C66C 7C 00 00 34 */ cntlzw r0, r0 -/* 8031C670 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031C674 39 20 00 00 */ li r9, 0 -/* 8031C678 4B FF 1B BD */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031C67C 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C680 80 03 00 08 */ lwz r0, 8(r3) -/* 8031C684 7F E3 FB 78 */ mr r3, r31 -/* 8031C688 7C 9F 00 50 */ subf r4, r31, r0 -/* 8031C68C 48 01 EF 51 */ bl DCStoreRange -/* 8031C690 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031C694 48 04 5B 91 */ bl _restgpr_28 -/* 8031C698 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031C69C 7C 08 03 A6 */ mtlr r0 -/* 8031C6A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031C6A4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock4Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock4Fv.s deleted file mode 100644 index 686e65db4e2..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock4Fv.s +++ /dev/null @@ -1,100 +0,0 @@ -lbl_8031C854: -/* 8031C854 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8031C858 7C 08 02 A6 */ mflr r0 -/* 8031C85C 90 01 00 34 */ stw r0, 0x34(r1) -/* 8031C860 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031C864 48 04 59 65 */ bl _savegpr_24 -/* 8031C868 7C 7A 1B 78 */ mr r26, r3 -/* 8031C86C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031C870 80 64 00 00 */ lwz r3, 0(r4) -/* 8031C874 80 1A 00 04 */ lwz r0, 4(r26) -/* 8031C878 7C 03 02 14 */ add r0, r3, r0 -/* 8031C87C 90 04 00 08 */ stw r0, 8(r4) -/* 8031C880 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C884 83 C3 00 08 */ lwz r30, 8(r3) -/* 8031C888 8B 9A 00 20 */ lbz r28, 0x20(r26) -/* 8031C88C 3B 00 00 00 */ li r24, 0 -/* 8031C890 3B 20 00 00 */ li r25, 0 -lbl_8031C894: -/* 8031C894 38 99 00 08 */ addi r4, r25, 8 -/* 8031C898 7C 9A 22 14 */ add r4, r26, r4 -/* 8031C89C A0 04 00 00 */ lhz r0, 0(r4) -/* 8031C8A0 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031C8A4 41 82 00 0C */ beq lbl_8031C8B0 -/* 8031C8A8 7F 03 C3 78 */ mr r3, r24 -/* 8031C8AC 48 00 76 E9 */ bl loadTexNo__FUlRCUs -lbl_8031C8B0: -/* 8031C8B0 3B 18 00 01 */ addi r24, r24, 1 -/* 8031C8B4 28 18 00 04 */ cmplwi r24, 4 -/* 8031C8B8 3B 39 00 02 */ addi r25, r25, 2 -/* 8031C8BC 41 80 FF D8 */ blt lbl_8031C894 -/* 8031C8C0 3B 60 00 00 */ li r27, 0 -/* 8031C8C4 3B 20 00 00 */ li r25, 0 -/* 8031C8C8 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ -/* 8031C8CC 3B E3 4C 2C */ addi r31, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ -/* 8031C8D0 48 00 00 CC */ b lbl_8031C99C -lbl_8031C8D4: -/* 8031C8D4 38 1B 00 01 */ addi r0, r27, 1 -/* 8031C8D8 54 00 10 3A */ slwi r0, r0, 2 -/* 8031C8DC 7F BA 02 14 */ add r29, r26, r0 -/* 8031C8E0 7F 1A CA 14 */ add r24, r26, r25 -/* 8031C8E4 7F 63 DB 78 */ mr r3, r27 -/* 8031C8E8 88 98 00 10 */ lbz r4, 0x10(r24) -/* 8031C8EC 88 B8 00 11 */ lbz r5, 0x11(r24) -/* 8031C8F0 88 D8 00 12 */ lbz r6, 0x12(r24) -/* 8031C8F4 88 FD 00 10 */ lbz r7, 0x10(r29) -/* 8031C8F8 89 1D 00 11 */ lbz r8, 0x11(r29) -/* 8031C8FC 89 3D 00 12 */ lbz r9, 0x12(r29) -/* 8031C900 4B FF 28 09 */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID -/* 8031C904 88 18 00 11 */ lbz r0, 0x11(r24) -/* 8031C908 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c -/* 8031C90C 7D 1F 02 14 */ add r8, r31, r0 -/* 8031C910 88 18 00 10 */ lbz r0, 0x10(r24) -/* 8031C914 54 03 07 7E */ clrlwi r3, r0, 0x1d -/* 8031C918 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031C91C A0 08 00 04 */ lhz r0, 4(r8) -/* 8031C920 20 00 00 01 */ subfic r0, r0, 1 -/* 8031C924 7C 00 00 34 */ cntlzw r0, r0 -/* 8031C928 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031C92C 38 C0 00 00 */ li r6, 0 -/* 8031C930 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031C934 A0 08 00 06 */ lhz r0, 6(r8) -/* 8031C938 20 00 00 01 */ subfic r0, r0, 1 -/* 8031C93C 7C 00 00 34 */ cntlzw r0, r0 -/* 8031C940 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031C944 39 20 00 00 */ li r9, 0 -/* 8031C948 4B FF 18 ED */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031C94C 88 1D 00 11 */ lbz r0, 0x11(r29) -/* 8031C950 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c -/* 8031C954 7D 1F 02 14 */ add r8, r31, r0 -/* 8031C958 88 1D 00 10 */ lbz r0, 0x10(r29) -/* 8031C95C 54 03 07 7E */ clrlwi r3, r0, 0x1d -/* 8031C960 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031C964 A0 08 00 04 */ lhz r0, 4(r8) -/* 8031C968 20 00 00 01 */ subfic r0, r0, 1 -/* 8031C96C 7C 00 00 34 */ cntlzw r0, r0 -/* 8031C970 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031C974 38 C0 00 00 */ li r6, 0 -/* 8031C978 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031C97C A0 08 00 06 */ lhz r0, 6(r8) -/* 8031C980 20 00 00 01 */ subfic r0, r0, 1 -/* 8031C984 7C 00 00 34 */ cntlzw r0, r0 -/* 8031C988 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031C98C 39 20 00 00 */ li r9, 0 -/* 8031C990 4B FF 18 A5 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031C994 3B 7B 00 02 */ addi r27, r27, 2 -/* 8031C998 3B 39 00 08 */ addi r25, r25, 8 -lbl_8031C99C: -/* 8031C99C 7C 1B E0 40 */ cmplw r27, r28 -/* 8031C9A0 41 80 FF 34 */ blt lbl_8031C8D4 -/* 8031C9A4 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C9A8 80 03 00 08 */ lwz r0, 8(r3) -/* 8031C9AC 7F C3 F3 78 */ mr r3, r30 -/* 8031C9B0 7C 9E 00 50 */ subf r4, r30, r0 -/* 8031C9B4 48 01 EC 29 */ bl DCStoreRange -/* 8031C9B8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031C9BC 48 04 58 59 */ bl _restgpr_24 -/* 8031C9C0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8031C9C4 7C 08 03 A6 */ mtlr r0 -/* 8031C9C8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031C9CC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__13J3DTevBlock16Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__13J3DTevBlock16Fv.s deleted file mode 100644 index f1245fed147..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__13J3DTevBlock16Fv.s +++ /dev/null @@ -1,100 +0,0 @@ -lbl_8031CB7C: -/* 8031CB7C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8031CB80 7C 08 02 A6 */ mflr r0 -/* 8031CB84 90 01 00 34 */ stw r0, 0x34(r1) -/* 8031CB88 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031CB8C 48 04 56 3D */ bl _savegpr_24 -/* 8031CB90 7C 7A 1B 78 */ mr r26, r3 -/* 8031CB94 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031CB98 80 64 00 00 */ lwz r3, 0(r4) -/* 8031CB9C 80 1A 00 04 */ lwz r0, 4(r26) -/* 8031CBA0 7C 03 02 14 */ add r0, r3, r0 -/* 8031CBA4 90 04 00 08 */ stw r0, 8(r4) -/* 8031CBA8 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031CBAC 83 C3 00 08 */ lwz r30, 8(r3) -/* 8031CBB0 8B 9A 00 58 */ lbz r28, 0x58(r26) -/* 8031CBB4 3B 00 00 00 */ li r24, 0 -/* 8031CBB8 3B 20 00 00 */ li r25, 0 -lbl_8031CBBC: -/* 8031CBBC 38 99 00 08 */ addi r4, r25, 8 -/* 8031CBC0 7C 9A 22 14 */ add r4, r26, r4 -/* 8031CBC4 A0 04 00 00 */ lhz r0, 0(r4) -/* 8031CBC8 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031CBCC 41 82 00 0C */ beq lbl_8031CBD8 -/* 8031CBD0 7F 03 C3 78 */ mr r3, r24 -/* 8031CBD4 48 00 73 C1 */ bl loadTexNo__FUlRCUs -lbl_8031CBD8: -/* 8031CBD8 3B 18 00 01 */ addi r24, r24, 1 -/* 8031CBDC 28 18 00 08 */ cmplwi r24, 8 -/* 8031CBE0 3B 39 00 02 */ addi r25, r25, 2 -/* 8031CBE4 41 80 FF D8 */ blt lbl_8031CBBC -/* 8031CBE8 3B 60 00 00 */ li r27, 0 -/* 8031CBEC 3B 20 00 00 */ li r25, 0 -/* 8031CBF0 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ -/* 8031CBF4 3B E3 4C 2C */ addi r31, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ -/* 8031CBF8 48 00 00 CC */ b lbl_8031CCC4 -lbl_8031CBFC: -/* 8031CBFC 38 1B 00 01 */ addi r0, r27, 1 -/* 8031CC00 54 00 10 3A */ slwi r0, r0, 2 -/* 8031CC04 7F BA 02 14 */ add r29, r26, r0 -/* 8031CC08 7F 1A CA 14 */ add r24, r26, r25 -/* 8031CC0C 7F 63 DB 78 */ mr r3, r27 -/* 8031CC10 88 98 00 18 */ lbz r4, 0x18(r24) -/* 8031CC14 88 B8 00 19 */ lbz r5, 0x19(r24) -/* 8031CC18 88 D8 00 1A */ lbz r6, 0x1a(r24) -/* 8031CC1C 88 FD 00 18 */ lbz r7, 0x18(r29) -/* 8031CC20 89 1D 00 19 */ lbz r8, 0x19(r29) -/* 8031CC24 89 3D 00 1A */ lbz r9, 0x1a(r29) -/* 8031CC28 4B FF 24 E1 */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID -/* 8031CC2C 88 18 00 19 */ lbz r0, 0x19(r24) -/* 8031CC30 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c -/* 8031CC34 7D 1F 02 14 */ add r8, r31, r0 -/* 8031CC38 88 18 00 18 */ lbz r0, 0x18(r24) -/* 8031CC3C 54 03 07 7E */ clrlwi r3, r0, 0x1d -/* 8031CC40 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031CC44 A0 08 00 04 */ lhz r0, 4(r8) -/* 8031CC48 20 00 00 01 */ subfic r0, r0, 1 -/* 8031CC4C 7C 00 00 34 */ cntlzw r0, r0 -/* 8031CC50 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031CC54 38 C0 00 00 */ li r6, 0 -/* 8031CC58 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031CC5C A0 08 00 06 */ lhz r0, 6(r8) -/* 8031CC60 20 00 00 01 */ subfic r0, r0, 1 -/* 8031CC64 7C 00 00 34 */ cntlzw r0, r0 -/* 8031CC68 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031CC6C 39 20 00 00 */ li r9, 0 -/* 8031CC70 4B FF 15 C5 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031CC74 88 1D 00 19 */ lbz r0, 0x19(r29) -/* 8031CC78 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c -/* 8031CC7C 7D 1F 02 14 */ add r8, r31, r0 -/* 8031CC80 88 1D 00 18 */ lbz r0, 0x18(r29) -/* 8031CC84 54 03 07 7E */ clrlwi r3, r0, 0x1d -/* 8031CC88 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031CC8C A0 08 00 04 */ lhz r0, 4(r8) -/* 8031CC90 20 00 00 01 */ subfic r0, r0, 1 -/* 8031CC94 7C 00 00 34 */ cntlzw r0, r0 -/* 8031CC98 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031CC9C 38 C0 00 00 */ li r6, 0 -/* 8031CCA0 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031CCA4 A0 08 00 06 */ lhz r0, 6(r8) -/* 8031CCA8 20 00 00 01 */ subfic r0, r0, 1 -/* 8031CCAC 7C 00 00 34 */ cntlzw r0, r0 -/* 8031CCB0 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031CCB4 39 20 00 00 */ li r9, 0 -/* 8031CCB8 4B FF 15 7D */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031CCBC 3B 7B 00 02 */ addi r27, r27, 2 -/* 8031CCC0 3B 39 00 08 */ addi r25, r25, 8 -lbl_8031CCC4: -/* 8031CCC4 7C 1B E0 40 */ cmplw r27, r28 -/* 8031CCC8 41 80 FF 34 */ blt lbl_8031CBFC -/* 8031CCCC 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031CCD0 80 03 00 08 */ lwz r0, 8(r3) -/* 8031CCD4 7F C3 F3 78 */ mr r3, r30 -/* 8031CCD8 7C 9E 00 50 */ subf r4, r30, r0 -/* 8031CCDC 48 01 E9 01 */ bl DCStoreRange -/* 8031CCE0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031CCE4 48 04 55 31 */ bl _restgpr_24 -/* 8031CCE8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8031CCEC 7C 08 03 A6 */ mtlr r0 -/* 8031CCF0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031CCF4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__18J3DTevBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__18J3DTevBlockPatchedFv.s deleted file mode 100644 index ea7a07bb005..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__18J3DTevBlockPatchedFv.s +++ /dev/null @@ -1,100 +0,0 @@ -lbl_8031C0AC: -/* 8031C0AC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8031C0B0 7C 08 02 A6 */ mflr r0 -/* 8031C0B4 90 01 00 34 */ stw r0, 0x34(r1) -/* 8031C0B8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031C0BC 48 04 61 0D */ bl _savegpr_24 -/* 8031C0C0 7C 7A 1B 78 */ mr r26, r3 -/* 8031C0C4 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031C0C8 80 64 00 00 */ lwz r3, 0(r4) -/* 8031C0CC 80 1A 00 04 */ lwz r0, 4(r26) -/* 8031C0D0 7C 03 02 14 */ add r0, r3, r0 -/* 8031C0D4 90 04 00 08 */ stw r0, 8(r4) -/* 8031C0D8 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C0DC 83 C3 00 08 */ lwz r30, 8(r3) -/* 8031C0E0 8B 9A 00 D0 */ lbz r28, 0xd0(r26) -/* 8031C0E4 3B 00 00 00 */ li r24, 0 -/* 8031C0E8 3B 20 00 00 */ li r25, 0 -lbl_8031C0EC: -/* 8031C0EC 38 99 00 08 */ addi r4, r25, 8 -/* 8031C0F0 7C 9A 22 14 */ add r4, r26, r4 -/* 8031C0F4 A0 04 00 00 */ lhz r0, 0(r4) -/* 8031C0F8 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031C0FC 41 82 00 0C */ beq lbl_8031C108 -/* 8031C100 7F 03 C3 78 */ mr r3, r24 -/* 8031C104 48 00 7E 91 */ bl loadTexNo__FUlRCUs -lbl_8031C108: -/* 8031C108 3B 18 00 01 */ addi r24, r24, 1 -/* 8031C10C 28 18 00 08 */ cmplwi r24, 8 -/* 8031C110 3B 39 00 02 */ addi r25, r25, 2 -/* 8031C114 41 80 FF D8 */ blt lbl_8031C0EC -/* 8031C118 3B 60 00 00 */ li r27, 0 -/* 8031C11C 3B 20 00 00 */ li r25, 0 -/* 8031C120 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ -/* 8031C124 3B E3 4C 2C */ addi r31, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ -/* 8031C128 48 00 00 CC */ b lbl_8031C1F4 -lbl_8031C12C: -/* 8031C12C 38 1B 00 01 */ addi r0, r27, 1 -/* 8031C130 54 00 10 3A */ slwi r0, r0, 2 -/* 8031C134 7F BA 02 14 */ add r29, r26, r0 -/* 8031C138 7F 1A CA 14 */ add r24, r26, r25 -/* 8031C13C 7F 63 DB 78 */ mr r3, r27 -/* 8031C140 88 98 00 18 */ lbz r4, 0x18(r24) -/* 8031C144 88 B8 00 19 */ lbz r5, 0x19(r24) -/* 8031C148 88 D8 00 1A */ lbz r6, 0x1a(r24) -/* 8031C14C 88 FD 00 18 */ lbz r7, 0x18(r29) -/* 8031C150 89 1D 00 19 */ lbz r8, 0x19(r29) -/* 8031C154 89 3D 00 1A */ lbz r9, 0x1a(r29) -/* 8031C158 4B FF 2F B1 */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID -/* 8031C15C 88 18 00 19 */ lbz r0, 0x19(r24) -/* 8031C160 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c -/* 8031C164 7D 1F 02 14 */ add r8, r31, r0 -/* 8031C168 88 18 00 18 */ lbz r0, 0x18(r24) -/* 8031C16C 54 03 07 7E */ clrlwi r3, r0, 0x1d -/* 8031C170 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031C174 A0 08 00 04 */ lhz r0, 4(r8) -/* 8031C178 20 00 00 01 */ subfic r0, r0, 1 -/* 8031C17C 7C 00 00 34 */ cntlzw r0, r0 -/* 8031C180 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031C184 38 C0 00 00 */ li r6, 0 -/* 8031C188 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031C18C A0 08 00 06 */ lhz r0, 6(r8) -/* 8031C190 20 00 00 01 */ subfic r0, r0, 1 -/* 8031C194 7C 00 00 34 */ cntlzw r0, r0 -/* 8031C198 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031C19C 39 20 00 00 */ li r9, 0 -/* 8031C1A0 4B FF 20 95 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031C1A4 88 1D 00 19 */ lbz r0, 0x19(r29) -/* 8031C1A8 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c -/* 8031C1AC 7D 1F 02 14 */ add r8, r31, r0 -/* 8031C1B0 88 1D 00 18 */ lbz r0, 0x18(r29) -/* 8031C1B4 54 03 07 7E */ clrlwi r3, r0, 0x1d -/* 8031C1B8 A0 88 00 00 */ lhz r4, 0(r8) -/* 8031C1BC A0 08 00 04 */ lhz r0, 4(r8) -/* 8031C1C0 20 00 00 01 */ subfic r0, r0, 1 -/* 8031C1C4 7C 00 00 34 */ cntlzw r0, r0 -/* 8031C1C8 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 8031C1CC 38 C0 00 00 */ li r6, 0 -/* 8031C1D0 A0 E8 00 02 */ lhz r7, 2(r8) -/* 8031C1D4 A0 08 00 06 */ lhz r0, 6(r8) -/* 8031C1D8 20 00 00 01 */ subfic r0, r0, 1 -/* 8031C1DC 7C 00 00 34 */ cntlzw r0, r0 -/* 8031C1E0 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8031C1E4 39 20 00 00 */ li r9, 0 -/* 8031C1E8 4B FF 20 4D */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc -/* 8031C1EC 3B 7B 00 02 */ addi r27, r27, 2 -/* 8031C1F0 3B 39 00 08 */ addi r25, r25, 8 -lbl_8031C1F4: -/* 8031C1F4 7C 1B E0 40 */ cmplw r27, r28 -/* 8031C1F8 41 80 FF 34 */ blt lbl_8031C12C -/* 8031C1FC 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C200 80 03 00 08 */ lwz r0, 8(r3) -/* 8031C204 7F C3 F3 78 */ mr r3, r30 -/* 8031C208 7C 9E 00 50 */ subf r4, r30, r0 -/* 8031C20C 48 01 F3 D1 */ bl DCStoreRange -/* 8031C210 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031C214 48 04 60 01 */ bl _restgpr_24 -/* 8031C218 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8031C21C 7C 08 03 A6 */ mtlr r0 -/* 8031C220 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031C224 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__12J3DTevBlock1Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__12J3DTevBlock1Fv.s deleted file mode 100644 index 7804abd0423..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__12J3DTevBlock1Fv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8031C274: -/* 8031C274 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031C278 7C 08 02 A6 */ mflr r0 -/* 8031C27C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031C280 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8031C284 7C 65 1B 78 */ mr r5, r3 -/* 8031C288 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031C28C 80 64 00 00 */ lwz r3, 0(r4) -/* 8031C290 80 05 00 04 */ lwz r0, 4(r5) -/* 8031C294 7C 03 02 14 */ add r0, r3, r0 -/* 8031C298 90 04 00 08 */ stw r0, 8(r4) -/* 8031C29C 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C2A0 83 E3 00 08 */ lwz r31, 8(r3) -/* 8031C2A4 A0 05 00 08 */ lhz r0, 8(r5) -/* 8031C2A8 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031C2AC 41 82 00 10 */ beq lbl_8031C2BC -/* 8031C2B0 38 60 00 00 */ li r3, 0 -/* 8031C2B4 38 85 00 08 */ addi r4, r5, 8 -/* 8031C2B8 48 00 7C DD */ bl loadTexNo__FUlRCUs -lbl_8031C2BC: -/* 8031C2BC 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C2C0 80 03 00 08 */ lwz r0, 8(r3) -/* 8031C2C4 7F E3 FB 78 */ mr r3, r31 -/* 8031C2C8 7C 9F 00 50 */ subf r4, r31, r0 -/* 8031C2CC 48 01 F3 11 */ bl DCStoreRange -/* 8031C2D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8031C2D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031C2D8 7C 08 03 A6 */ mtlr r0 -/* 8031C2DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031C2E0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__12J3DTevBlock2Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__12J3DTevBlock2Fv.s deleted file mode 100644 index 283238ebbe7..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__12J3DTevBlock2Fv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8031C3F8: -/* 8031C3F8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031C3FC 7C 08 02 A6 */ mflr r0 -/* 8031C400 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031C404 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031C408 48 04 5D D1 */ bl _savegpr_28 -/* 8031C40C 7C 7C 1B 78 */ mr r28, r3 -/* 8031C410 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031C414 80 64 00 00 */ lwz r3, 0(r4) -/* 8031C418 80 1C 00 04 */ lwz r0, 4(r28) -/* 8031C41C 7C 03 02 14 */ add r0, r3, r0 -/* 8031C420 90 04 00 08 */ stw r0, 8(r4) -/* 8031C424 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C428 83 C3 00 08 */ lwz r30, 8(r3) -/* 8031C42C 3B A0 00 00 */ li r29, 0 -/* 8031C430 3B E0 00 00 */ li r31, 0 -lbl_8031C434: -/* 8031C434 38 9F 00 08 */ addi r4, r31, 8 -/* 8031C438 7C 9C 22 14 */ add r4, r28, r4 -/* 8031C43C A0 04 00 00 */ lhz r0, 0(r4) -/* 8031C440 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031C444 41 82 00 0C */ beq lbl_8031C450 -/* 8031C448 7F A3 EB 78 */ mr r3, r29 -/* 8031C44C 48 00 7B 49 */ bl loadTexNo__FUlRCUs -lbl_8031C450: -/* 8031C450 3B BD 00 01 */ addi r29, r29, 1 -/* 8031C454 28 1D 00 02 */ cmplwi r29, 2 -/* 8031C458 3B FF 00 02 */ addi r31, r31, 2 -/* 8031C45C 41 80 FF D8 */ blt lbl_8031C434 -/* 8031C460 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C464 80 03 00 08 */ lwz r0, 8(r3) -/* 8031C468 7F C3 F3 78 */ mr r3, r30 -/* 8031C46C 7C 9E 00 50 */ subf r4, r30, r0 -/* 8031C470 48 01 F1 6D */ bl DCStoreRange -/* 8031C474 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031C478 48 04 5D AD */ bl _restgpr_28 -/* 8031C47C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031C480 7C 08 03 A6 */ mtlr r0 -/* 8031C484 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031C488 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__12J3DTevBlock4Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__12J3DTevBlock4Fv.s deleted file mode 100644 index 7c9e81a7a4e..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__12J3DTevBlock4Fv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8031C6F4: -/* 8031C6F4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031C6F8 7C 08 02 A6 */ mflr r0 -/* 8031C6FC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031C700 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031C704 48 04 5A D5 */ bl _savegpr_28 -/* 8031C708 7C 7C 1B 78 */ mr r28, r3 -/* 8031C70C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031C710 80 64 00 00 */ lwz r3, 0(r4) -/* 8031C714 80 1C 00 04 */ lwz r0, 4(r28) -/* 8031C718 7C 03 02 14 */ add r0, r3, r0 -/* 8031C71C 90 04 00 08 */ stw r0, 8(r4) -/* 8031C720 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C724 83 C3 00 08 */ lwz r30, 8(r3) -/* 8031C728 3B A0 00 00 */ li r29, 0 -/* 8031C72C 3B E0 00 00 */ li r31, 0 -lbl_8031C730: -/* 8031C730 38 9F 00 08 */ addi r4, r31, 8 -/* 8031C734 7C 9C 22 14 */ add r4, r28, r4 -/* 8031C738 A0 04 00 00 */ lhz r0, 0(r4) -/* 8031C73C 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031C740 41 82 00 0C */ beq lbl_8031C74C -/* 8031C744 7F A3 EB 78 */ mr r3, r29 -/* 8031C748 48 00 78 4D */ bl loadTexNo__FUlRCUs -lbl_8031C74C: -/* 8031C74C 3B BD 00 01 */ addi r29, r29, 1 -/* 8031C750 28 1D 00 04 */ cmplwi r29, 4 -/* 8031C754 3B FF 00 02 */ addi r31, r31, 2 -/* 8031C758 41 80 FF D8 */ blt lbl_8031C730 -/* 8031C75C 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031C760 80 03 00 08 */ lwz r0, 8(r3) -/* 8031C764 7F C3 F3 78 */ mr r3, r30 -/* 8031C768 7C 9E 00 50 */ subf r4, r30, r0 -/* 8031C76C 48 01 EE 71 */ bl DCStoreRange -/* 8031C770 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031C774 48 04 5A B1 */ bl _restgpr_28 -/* 8031C778 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031C77C 7C 08 03 A6 */ mtlr r0 -/* 8031C780 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031C784 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__13J3DTevBlock16Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__13J3DTevBlock16Fv.s deleted file mode 100644 index 3c289df8aaa..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__13J3DTevBlock16Fv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8031CA1C: -/* 8031CA1C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031CA20 7C 08 02 A6 */ mflr r0 -/* 8031CA24 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031CA28 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031CA2C 48 04 57 AD */ bl _savegpr_28 -/* 8031CA30 7C 7C 1B 78 */ mr r28, r3 -/* 8031CA34 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031CA38 80 64 00 00 */ lwz r3, 0(r4) -/* 8031CA3C 80 1C 00 04 */ lwz r0, 4(r28) -/* 8031CA40 7C 03 02 14 */ add r0, r3, r0 -/* 8031CA44 90 04 00 08 */ stw r0, 8(r4) -/* 8031CA48 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031CA4C 83 C3 00 08 */ lwz r30, 8(r3) -/* 8031CA50 3B A0 00 00 */ li r29, 0 -/* 8031CA54 3B E0 00 00 */ li r31, 0 -lbl_8031CA58: -/* 8031CA58 38 9F 00 08 */ addi r4, r31, 8 -/* 8031CA5C 7C 9C 22 14 */ add r4, r28, r4 -/* 8031CA60 A0 04 00 00 */ lhz r0, 0(r4) -/* 8031CA64 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031CA68 41 82 00 0C */ beq lbl_8031CA74 -/* 8031CA6C 7F A3 EB 78 */ mr r3, r29 -/* 8031CA70 48 00 75 25 */ bl loadTexNo__FUlRCUs -lbl_8031CA74: -/* 8031CA74 3B BD 00 01 */ addi r29, r29, 1 -/* 8031CA78 28 1D 00 08 */ cmplwi r29, 8 -/* 8031CA7C 3B FF 00 02 */ addi r31, r31, 2 -/* 8031CA80 41 80 FF D8 */ blt lbl_8031CA58 -/* 8031CA84 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031CA88 80 03 00 08 */ lwz r0, 8(r3) -/* 8031CA8C 7F C3 F3 78 */ mr r3, r30 -/* 8031CA90 7C 9E 00 50 */ subf r4, r30, r0 -/* 8031CA94 48 01 EB 49 */ bl DCStoreRange -/* 8031CA98 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031CA9C 48 04 57 89 */ bl _restgpr_28 -/* 8031CAA0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031CAA4 7C 08 03 A6 */ mtlr r0 -/* 8031CAA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031CAAC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__18J3DTevBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__18J3DTevBlockPatchedFv.s deleted file mode 100644 index 7e369de5e0f..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__18J3DTevBlockPatchedFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8031BF4C: -/* 8031BF4C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031BF50 7C 08 02 A6 */ mflr r0 -/* 8031BF54 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031BF58 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031BF5C 48 04 62 7D */ bl _savegpr_28 -/* 8031BF60 7C 7C 1B 78 */ mr r28, r3 -/* 8031BF64 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031BF68 80 64 00 00 */ lwz r3, 0(r4) -/* 8031BF6C 80 1C 00 04 */ lwz r0, 4(r28) -/* 8031BF70 7C 03 02 14 */ add r0, r3, r0 -/* 8031BF74 90 04 00 08 */ stw r0, 8(r4) -/* 8031BF78 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031BF7C 83 C3 00 08 */ lwz r30, 8(r3) -/* 8031BF80 3B A0 00 00 */ li r29, 0 -/* 8031BF84 3B E0 00 00 */ li r31, 0 -lbl_8031BF88: -/* 8031BF88 38 9F 00 08 */ addi r4, r31, 8 -/* 8031BF8C 7C 9C 22 14 */ add r4, r28, r4 -/* 8031BF90 A0 04 00 00 */ lhz r0, 0(r4) -/* 8031BF94 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031BF98 41 82 00 0C */ beq lbl_8031BFA4 -/* 8031BF9C 7F A3 EB 78 */ mr r3, r29 -/* 8031BFA0 48 00 7F F5 */ bl loadTexNo__FUlRCUs -lbl_8031BFA4: -/* 8031BFA4 3B BD 00 01 */ addi r29, r29, 1 -/* 8031BFA8 28 1D 00 08 */ cmplwi r29, 8 -/* 8031BFAC 3B FF 00 02 */ addi r31, r31, 2 -/* 8031BFB0 41 80 FF D8 */ blt lbl_8031BF88 -/* 8031BFB4 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031BFB8 80 03 00 08 */ lwz r0, 8(r3) -/* 8031BFBC 7F C3 F3 78 */ mr r3, r30 -/* 8031BFC0 7C 9E 00 50 */ subf r4, r30, r0 -/* 8031BFC4 48 01 F6 19 */ bl DCStoreRange -/* 8031BFC8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031BFCC 48 04 62 59 */ bl _restgpr_28 -/* 8031BFD0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031BFD4 7C 08 03 A6 */ mtlr r0 -/* 8031BFD8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031BFDC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__12J3DTevBlock1Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__12J3DTevBlock1Fv.s deleted file mode 100644 index 011110650a9..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__12J3DTevBlock1Fv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8031C3CC: -/* 8031C3CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031C3D0 7C 08 02 A6 */ mflr r0 -/* 8031C3D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031C3D8 81 83 00 00 */ lwz r12, 0(r3) -/* 8031C3DC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8031C3E0 7D 89 03 A6 */ mtctr r12 -/* 8031C3E4 4E 80 04 21 */ bctrl -/* 8031C3E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031C3EC 7C 08 03 A6 */ mtlr r0 -/* 8031C3F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031C3F4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__12J3DTevBlock2Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__12J3DTevBlock2Fv.s deleted file mode 100644 index c2cbb392773..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__12J3DTevBlock2Fv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8031C6A8: -/* 8031C6A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031C6AC 7C 08 02 A6 */ mflr r0 -/* 8031C6B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031C6B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8031C6B8 7C 7F 1B 78 */ mr r31, r3 -/* 8031C6BC 81 83 00 00 */ lwz r12, 0(r3) -/* 8031C6C0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8031C6C4 7D 89 03 A6 */ mtctr r12 -/* 8031C6C8 4E 80 04 21 */ bctrl -/* 8031C6CC 7F E3 FB 78 */ mr r3, r31 -/* 8031C6D0 81 9F 00 00 */ lwz r12, 0(r31) -/* 8031C6D4 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 8031C6D8 7D 89 03 A6 */ mtctr r12 -/* 8031C6DC 4E 80 04 21 */ bctrl -/* 8031C6E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8031C6E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031C6E8 7C 08 03 A6 */ mtlr r0 -/* 8031C6EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031C6F0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__12J3DTevBlock4Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__12J3DTevBlock4Fv.s deleted file mode 100644 index 9bfe18b62db..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__12J3DTevBlock4Fv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8031C9D0: -/* 8031C9D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031C9D4 7C 08 02 A6 */ mflr r0 -/* 8031C9D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031C9DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8031C9E0 7C 7F 1B 78 */ mr r31, r3 -/* 8031C9E4 81 83 00 00 */ lwz r12, 0(r3) -/* 8031C9E8 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8031C9EC 7D 89 03 A6 */ mtctr r12 -/* 8031C9F0 4E 80 04 21 */ bctrl -/* 8031C9F4 7F E3 FB 78 */ mr r3, r31 -/* 8031C9F8 81 9F 00 00 */ lwz r12, 0(r31) -/* 8031C9FC 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 8031CA00 7D 89 03 A6 */ mtctr r12 -/* 8031CA04 4E 80 04 21 */ bctrl -/* 8031CA08 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8031CA0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031CA10 7C 08 03 A6 */ mtlr r0 -/* 8031CA14 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031CA18 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__13J3DTevBlock16Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__13J3DTevBlock16Fv.s deleted file mode 100644 index a511baeae6a..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__13J3DTevBlock16Fv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8031CCF8: -/* 8031CCF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031CCFC 7C 08 02 A6 */ mflr r0 -/* 8031CD00 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031CD04 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8031CD08 7C 7F 1B 78 */ mr r31, r3 -/* 8031CD0C 81 83 00 00 */ lwz r12, 0(r3) -/* 8031CD10 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8031CD14 7D 89 03 A6 */ mtctr r12 -/* 8031CD18 4E 80 04 21 */ bctrl -/* 8031CD1C 7F E3 FB 78 */ mr r3, r31 -/* 8031CD20 81 9F 00 00 */ lwz r12, 0(r31) -/* 8031CD24 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 8031CD28 7D 89 03 A6 */ mtctr r12 -/* 8031CD2C 4E 80 04 21 */ bctrl -/* 8031CD30 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8031CD34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031CD38 7C 08 03 A6 */ mtlr r0 -/* 8031CD3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031CD40 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__14J3DPEBlockFullFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__14J3DPEBlockFullFv.s deleted file mode 100644 index 6a30c295709..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__14J3DPEBlockFullFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_8031F890: -/* 8031F890 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031F894 7C 08 02 A6 */ mflr r0 -/* 8031F898 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031F89C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8031F8A0 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8031F8A4 7C 7E 1B 78 */ mr r30, r3 -/* 8031F8A8 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F8AC 80 64 00 00 */ lwz r3, 0(r4) -/* 8031F8B0 80 1E 00 3C */ lwz r0, 0x3c(r30) -/* 8031F8B4 7C 03 02 14 */ add r0, r3, r0 -/* 8031F8B8 90 04 00 08 */ stw r0, 8(r4) -/* 8031F8BC 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031F8C0 80 64 00 08 */ lwz r3, 8(r4) -/* 8031F8C4 38 63 00 37 */ addi r3, r3, 0x37 -/* 8031F8C8 80 04 00 0C */ lwz r0, 0xc(r4) -/* 8031F8CC 7C 03 00 40 */ cmplw r3, r0 -/* 8031F8D0 40 81 00 08 */ ble lbl_8031F8D8 -/* 8031F8D4 48 04 18 01 */ bl GDOverflowed -lbl_8031F8D8: -/* 8031F8D8 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031F8DC 83 E3 00 08 */ lwz r31, 8(r3) -/* 8031F8E0 80 1E 00 18 */ lwz r0, 0x18(r30) -/* 8031F8E4 90 01 00 08 */ stw r0, 8(r1) -/* 8031F8E8 88 7E 00 04 */ lbz r3, 4(r30) -/* 8031F8EC C0 3E 00 08 */ lfs f1, 8(r30) -/* 8031F8F0 C0 5E 00 0C */ lfs f2, 0xc(r30) -/* 8031F8F4 C0 7E 00 10 */ lfs f3, 0x10(r30) -/* 8031F8F8 C0 9E 00 14 */ lfs f4, 0x14(r30) -/* 8031F8FC 38 81 00 08 */ addi r4, r1, 8 -/* 8031F900 4B FE FD 31 */ bl J3DGDSetFog__F10_GXFogTypeffff8_GXColor -/* 8031F904 88 7E 00 05 */ lbz r3, 5(r30) -/* 8031F908 A0 9E 00 06 */ lhz r4, 6(r30) -/* 8031F90C 38 BE 00 1C */ addi r5, r30, 0x1c -/* 8031F910 4B FF 00 85 */ bl J3DGDSetFogRangeAdj__FUcUsP14_GXFogAdjTable -/* 8031F914 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031F918 80 03 00 08 */ lwz r0, 8(r3) -/* 8031F91C 7F E3 FB 78 */ mr r3, r31 -/* 8031F920 7C 9F 00 50 */ subf r4, r31, r0 -/* 8031F924 48 01 BC B9 */ bl DCStoreRange -/* 8031F928 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8031F92C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8031F930 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031F934 7C 08 03 A6 */ mtlr r0 -/* 8031F938 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031F93C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__15J3DTexGenBlock4Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__15J3DTexGenBlock4Fv.s deleted file mode 100644 index 11c4b0f3614..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__15J3DTexGenBlock4Fv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8031AB18: -/* 8031AB18 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031AB1C 7C 08 02 A6 */ mflr r0 -/* 8031AB20 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031AB24 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031AB28 48 04 76 AD */ bl _savegpr_27 -/* 8031AB2C 7C 7B 1B 78 */ mr r27, r3 -/* 8031AB30 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031AB34 80 64 00 00 */ lwz r3, 0(r4) -/* 8031AB38 80 1B 00 58 */ lwz r0, 0x58(r27) -/* 8031AB3C 7C 03 02 14 */ add r0, r3, r0 -/* 8031AB40 90 04 00 08 */ stw r0, 8(r4) -/* 8031AB44 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031AB48 83 A3 00 08 */ lwz r29, 8(r3) -/* 8031AB4C 3B 80 00 00 */ li r28, 0 -/* 8031AB50 3B E0 00 00 */ li r31, 0 -/* 8031AB54 3B C0 00 00 */ li r30, 0 -lbl_8031AB58: -/* 8031AB58 38 1E 00 38 */ addi r0, r30, 0x38 -/* 8031AB5C 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 8031AB60 28 03 00 00 */ cmplwi r3, 0 -/* 8031AB64 41 82 00 1C */ beq lbl_8031AB80 -/* 8031AB68 38 1F 00 0A */ addi r0, r31, 0xa -/* 8031AB6C 7C 1B 00 AE */ lbzx r0, r27, r0 -/* 8031AB70 28 00 00 3C */ cmplwi r0, 0x3c -/* 8031AB74 41 82 00 0C */ beq lbl_8031AB80 -/* 8031AB78 7F 84 E3 78 */ mr r4, r28 -/* 8031AB7C 48 00 8D 49 */ bl load__9J3DTexMtxCFUl -lbl_8031AB80: -/* 8031AB80 3B 9C 00 01 */ addi r28, r28, 1 -/* 8031AB84 28 1C 00 04 */ cmplwi r28, 4 -/* 8031AB88 3B FF 00 06 */ addi r31, r31, 6 -/* 8031AB8C 3B DE 00 04 */ addi r30, r30, 4 -/* 8031AB90 41 80 FF C8 */ blt lbl_8031AB58 -/* 8031AB94 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031AB98 80 03 00 08 */ lwz r0, 8(r3) -/* 8031AB9C 7F A3 EB 78 */ mr r3, r29 -/* 8031ABA0 7C 9D 00 50 */ subf r4, r29, r0 -/* 8031ABA4 48 02 0A 39 */ bl DCStoreRange -/* 8031ABA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031ABAC 48 04 76 75 */ bl _restgpr_27 -/* 8031ABB0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031ABB4 7C 08 03 A6 */ mtlr r0 -/* 8031ABB8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031ABBC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__18J3DTevBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__18J3DTevBlockPatchedFv.s deleted file mode 100644 index 30930d6e49b..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__18J3DTevBlockPatchedFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8031C228: -/* 8031C228 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031C22C 7C 08 02 A6 */ mflr r0 -/* 8031C230 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031C234 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8031C238 7C 7F 1B 78 */ mr r31, r3 -/* 8031C23C 81 83 00 00 */ lwz r12, 0(r3) -/* 8031C240 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8031C244 7D 89 03 A6 */ mtctr r12 -/* 8031C248 4E 80 04 21 */ bctrl -/* 8031C24C 7F E3 FB 78 */ mr r3, r31 -/* 8031C250 81 9F 00 00 */ lwz r12, 0(r31) -/* 8031C254 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 8031C258 7D 89 03 A6 */ mtctr r12 -/* 8031C25C 4E 80 04 21 */ bctrl -/* 8031C260 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8031C264 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031C268 7C 08 03 A6 */ mtlr r0 -/* 8031C26C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031C270 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__19J3DTexGenBlockBasicFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__19J3DTexGenBlockBasicFv.s deleted file mode 100644 index b57d857c91e..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__19J3DTexGenBlockBasicFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8031ABC0: -/* 8031ABC0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031ABC4 7C 08 02 A6 */ mflr r0 -/* 8031ABC8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031ABCC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031ABD0 48 04 76 05 */ bl _savegpr_27 -/* 8031ABD4 7C 7B 1B 78 */ mr r27, r3 -/* 8031ABD8 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031ABDC 80 64 00 00 */ lwz r3, 0(r4) -/* 8031ABE0 80 1B 00 58 */ lwz r0, 0x58(r27) -/* 8031ABE4 7C 03 02 14 */ add r0, r3, r0 -/* 8031ABE8 90 04 00 08 */ stw r0, 8(r4) -/* 8031ABEC 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031ABF0 83 A3 00 08 */ lwz r29, 8(r3) -/* 8031ABF4 3B 80 00 00 */ li r28, 0 -/* 8031ABF8 3B E0 00 00 */ li r31, 0 -/* 8031ABFC 3B C0 00 00 */ li r30, 0 -lbl_8031AC00: -/* 8031AC00 38 1E 00 38 */ addi r0, r30, 0x38 -/* 8031AC04 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 8031AC08 28 03 00 00 */ cmplwi r3, 0 -/* 8031AC0C 41 82 00 1C */ beq lbl_8031AC28 -/* 8031AC10 38 1F 00 0A */ addi r0, r31, 0xa -/* 8031AC14 7C 1B 00 AE */ lbzx r0, r27, r0 -/* 8031AC18 28 00 00 3C */ cmplwi r0, 0x3c -/* 8031AC1C 41 82 00 0C */ beq lbl_8031AC28 -/* 8031AC20 7F 84 E3 78 */ mr r4, r28 -/* 8031AC24 48 00 8C A1 */ bl load__9J3DTexMtxCFUl -lbl_8031AC28: -/* 8031AC28 3B 9C 00 01 */ addi r28, r28, 1 -/* 8031AC2C 28 1C 00 08 */ cmplwi r28, 8 -/* 8031AC30 3B FF 00 06 */ addi r31, r31, 6 -/* 8031AC34 3B DE 00 04 */ addi r30, r30, 4 -/* 8031AC38 41 80 FF C8 */ blt lbl_8031AC00 -/* 8031AC3C 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031AC40 80 03 00 08 */ lwz r0, 8(r3) -/* 8031AC44 7F A3 EB 78 */ mr r3, r29 -/* 8031AC48 7C 9D 00 50 */ subf r4, r29, r0 -/* 8031AC4C 48 02 09 91 */ bl DCStoreRange -/* 8031AC50 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031AC54 48 04 75 CD */ bl _restgpr_27 -/* 8031AC58 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031AC5C 7C 08 03 A6 */ mtlr r0 -/* 8031AC60 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031AC64 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__21J3DColorBlockLightOffFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__21J3DColorBlockLightOffFv.s deleted file mode 100644 index 526cfc92a18..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__21J3DColorBlockLightOffFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80318EB4: -/* 80318EB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80318EB8 7C 08 02 A6 */ mflr r0 -/* 80318EBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80318EC0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80318EC4 7C 7F 1B 78 */ mr r31, r3 -/* 80318EC8 81 83 00 00 */ lwz r12, 0(r3) -/* 80318ECC 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80318ED0 7D 89 03 A6 */ mtctr r12 -/* 80318ED4 4E 80 04 21 */ bctrl -/* 80318ED8 7F E3 FB 78 */ mr r3, r31 -/* 80318EDC 81 9F 00 00 */ lwz r12, 0(r31) -/* 80318EE0 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80318EE4 7D 89 03 A6 */ mtctr r12 -/* 80318EE8 4E 80 04 21 */ bctrl -/* 80318EEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80318EF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80318EF4 7C 08 03 A6 */ mtlr r0 -/* 80318EF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80318EFC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/ptrToIndex__13J3DTevBlock16Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/ptrToIndex__13J3DTevBlock16Fv.s deleted file mode 100644 index 072cd6f4ccf..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/ptrToIndex__13J3DTevBlock16Fv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_8031DED0: -/* 8031DED0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8031DED4 7C 08 02 A6 */ mflr r0 -/* 8031DED8 90 01 00 34 */ stw r0, 0x34(r1) -/* 8031DEDC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031DEE0 48 04 42 ED */ bl _savegpr_25 -/* 8031DEE4 7C 7D 1B 78 */ mr r29, r3 -/* 8031DEE8 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031DEEC 80 64 00 00 */ lwz r3, 0(r4) -/* 8031DEF0 80 1D 00 04 */ lwz r0, 4(r29) -/* 8031DEF4 7C 03 02 14 */ add r0, r3, r0 -/* 8031DEF8 90 04 00 08 */ stw r0, 8(r4) -/* 8031DEFC 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031DF00 83 43 00 08 */ lwz r26, 8(r3) -/* 8031DF04 3B E0 00 00 */ li r31, 0 -/* 8031DF08 3B C0 00 00 */ li r30, 0 -/* 8031DF0C 3B 80 00 00 */ li r28, 0 -/* 8031DF10 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8031DF14 3B 63 4A C8 */ addi r27, r3, j3dSys@l /* 0x80434AC8@l */ -lbl_8031DF18: -/* 8031DF18 3B 3C 00 08 */ addi r25, r28, 8 -/* 8031DF1C 7F 3D CA 14 */ add r25, r29, r25 -/* 8031DF20 A0 19 00 00 */ lhz r0, 0(r25) -/* 8031DF24 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031DF28 41 82 00 50 */ beq lbl_8031DF78 -/* 8031DF2C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031DF30 80 04 00 00 */ lwz r0, 0(r4) -/* 8031DF34 80 7D 00 04 */ lwz r3, 4(r29) -/* 8031DF38 7C 1F 02 14 */ add r0, r31, r0 -/* 8031DF3C 7C 03 02 14 */ add r0, r3, r0 -/* 8031DF40 90 04 00 08 */ stw r0, 8(r4) -/* 8031DF44 7F C3 F3 78 */ mr r3, r30 -/* 8031DF48 7F 24 CB 78 */ mr r4, r25 -/* 8031DF4C 48 00 61 F1 */ bl patchTexNo_PtrToIdx__FUlRCUs -/* 8031DF50 80 7B 00 58 */ lwz r3, 0x58(r27) -/* 8031DF54 80 63 00 04 */ lwz r3, 4(r3) -/* 8031DF58 A0 19 00 00 */ lhz r0, 0(r25) -/* 8031DF5C 54 00 28 34 */ slwi r0, r0, 5 -/* 8031DF60 7C 63 02 14 */ add r3, r3, r0 -/* 8031DF64 88 03 00 08 */ lbz r0, 8(r3) -/* 8031DF68 28 00 00 01 */ cmplwi r0, 1 -/* 8031DF6C 3B FF 00 14 */ addi r31, r31, 0x14 -/* 8031DF70 40 82 00 08 */ bne lbl_8031DF78 -/* 8031DF74 3B FF 00 23 */ addi r31, r31, 0x23 -lbl_8031DF78: -/* 8031DF78 3B DE 00 01 */ addi r30, r30, 1 -/* 8031DF7C 28 1E 00 08 */ cmplwi r30, 8 -/* 8031DF80 3B 9C 00 02 */ addi r28, r28, 2 -/* 8031DF84 41 80 FF 94 */ blt lbl_8031DF18 -/* 8031DF88 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031DF8C 80 03 00 08 */ lwz r0, 8(r3) -/* 8031DF90 7F 43 D3 78 */ mr r3, r26 -/* 8031DF94 7C 9A 00 50 */ subf r4, r26, r0 -/* 8031DF98 48 01 D6 45 */ bl DCStoreRange -/* 8031DF9C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031DFA0 48 04 42 79 */ bl _restgpr_25 -/* 8031DFA4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8031DFA8 7C 08 03 A6 */ mtlr r0 -/* 8031DFAC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031DFB0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/ptrToIndex__18J3DTevBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/ptrToIndex__18J3DTevBlockPatchedFv.s deleted file mode 100644 index fe442d649fa..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/ptrToIndex__18J3DTevBlockPatchedFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_8031DFB4: -/* 8031DFB4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8031DFB8 7C 08 02 A6 */ mflr r0 -/* 8031DFBC 90 01 00 34 */ stw r0, 0x34(r1) -/* 8031DFC0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031DFC4 48 04 42 09 */ bl _savegpr_25 -/* 8031DFC8 7C 7D 1B 78 */ mr r29, r3 -/* 8031DFCC 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031DFD0 80 64 00 00 */ lwz r3, 0(r4) -/* 8031DFD4 80 1D 00 04 */ lwz r0, 4(r29) -/* 8031DFD8 7C 03 02 14 */ add r0, r3, r0 -/* 8031DFDC 90 04 00 08 */ stw r0, 8(r4) -/* 8031DFE0 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031DFE4 83 43 00 08 */ lwz r26, 8(r3) -/* 8031DFE8 3B E0 00 00 */ li r31, 0 -/* 8031DFEC 3B C0 00 00 */ li r30, 0 -/* 8031DFF0 3B 80 00 00 */ li r28, 0 -/* 8031DFF4 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8031DFF8 3B 63 4A C8 */ addi r27, r3, j3dSys@l /* 0x80434AC8@l */ -lbl_8031DFFC: -/* 8031DFFC 3B 3C 00 08 */ addi r25, r28, 8 -/* 8031E000 7F 3D CA 14 */ add r25, r29, r25 -/* 8031E004 A0 19 00 00 */ lhz r0, 0(r25) -/* 8031E008 28 00 FF FF */ cmplwi r0, 0xffff -/* 8031E00C 41 82 00 50 */ beq lbl_8031E05C -/* 8031E010 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031E014 80 04 00 00 */ lwz r0, 0(r4) -/* 8031E018 80 7D 00 04 */ lwz r3, 4(r29) -/* 8031E01C 7C 1F 02 14 */ add r0, r31, r0 -/* 8031E020 7C 03 02 14 */ add r0, r3, r0 -/* 8031E024 90 04 00 08 */ stw r0, 8(r4) -/* 8031E028 7F C3 F3 78 */ mr r3, r30 -/* 8031E02C 7F 24 CB 78 */ mr r4, r25 -/* 8031E030 48 00 61 0D */ bl patchTexNo_PtrToIdx__FUlRCUs -/* 8031E034 80 7B 00 58 */ lwz r3, 0x58(r27) -/* 8031E038 80 63 00 04 */ lwz r3, 4(r3) -/* 8031E03C A0 19 00 00 */ lhz r0, 0(r25) -/* 8031E040 54 00 28 34 */ slwi r0, r0, 5 -/* 8031E044 7C 63 02 14 */ add r3, r3, r0 -/* 8031E048 88 03 00 08 */ lbz r0, 8(r3) -/* 8031E04C 28 00 00 01 */ cmplwi r0, 1 -/* 8031E050 3B FF 00 14 */ addi r31, r31, 0x14 -/* 8031E054 40 82 00 08 */ bne lbl_8031E05C -/* 8031E058 3B FF 00 23 */ addi r31, r31, 0x23 -lbl_8031E05C: -/* 8031E05C 3B DE 00 01 */ addi r30, r30, 1 -/* 8031E060 28 1E 00 08 */ cmplwi r30, 8 -/* 8031E064 3B 9C 00 02 */ addi r28, r28, 2 -/* 8031E068 41 80 FF 94 */ blt lbl_8031DFFC -/* 8031E06C 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031E070 80 03 00 08 */ lwz r0, 8(r3) -/* 8031E074 7F 43 D3 78 */ mr r3, r26 -/* 8031E078 7C 9A 00 50 */ subf r4, r26, r0 -/* 8031E07C 48 01 D5 61 */ bl DCStoreRange -/* 8031E080 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031E084 48 04 41 95 */ bl _restgpr_25 -/* 8031E088 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8031E08C 7C 08 03 A6 */ mtlr r0 -/* 8031E090 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031E094 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__20J3DColorBlockLightOnFP13J3DColorBlock.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__20J3DColorBlockLightOnFP13J3DColorBlock.s deleted file mode 100644 index 48a3ff0b825..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__20J3DColorBlockLightOnFP13J3DColorBlock.s +++ /dev/null @@ -1,89 +0,0 @@ -lbl_8031FF34: -/* 8031FF34 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031FF38 7C 08 02 A6 */ mflr r0 -/* 8031FF3C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031FF40 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031FF44 48 04 22 95 */ bl _savegpr_28 -/* 8031FF48 7C 7E 1B 78 */ mr r30, r3 -/* 8031FF4C 7C 9F 23 78 */ mr r31, r4 -/* 8031FF50 7F E3 FB 78 */ mr r3, r31 -/* 8031FF54 81 9F 00 00 */ lwz r12, 0(r31) -/* 8031FF58 81 8C 00 58 */ lwz r12, 0x58(r12) -/* 8031FF5C 7D 89 03 A6 */ mtctr r12 -/* 8031FF60 4E 80 04 21 */ bctrl -/* 8031FF64 98 7E 00 14 */ stb r3, 0x14(r30) -/* 8031FF68 3B 80 00 00 */ li r28, 0 -/* 8031FF6C 3B A0 00 00 */ li r29, 0 -lbl_8031FF70: -/* 8031FF70 7F E3 FB 78 */ mr r3, r31 -/* 8031FF74 7F 84 E3 78 */ mr r4, r28 -/* 8031FF78 81 9F 00 00 */ lwz r12, 0(r31) -/* 8031FF7C 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 8031FF80 7D 89 03 A6 */ mtctr r12 -/* 8031FF84 4E 80 04 21 */ bctrl -/* 8031FF88 88 03 00 00 */ lbz r0, 0(r3) -/* 8031FF8C 7C 9E EA 14 */ add r4, r30, r29 -/* 8031FF90 98 04 00 04 */ stb r0, 4(r4) -/* 8031FF94 88 03 00 01 */ lbz r0, 1(r3) -/* 8031FF98 98 04 00 05 */ stb r0, 5(r4) -/* 8031FF9C 88 03 00 02 */ lbz r0, 2(r3) -/* 8031FFA0 98 04 00 06 */ stb r0, 6(r4) -/* 8031FFA4 88 03 00 03 */ lbz r0, 3(r3) -/* 8031FFA8 98 04 00 07 */ stb r0, 7(r4) -/* 8031FFAC 3B 9C 00 01 */ addi r28, r28, 1 -/* 8031FFB0 28 1C 00 02 */ cmplwi r28, 2 -/* 8031FFB4 3B BD 00 04 */ addi r29, r29, 4 -/* 8031FFB8 41 80 FF B8 */ blt lbl_8031FF70 -/* 8031FFBC 3B 80 00 00 */ li r28, 0 -/* 8031FFC0 3B A0 00 00 */ li r29, 0 -lbl_8031FFC4: -/* 8031FFC4 7F E3 FB 78 */ mr r3, r31 -/* 8031FFC8 7F 84 E3 78 */ mr r4, r28 -/* 8031FFCC 81 9F 00 00 */ lwz r12, 0(r31) -/* 8031FFD0 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 8031FFD4 7D 89 03 A6 */ mtctr r12 -/* 8031FFD8 4E 80 04 21 */ bctrl -/* 8031FFDC A0 63 00 00 */ lhz r3, 0(r3) -/* 8031FFE0 38 1D 00 16 */ addi r0, r29, 0x16 -/* 8031FFE4 7C 7E 03 2E */ sthx r3, r30, r0 -/* 8031FFE8 3B 9C 00 01 */ addi r28, r28, 1 -/* 8031FFEC 28 1C 00 04 */ cmplwi r28, 4 -/* 8031FFF0 3B BD 00 02 */ addi r29, r29, 2 -/* 8031FFF4 41 80 FF D0 */ blt lbl_8031FFC4 -/* 8031FFF8 3B 80 00 00 */ li r28, 0 -/* 8031FFFC 3B A0 00 00 */ li r29, 0 -lbl_80320000: -/* 80320000 7F E3 FB 78 */ mr r3, r31 -/* 80320004 7F 84 E3 78 */ mr r4, r28 -/* 80320008 81 9F 00 00 */ lwz r12, 0(r31) -/* 8032000C 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 80320010 7D 89 03 A6 */ mtctr r12 -/* 80320014 4E 80 04 21 */ bctrl -/* 80320018 28 03 00 00 */ cmplwi r3, 0 -/* 8032001C 41 82 00 40 */ beq lbl_8032005C -/* 80320020 7F E3 FB 78 */ mr r3, r31 -/* 80320024 7F 84 E3 78 */ mr r4, r28 -/* 80320028 81 9F 00 00 */ lwz r12, 0(r31) -/* 8032002C 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 80320030 7D 89 03 A6 */ mtctr r12 -/* 80320034 4E 80 04 21 */ bctrl -/* 80320038 88 03 00 00 */ lbz r0, 0(r3) -/* 8032003C 7C 9E EA 14 */ add r4, r30, r29 -/* 80320040 98 04 00 0C */ stb r0, 0xc(r4) -/* 80320044 88 03 00 01 */ lbz r0, 1(r3) -/* 80320048 98 04 00 0D */ stb r0, 0xd(r4) -/* 8032004C 88 03 00 02 */ lbz r0, 2(r3) -/* 80320050 98 04 00 0E */ stb r0, 0xe(r4) -/* 80320054 88 03 00 03 */ lbz r0, 3(r3) -/* 80320058 98 04 00 0F */ stb r0, 0xf(r4) -lbl_8032005C: -/* 8032005C 3B 9C 00 01 */ addi r28, r28, 1 -/* 80320060 28 1C 00 02 */ cmplwi r28, 2 -/* 80320064 3B BD 00 04 */ addi r29, r29, 4 -/* 80320068 41 80 FF 98 */ blt lbl_80320000 -/* 8032006C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80320070 48 04 21 B5 */ bl _restgpr_28 -/* 80320074 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80320078 7C 08 03 A6 */ mtlr r0 -/* 8032007C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80320080 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__21J3DColorBlockLightOffFP13J3DColorBlock.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__21J3DColorBlockLightOffFP13J3DColorBlock.s deleted file mode 100644 index 052dcd27acc..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__21J3DColorBlockLightOffFP13J3DColorBlock.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_8031FD08: -/* 8031FD08 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031FD0C 7C 08 02 A6 */ mflr r0 -/* 8031FD10 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031FD14 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031FD18 48 04 24 C1 */ bl _savegpr_28 -/* 8031FD1C 7C 7C 1B 78 */ mr r28, r3 -/* 8031FD20 7C 9D 23 78 */ mr r29, r4 -/* 8031FD24 7F A3 EB 78 */ mr r3, r29 -/* 8031FD28 81 9D 00 00 */ lwz r12, 0(r29) -/* 8031FD2C 81 8C 00 58 */ lwz r12, 0x58(r12) -/* 8031FD30 7D 89 03 A6 */ mtctr r12 -/* 8031FD34 4E 80 04 21 */ bctrl -/* 8031FD38 98 7C 00 0C */ stb r3, 0xc(r28) -/* 8031FD3C 3B C0 00 00 */ li r30, 0 -/* 8031FD40 3B E0 00 00 */ li r31, 0 -lbl_8031FD44: -/* 8031FD44 7F A3 EB 78 */ mr r3, r29 -/* 8031FD48 7F C4 F3 78 */ mr r4, r30 -/* 8031FD4C 81 9D 00 00 */ lwz r12, 0(r29) -/* 8031FD50 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 8031FD54 7D 89 03 A6 */ mtctr r12 -/* 8031FD58 4E 80 04 21 */ bctrl -/* 8031FD5C 88 03 00 00 */ lbz r0, 0(r3) -/* 8031FD60 7C 9C FA 14 */ add r4, r28, r31 -/* 8031FD64 98 04 00 04 */ stb r0, 4(r4) -/* 8031FD68 88 03 00 01 */ lbz r0, 1(r3) -/* 8031FD6C 98 04 00 05 */ stb r0, 5(r4) -/* 8031FD70 88 03 00 02 */ lbz r0, 2(r3) -/* 8031FD74 98 04 00 06 */ stb r0, 6(r4) -/* 8031FD78 88 03 00 03 */ lbz r0, 3(r3) -/* 8031FD7C 98 04 00 07 */ stb r0, 7(r4) -/* 8031FD80 3B DE 00 01 */ addi r30, r30, 1 -/* 8031FD84 28 1E 00 02 */ cmplwi r30, 2 -/* 8031FD88 3B FF 00 04 */ addi r31, r31, 4 -/* 8031FD8C 41 80 FF B8 */ blt lbl_8031FD44 -/* 8031FD90 3B C0 00 00 */ li r30, 0 -/* 8031FD94 3B E0 00 00 */ li r31, 0 -lbl_8031FD98: -/* 8031FD98 7F A3 EB 78 */ mr r3, r29 -/* 8031FD9C 7F C4 F3 78 */ mr r4, r30 -/* 8031FDA0 81 9D 00 00 */ lwz r12, 0(r29) -/* 8031FDA4 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 8031FDA8 7D 89 03 A6 */ mtctr r12 -/* 8031FDAC 4E 80 04 21 */ bctrl -/* 8031FDB0 A0 63 00 00 */ lhz r3, 0(r3) -/* 8031FDB4 38 1F 00 0E */ addi r0, r31, 0xe -/* 8031FDB8 7C 7C 03 2E */ sthx r3, r28, r0 -/* 8031FDBC 3B DE 00 01 */ addi r30, r30, 1 -/* 8031FDC0 28 1E 00 04 */ cmplwi r30, 4 -/* 8031FDC4 3B FF 00 02 */ addi r31, r31, 2 -/* 8031FDC8 41 80 FF D0 */ blt lbl_8031FD98 -/* 8031FDCC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031FDD0 48 04 24 55 */ bl _restgpr_28 -/* 8031FDD4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031FDD8 7C 08 03 A6 */ mtlr r0 -/* 8031FDDC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031FDE0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__22J3DColorBlockAmbientOnFP13J3DColorBlock.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__22J3DColorBlockAmbientOnFP13J3DColorBlock.s deleted file mode 100644 index ab52006e906..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__22J3DColorBlockAmbientOnFP13J3DColorBlock.s +++ /dev/null @@ -1,89 +0,0 @@ -lbl_8031FDE4: -/* 8031FDE4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031FDE8 7C 08 02 A6 */ mflr r0 -/* 8031FDEC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031FDF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031FDF4 48 04 23 E5 */ bl _savegpr_28 -/* 8031FDF8 7C 7E 1B 78 */ mr r30, r3 -/* 8031FDFC 7C 9F 23 78 */ mr r31, r4 -/* 8031FE00 7F E3 FB 78 */ mr r3, r31 -/* 8031FE04 81 9F 00 00 */ lwz r12, 0(r31) -/* 8031FE08 81 8C 00 58 */ lwz r12, 0x58(r12) -/* 8031FE0C 7D 89 03 A6 */ mtctr r12 -/* 8031FE10 4E 80 04 21 */ bctrl -/* 8031FE14 98 7E 00 0C */ stb r3, 0xc(r30) -/* 8031FE18 3B 80 00 00 */ li r28, 0 -/* 8031FE1C 3B A0 00 00 */ li r29, 0 -lbl_8031FE20: -/* 8031FE20 7F E3 FB 78 */ mr r3, r31 -/* 8031FE24 7F 84 E3 78 */ mr r4, r28 -/* 8031FE28 81 9F 00 00 */ lwz r12, 0(r31) -/* 8031FE2C 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 8031FE30 7D 89 03 A6 */ mtctr r12 -/* 8031FE34 4E 80 04 21 */ bctrl -/* 8031FE38 88 03 00 00 */ lbz r0, 0(r3) -/* 8031FE3C 7C 9E EA 14 */ add r4, r30, r29 -/* 8031FE40 98 04 00 04 */ stb r0, 4(r4) -/* 8031FE44 88 03 00 01 */ lbz r0, 1(r3) -/* 8031FE48 98 04 00 05 */ stb r0, 5(r4) -/* 8031FE4C 88 03 00 02 */ lbz r0, 2(r3) -/* 8031FE50 98 04 00 06 */ stb r0, 6(r4) -/* 8031FE54 88 03 00 03 */ lbz r0, 3(r3) -/* 8031FE58 98 04 00 07 */ stb r0, 7(r4) -/* 8031FE5C 3B 9C 00 01 */ addi r28, r28, 1 -/* 8031FE60 28 1C 00 02 */ cmplwi r28, 2 -/* 8031FE64 3B BD 00 04 */ addi r29, r29, 4 -/* 8031FE68 41 80 FF B8 */ blt lbl_8031FE20 -/* 8031FE6C 3B 80 00 00 */ li r28, 0 -/* 8031FE70 3B A0 00 00 */ li r29, 0 -lbl_8031FE74: -/* 8031FE74 7F E3 FB 78 */ mr r3, r31 -/* 8031FE78 7F 84 E3 78 */ mr r4, r28 -/* 8031FE7C 81 9F 00 00 */ lwz r12, 0(r31) -/* 8031FE80 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 8031FE84 7D 89 03 A6 */ mtctr r12 -/* 8031FE88 4E 80 04 21 */ bctrl -/* 8031FE8C A0 63 00 00 */ lhz r3, 0(r3) -/* 8031FE90 38 1D 00 0E */ addi r0, r29, 0xe -/* 8031FE94 7C 7E 03 2E */ sthx r3, r30, r0 -/* 8031FE98 3B 9C 00 01 */ addi r28, r28, 1 -/* 8031FE9C 28 1C 00 04 */ cmplwi r28, 4 -/* 8031FEA0 3B BD 00 02 */ addi r29, r29, 2 -/* 8031FEA4 41 80 FF D0 */ blt lbl_8031FE74 -/* 8031FEA8 3B 80 00 00 */ li r28, 0 -/* 8031FEAC 3B A0 00 00 */ li r29, 0 -lbl_8031FEB0: -/* 8031FEB0 7F E3 FB 78 */ mr r3, r31 -/* 8031FEB4 7F 84 E3 78 */ mr r4, r28 -/* 8031FEB8 81 9F 00 00 */ lwz r12, 0(r31) -/* 8031FEBC 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 8031FEC0 7D 89 03 A6 */ mtctr r12 -/* 8031FEC4 4E 80 04 21 */ bctrl -/* 8031FEC8 28 03 00 00 */ cmplwi r3, 0 -/* 8031FECC 41 82 00 40 */ beq lbl_8031FF0C -/* 8031FED0 7F E3 FB 78 */ mr r3, r31 -/* 8031FED4 7F 84 E3 78 */ mr r4, r28 -/* 8031FED8 81 9F 00 00 */ lwz r12, 0(r31) -/* 8031FEDC 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 8031FEE0 7D 89 03 A6 */ mtctr r12 -/* 8031FEE4 4E 80 04 21 */ bctrl -/* 8031FEE8 88 03 00 00 */ lbz r0, 0(r3) -/* 8031FEEC 7C 9E EA 14 */ add r4, r30, r29 -/* 8031FEF0 98 04 00 20 */ stb r0, 0x20(r4) -/* 8031FEF4 88 03 00 01 */ lbz r0, 1(r3) -/* 8031FEF8 98 04 00 21 */ stb r0, 0x21(r4) -/* 8031FEFC 88 03 00 02 */ lbz r0, 2(r3) -/* 8031FF00 98 04 00 22 */ stb r0, 0x22(r4) -/* 8031FF04 88 03 00 03 */ lbz r0, 3(r3) -/* 8031FF08 98 04 00 23 */ stb r0, 0x23(r4) -lbl_8031FF0C: -/* 8031FF0C 3B 9C 00 01 */ addi r28, r28, 1 -/* 8031FF10 28 1C 00 02 */ cmplwi r28, 2 -/* 8031FF14 3B BD 00 04 */ addi r29, r29, 4 -/* 8031FF18 41 80 FF 98 */ blt lbl_8031FEB0 -/* 8031FF1C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031FF20 48 04 23 05 */ bl _restgpr_28 -/* 8031FF24 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031FF28 7C 08 03 A6 */ mtlr r0 -/* 8031FF2C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031FF30 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__14J3DPEBlockFullFPC12J3DAlphaComp.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__14J3DPEBlockFullFPC12J3DAlphaComp.s deleted file mode 100644 index e8b5e1c8b6f..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__14J3DPEBlockFullFPC12J3DAlphaComp.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_803219C4: -/* 803219C4 A0 04 00 00 */ lhz r0, 0(r4) -/* 803219C8 B0 03 00 30 */ sth r0, 0x30(r3) -/* 803219CC 88 04 00 02 */ lbz r0, 2(r4) -/* 803219D0 98 03 00 32 */ stb r0, 0x32(r3) -/* 803219D4 88 04 00 03 */ lbz r0, 3(r4) -/* 803219D8 98 03 00 33 */ stb r0, 0x33(r3) -/* 803219DC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__14J3DPEBlockFullFRC12J3DAlphaComp.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__14J3DPEBlockFullFRC12J3DAlphaComp.s deleted file mode 100644 index 35be184e51a..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__14J3DPEBlockFullFRC12J3DAlphaComp.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_803219A8: -/* 803219A8 A0 04 00 00 */ lhz r0, 0(r4) -/* 803219AC B0 03 00 30 */ sth r0, 0x30(r3) -/* 803219B0 88 04 00 02 */ lbz r0, 2(r4) -/* 803219B4 98 03 00 32 */ stb r0, 0x32(r3) -/* 803219B8 88 04 00 03 */ lbz r0, 3(r4) -/* 803219BC 98 03 00 33 */ stb r0, 0x33(r3) -/* 803219C0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__16J3DPEBlockFogOffFPC12J3DAlphaComp.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__16J3DPEBlockFogOffFPC12J3DAlphaComp.s deleted file mode 100644 index d111b3c357c..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__16J3DPEBlockFogOffFPC12J3DAlphaComp.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80321B28: -/* 80321B28 A0 04 00 00 */ lhz r0, 0(r4) -/* 80321B2C B0 03 00 04 */ sth r0, 4(r3) -/* 80321B30 88 04 00 02 */ lbz r0, 2(r4) -/* 80321B34 98 03 00 06 */ stb r0, 6(r3) -/* 80321B38 88 04 00 03 */ lbz r0, 3(r4) -/* 80321B3C 98 03 00 07 */ stb r0, 7(r3) -/* 80321B40 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__16J3DPEBlockFogOffFRC12J3DAlphaComp.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__16J3DPEBlockFogOffFRC12J3DAlphaComp.s deleted file mode 100644 index 919e2c74f89..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__16J3DPEBlockFogOffFRC12J3DAlphaComp.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80321B0C: -/* 80321B0C A0 04 00 00 */ lhz r0, 0(r4) -/* 80321B10 B0 03 00 04 */ sth r0, 4(r3) -/* 80321B14 88 04 00 02 */ lbz r0, 2(r4) -/* 80321B18 98 03 00 06 */ stb r0, 6(r3) -/* 80321B1C 88 04 00 03 */ lbz r0, 3(r4) -/* 80321B20 98 03 00 07 */ stb r0, 7(r3) -/* 80321B24 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__14J3DPEBlockFullFPC8J3DBlend.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__14J3DPEBlockFullFPC8J3DBlend.s deleted file mode 100644 index e4864f49cb7..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__14J3DPEBlockFullFPC8J3DBlend.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_803219F4: -/* 803219F4 80 04 00 00 */ lwz r0, 0(r4) -/* 803219F8 90 03 00 34 */ stw r0, 0x34(r3) -/* 803219FC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__14J3DPEBlockFullFRC8J3DBlend.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__14J3DPEBlockFullFRC8J3DBlend.s deleted file mode 100644 index 37ca586769c..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__14J3DPEBlockFullFRC8J3DBlend.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_803219E8: -/* 803219E8 80 04 00 00 */ lwz r0, 0(r4) -/* 803219EC 90 03 00 34 */ stw r0, 0x34(r3) -/* 803219F0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__16J3DPEBlockFogOffFPC8J3DBlend.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__16J3DPEBlockFogOffFPC8J3DBlend.s deleted file mode 100644 index d79ad5a57c7..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__16J3DPEBlockFogOffFPC8J3DBlend.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80321B58: -/* 80321B58 80 04 00 00 */ lwz r0, 0(r4) -/* 80321B5C 90 03 00 08 */ stw r0, 8(r3) -/* 80321B60 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__16J3DPEBlockFogOffFRC8J3DBlend.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__16J3DPEBlockFogOffFRC8J3DBlend.s deleted file mode 100644 index 887089849d1..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__16J3DPEBlockFogOffFRC8J3DBlend.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80321B4C: -/* 80321B4C 80 04 00 00 */ lwz r0, 0(r4) -/* 80321B50 90 03 00 08 */ stw r0, 8(r3) -/* 80321B54 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__21J3DColorBlockLightOffFPCUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__21J3DColorBlockLightOffFPCUc.s deleted file mode 100644 index 31117ce89e7..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__21J3DColorBlockLightOffFPCUc.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_803231C4: -/* 803231C4 88 04 00 00 */ lbz r0, 0(r4) -/* 803231C8 98 03 00 0C */ stb r0, 0xc(r3) -/* 803231CC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChan__21J3DColorBlockLightOffFUlPC12J3DColorChan.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChan__21J3DColorBlockLightOffFUlPC12J3DColorChan.s deleted file mode 100644 index 20b672a9005..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChan__21J3DColorBlockLightOffFUlPC12J3DColorChan.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_803231E0: -/* 803231E0 A0 A5 00 00 */ lhz r5, 0(r5) -/* 803231E4 54 80 08 3C */ slwi r0, r4, 1 -/* 803231E8 7C 63 02 14 */ add r3, r3, r0 -/* 803231EC B0 A3 00 0E */ sth r5, 0xe(r3) -/* 803231F0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChan__21J3DColorBlockLightOffFUlRC12J3DColorChan.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChan__21J3DColorBlockLightOffFUlRC12J3DColorChan.s deleted file mode 100644 index 068aa5fd9e7..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChan__21J3DColorBlockLightOffFUlRC12J3DColorChan.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_803231F4: -/* 803231F4 A0 A5 00 00 */ lhz r5, 0(r5) -/* 803231F8 54 80 08 3C */ slwi r0, r4, 1 -/* 803231FC 7C 63 02 14 */ add r3, r3, r0 -/* 80323200 B0 A3 00 0E */ sth r5, 0xe(r3) -/* 80323204 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__21J3DColorBlockLightOffFPCUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__21J3DColorBlockLightOffFPCUc.s deleted file mode 100644 index 260af9f0413..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__21J3DColorBlockLightOffFPCUc.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80323224: -/* 80323224 88 04 00 00 */ lbz r0, 0(r4) -/* 80323228 98 03 00 16 */ stb r0, 0x16(r3) -/* 8032322C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__14J3DPEBlockFullFPCUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__14J3DPEBlockFullFPCUc.s deleted file mode 100644 index 9d3d6a18087..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__14J3DPEBlockFullFPCUc.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80321A4C: -/* 80321A4C 88 04 00 00 */ lbz r0, 0(r4) -/* 80321A50 98 03 00 3B */ stb r0, 0x3b(r3) -/* 80321A54 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__16J3DPEBlockFogOffFPCUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__16J3DPEBlockFogOffFPCUc.s deleted file mode 100644 index cc9df2c72da..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__16J3DPEBlockFogOffFPCUc.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80321BB0: -/* 80321BB0 88 04 00 00 */ lbz r0, 0(r4) -/* 80321BB4 98 03 00 0F */ stb r0, 0xf(r3) -/* 80321BB8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setFog__14J3DPEBlockFullF6J3DFog.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setFog__14J3DPEBlockFullF6J3DFog.s deleted file mode 100644 index fc5e2096d52..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setFog__14J3DPEBlockFullF6J3DFog.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8032197C: -/* 8032197C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80321980 7C 08 02 A6 */ mflr r0 -/* 80321984 90 01 00 14 */ stw r0, 0x14(r1) -/* 80321988 38 63 00 04 */ addi r3, r3, 4 -/* 8032198C 48 00 3E 75 */ bl __as__10J3DFogInfoFRC10J3DFogInfo -/* 80321990 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80321994 7C 08 03 A6 */ mtlr r0 -/* 80321998 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032199C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setFog__14J3DPEBlockFullFP6J3DFog.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setFog__14J3DPEBlockFullFP6J3DFog.s deleted file mode 100644 index 96417ad9de9..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setFog__14J3DPEBlockFullFP6J3DFog.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80321958: -/* 80321958 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8032195C 7C 08 02 A6 */ mflr r0 -/* 80321960 90 01 00 14 */ stw r0, 0x14(r1) -/* 80321964 38 63 00 04 */ addi r3, r3, 4 -/* 80321968 48 00 3E 99 */ bl __as__10J3DFogInfoFRC10J3DFogInfo -/* 8032196C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80321970 7C 08 03 A6 */ mtlr r0 -/* 80321974 38 21 00 10 */ addi r1, r1, 0x10 -/* 80321978 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexCoordScale__15J3DIndBlockFullFUl19J3DIndTexCoordScale.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexCoordScale__15J3DIndBlockFullFUl19J3DIndTexCoordScale.s deleted file mode 100644 index c4d9cf6bae6..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexCoordScale__15J3DIndBlockFullFUl19J3DIndTexCoordScale.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80323464: -/* 80323464 80 A5 00 00 */ lwz r5, 0(r5) -/* 80323468 54 84 10 3A */ slwi r4, r4, 2 -/* 8032346C 38 04 00 6C */ addi r0, r4, 0x6c -/* 80323470 7C A3 01 2E */ stwx r5, r3, r0 -/* 80323474 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexCoordScale__15J3DIndBlockFullFUlPC19J3DIndTexCoordScale.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexCoordScale__15J3DIndBlockFullFUlPC19J3DIndTexCoordScale.s deleted file mode 100644 index db4b6b701ee..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexCoordScale__15J3DIndBlockFullFUlPC19J3DIndTexCoordScale.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80323478: -/* 80323478 80 A5 00 00 */ lwz r5, 0(r5) -/* 8032347C 54 84 10 3A */ slwi r4, r4, 2 -/* 80323480 38 04 00 6C */ addi r0, r4, 0x6c -/* 80323484 7C A3 01 2E */ stwx r5, r3, r0 -/* 80323488 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexMtx__15J3DIndBlockFullFUl12J3DIndTexMtx.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexMtx__15J3DIndBlockFullFUl12J3DIndTexMtx.s deleted file mode 100644 index 56c32a72741..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexMtx__15J3DIndBlockFullFUl12J3DIndTexMtx.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_803233E8: -/* 803233E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803233EC 7C 08 02 A6 */ mflr r0 -/* 803233F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 803233F4 7C 60 1B 78 */ mr r0, r3 -/* 803233F8 1C 64 00 1C */ mulli r3, r4, 0x1c -/* 803233FC 38 63 00 18 */ addi r3, r3, 0x18 -/* 80323400 7C 60 1A 14 */ add r3, r0, r3 -/* 80323404 7C A4 2B 78 */ mr r4, r5 -/* 80323408 48 00 23 D5 */ bl __as__16J3DIndTexMtxInfoFRC16J3DIndTexMtxInfo -/* 8032340C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80323410 7C 08 03 A6 */ mtlr r0 -/* 80323414 38 21 00 10 */ addi r1, r1, 0x10 -/* 80323418 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexMtx__15J3DIndBlockFullFUlPC12J3DIndTexMtx.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexMtx__15J3DIndBlockFullFUlPC12J3DIndTexMtx.s deleted file mode 100644 index 830cab7a6d2..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexMtx__15J3DIndBlockFullFUlPC12J3DIndTexMtx.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8032341C: -/* 8032341C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80323420 7C 08 02 A6 */ mflr r0 -/* 80323424 90 01 00 14 */ stw r0, 0x14(r1) -/* 80323428 7C 60 1B 78 */ mr r0, r3 -/* 8032342C 1C 64 00 1C */ mulli r3, r4, 0x1c -/* 80323430 38 63 00 18 */ addi r3, r3, 0x18 -/* 80323434 7C 60 1A 14 */ add r3, r0, r3 -/* 80323438 7C A4 2B 78 */ mr r4, r5 -/* 8032343C 48 00 23 A1 */ bl __as__16J3DIndTexMtxInfoFRC16J3DIndTexMtxInfo -/* 80323440 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80323444 7C 08 03 A6 */ mtlr r0 -/* 80323448 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032344C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexOrder__15J3DIndBlockFullFUl14J3DIndTexOrder.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexOrder__15J3DIndBlockFullFUl14J3DIndTexOrder.s deleted file mode 100644 index ffebd099ab6..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexOrder__15J3DIndBlockFullFUl14J3DIndTexOrder.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_803233AC: -/* 803233AC 80 A5 00 00 */ lwz r5, 0(r5) -/* 803233B0 54 84 10 3A */ slwi r4, r4, 2 -/* 803233B4 38 04 00 05 */ addi r0, r4, 5 -/* 803233B8 7C A3 01 2E */ stwx r5, r3, r0 -/* 803233BC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexOrder__15J3DIndBlockFullFUlPC14J3DIndTexOrder.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexOrder__15J3DIndBlockFullFUlPC14J3DIndTexOrder.s deleted file mode 100644 index 787ac0e1fe3..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexOrder__15J3DIndBlockFullFUlPC14J3DIndTexOrder.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_803233C0: -/* 803233C0 80 A5 00 00 */ lwz r5, 0(r5) -/* 803233C4 54 84 10 3A */ slwi r4, r4, 2 -/* 803233C8 38 04 00 05 */ addi r0, r4, 5 -/* 803233CC 7C A3 01 2E */ stwx r5, r3, r0 -/* 803233D0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColor__21J3DColorBlockLightOffFUl10J3DGXColor.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColor__21J3DColorBlockLightOffFUl10J3DGXColor.s deleted file mode 100644 index 778e57d2aa9..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColor__21J3DColorBlockLightOffFUl10J3DGXColor.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80323158: -/* 80323158 88 05 00 00 */ lbz r0, 0(r5) -/* 8032315C 54 84 10 3A */ slwi r4, r4, 2 -/* 80323160 7C 63 22 14 */ add r3, r3, r4 -/* 80323164 98 03 00 04 */ stb r0, 4(r3) -/* 80323168 88 05 00 01 */ lbz r0, 1(r5) -/* 8032316C 98 03 00 05 */ stb r0, 5(r3) -/* 80323170 88 05 00 02 */ lbz r0, 2(r5) -/* 80323174 98 03 00 06 */ stb r0, 6(r3) -/* 80323178 88 05 00 03 */ lbz r0, 3(r5) -/* 8032317C 98 03 00 07 */ stb r0, 7(r3) -/* 80323180 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColor__21J3DColorBlockLightOffFUlPC10J3DGXColor.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColor__21J3DColorBlockLightOffFUlPC10J3DGXColor.s deleted file mode 100644 index a0cddcfb747..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColor__21J3DColorBlockLightOffFUlPC10J3DGXColor.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80323184: -/* 80323184 88 05 00 00 */ lbz r0, 0(r5) -/* 80323188 54 84 10 3A */ slwi r4, r4, 2 -/* 8032318C 7C 63 22 14 */ add r3, r3, r4 -/* 80323190 98 03 00 04 */ stb r0, 4(r3) -/* 80323194 88 05 00 01 */ lbz r0, 1(r5) -/* 80323198 98 03 00 05 */ stb r0, 5(r3) -/* 8032319C 88 05 00 02 */ lbz r0, 2(r5) -/* 803231A0 98 03 00 06 */ stb r0, 6(r3) -/* 803231A4 88 05 00 03 */ lbz r0, 3(r5) -/* 803231A8 98 03 00 07 */ stb r0, 7(r3) -/* 803231AC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexNo__13J3DTevBlock16FUlUs.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexNo__13J3DTevBlock16FUlUs.s deleted file mode 100644 index 4ea108ac7bd..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexNo__13J3DTevBlock16FUlUs.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80321C50: -/* 80321C50 54 80 08 3C */ slwi r0, r4, 1 -/* 80321C54 7C 63 02 14 */ add r3, r3, r0 -/* 80321C58 B0 A3 00 08 */ sth r5, 8(r3) -/* 80321C5C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__14J3DPEBlockFullFPCUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__14J3DPEBlockFullFPCUc.s deleted file mode 100644 index 0feab8a7faa..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__14J3DPEBlockFullFPCUc.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80321A30: -/* 80321A30 88 04 00 00 */ lbz r0, 0(r4) -/* 80321A34 98 03 00 3A */ stb r0, 0x3a(r3) -/* 80321A38 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__16J3DPEBlockFogOffFPCUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__16J3DPEBlockFogOffFPCUc.s deleted file mode 100644 index 4ddb28c6e92..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__16J3DPEBlockFogOffFPCUc.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80321B94: -/* 80321B94 88 04 00 00 */ lbz r0, 0(r4) -/* 80321B98 98 03 00 0E */ stb r0, 0xe(r3) -/* 80321B9C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__14J3DPEBlockFullF8J3DZMode.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__14J3DPEBlockFullF8J3DZMode.s deleted file mode 100644 index 7d37b6c4854..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__14J3DPEBlockFullF8J3DZMode.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80321A08: -/* 80321A08 A0 04 00 00 */ lhz r0, 0(r4) -/* 80321A0C B0 03 00 38 */ sth r0, 0x38(r3) -/* 80321A10 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__14J3DPEBlockFullFPC8J3DZMode.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__14J3DPEBlockFullFPC8J3DZMode.s deleted file mode 100644 index bd7fb1840e8..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__14J3DPEBlockFullFPC8J3DZMode.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80321A14: -/* 80321A14 A0 04 00 00 */ lhz r0, 0(r4) -/* 80321A18 B0 03 00 38 */ sth r0, 0x38(r3) -/* 80321A1C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__16J3DPEBlockFogOffF8J3DZMode.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__16J3DPEBlockFogOffF8J3DZMode.s deleted file mode 100644 index 8fca468a18f..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__16J3DPEBlockFogOffF8J3DZMode.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80321B6C: -/* 80321B6C A0 04 00 00 */ lhz r0, 0(r4) -/* 80321B70 B0 03 00 0C */ sth r0, 0xc(r3) -/* 80321B74 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__16J3DPEBlockFogOffFPC8J3DZMode.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__16J3DPEBlockFogOffFPC8J3DZMode.s deleted file mode 100644 index 2cd49095274..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__16J3DPEBlockFogOffFPC8J3DZMode.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80321B78: -/* 80321B78 A0 04 00 00 */ lhz r0, 0(r4) -/* 80321B7C B0 03 00 0C */ sth r0, 0xc(r3) -/* 80321B80 4E 80 00 20 */ blr diff --git a/include/JSystem/J3DGraphBase/J3DGD.h b/include/JSystem/J3DGraphBase/J3DGD.h index 53e63508c48..eef2b7b223b 100644 --- a/include/JSystem/J3DGraphBase/J3DGD.h +++ b/include/JSystem/J3DGraphBase/J3DGD.h @@ -116,4 +116,47 @@ inline void J3DGDSetNumTexGens(u8 numTexGens) { J3DGDWriteXFCmd(0x103f, numTexGens); } +inline void J3DGDSetTevKonstantSel_SwapModeTable(GXTevStageID stage, GXTevKColorSel colorSel1, GXTevKAlphaSel alphaSel1, GXTevKColorSel colorSel2, GXTevKAlphaSel alphaSel2, GXTevColor chan1, GXTevColor chan2) { + J3DGDWriteBPCmd((stage / 2 + 0xf6) << 24 | (chan1 | chan2 << 2 | colorSel1 << 4 | alphaSel1 << 9 | colorSel2 << 14 | alphaSel2 << 19) & 0x00FFFFFF); +} + +inline void J3DGDSetAlphaCompare(GXCompare cmp0, u8 ref0, GXAlphaOp op, GXCompare cmp1, u8 ref1) { + J3DGDWriteBPCmd(ref0 | ref1 << 8 | cmp0 << 16 | cmp1 << 19 | op << 22 | 0xF3 << 24); +} + +inline void J3DGDSetBlendMode(GXBlendMode mode, GXBlendFactor srcFactor, GXBlendFactor dstFactor, GXLogicOp logicOp) { + J3DGDWriteBPCmd(0xFE00FFE3); + J3DGDWriteBPCmd( + (mode == GX_BM_BLEND || mode == GX_BM_SUBTRACT) << 0 | + (mode == GX_BM_LOGIC) << 1 | + dstFactor << 5 | + srcFactor << 8 | + (mode == GX_BM_SUBTRACT) << 11 | + logicOp << 12 | + 0x41 << 24); +} + +inline void J3DGDSetBlendMode(GXBlendMode mode, GXBlendFactor srcFactor, GXBlendFactor dstFactor, GXLogicOp logicOp, u8 ditherEnable) { + J3DGDWriteBPCmd(0xFE00FFE7); + J3DGDWriteBPCmd( + u32(mode == GX_BM_BLEND || mode == GX_BM_SUBTRACT) << 0 | + (mode == GX_BM_LOGIC) << 1 | + ditherEnable << 2 | + dstFactor << 5 | + srcFactor << 8 | + (mode == GX_BM_SUBTRACT) << 11 | + logicOp << 12 | + 0x41 << 24); +} + +inline void J3DGDSetZMode(u8 compareEnable, GXCompare func, u8 writeEnable) { + J3DGDWriteBPCmd(compareEnable | func << 1 | writeEnable << 4 | 0x40 << 24); +} + +inline void J3DGDSetZCompLoc(u32 compLocEnable) { + J3DGDWriteBPCmd(0xFE000040); + J3DGDWriteBPCmd(compLocEnable << 6 | 0x43 << 24); +} + + #endif /* J3DGD_H */ diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index c2b125c2ac8..9f149bf4a76 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -13,6 +13,14 @@ struct J3DGXColorS10 : public GXColorS10 { /* 8000E460 */ J3DGXColorS10() {} J3DGXColorS10(J3DGXColorS10 const& other) { __memcpy(this, &other, sizeof(J3DGXColorS10)); } J3DGXColorS10(GXColorS10 const& color) : GXColorS10(color) {} + J3DGXColorS10& operator=(const GXColorS10& color) { + // FAKE match. __memcpy created issues in J3DTevBlockPatched::initialize + u32* src = (u32*)&color; + u32* tgt = (u32*)this; + tgt[0] = src[0]; + tgt[1] = src[1]; + return *this; + } }; /** @@ -23,6 +31,17 @@ struct J3DGXColor : public GXColor { /* 8000E538 */ J3DGXColor() {} J3DGXColor(J3DGXColor const& other) { __memcpy(this, &other, sizeof(J3DGXColor)); } J3DGXColor(GXColor const& color) : GXColor(color) {} + J3DGXColor& operator=(GXColor color) { + *(GXColor*)this = color; + return *this; + } + J3DGXColor& operator=(const J3DGXColor& other) { + r = other.r; + g = other.g; + b = other.b; + a = other.a; + return *this; + } }; /** @@ -205,10 +224,10 @@ public: /* 8000DFB8 */ virtual J3DTevOrder* getTevOrder(u32); /* 80110E80 */ virtual void setTevColor(u32, J3DGXColorS10 const*); /* 8000E0C4 */ virtual void setTevColor(u32, J3DGXColorS10); - /* 8000DFC8 */ virtual _GXColorS10* getTevColor(u32); + /* 8000DFC8 */ virtual J3DGXColorS10* getTevColor(u32); /* 800732AC */ virtual void setTevKColor(u32, J3DGXColor const*); /* 8000E0C0 */ virtual void setTevKColor(u32, J3DGXColor); - /* 8000DFC0 */ virtual _GXColor* getTevKColor(u32); + /* 8000DFC0 */ virtual J3DGXColor* getTevKColor(u32); /* 80322950 */ virtual void setTevKColorSel(u32, u8 const*); /* 8000E0B8 */ virtual void setTevKColorSel(u32, u8); /* 8000DFB0 */ virtual bool getTevKColorSel(u32); @@ -225,11 +244,11 @@ public: /* 80322958 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo); /* 80322960 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*); /* 8000E0B0 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable); - /* 8000DFA0 */ virtual bool getTevSwapModeTable(u32); + /* 8000DFA0 */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32); /* 80323554 */ virtual void setIndTevStage(u32, J3DIndTevStage const*); /* 8000E0A4 */ virtual void setIndTevStage(u32, J3DIndTevStage); - /* 8000DF84 */ virtual bool getIndTevStage(u32); - /* 80323558 */ virtual bool getTexNoOffset() const; + /* 8000DF84 */ virtual J3DIndTevStage* getIndTevStage(u32); + /* 80323558 */ virtual u32 getTexNoOffset() const; /* 80322964 */ virtual bool getTevRegOffset() const; /* 80321FE0 */ virtual void setTexNoOffset(u32); /* 8032296C */ virtual void setTevRegOffset(u32); @@ -290,10 +309,10 @@ public: /* 80322A1C */ virtual J3DTevOrder* getTevOrder(u32); /* 80322B24 */ virtual void setTevColor(u32, J3DGXColorS10 const*); /* 80322AF8 */ virtual void setTevColor(u32, J3DGXColorS10); - /* 80322B50 */ virtual GXColorS10* getTevColor(u32); + /* 80322B50 */ virtual J3DGXColorS10* getTevColor(u32); /* 80322B90 */ virtual void setTevKColor(u32, J3DGXColor const*); /* 80322B64 */ virtual void setTevKColor(u32, J3DGXColor); - /* 80322BBC */ virtual GXColor* getTevKColor(u32); + /* 80322BBC */ virtual J3DGXColor* getTevKColor(u32); /* 80322BDC */ virtual void setTevKColorSel(u32, u8 const*); /* 80322BD0 */ virtual void setTevKColorSel(u32, u8); /* 80322BEC */ virtual bool getTevKColorSel(u32); @@ -305,8 +324,8 @@ public: /* 80322AA8 */ virtual J3DTevStage* getTevStage(u32); /* 80322AD0 */ virtual void setIndTevStage(u32, J3DIndTevStage const*); /* 80322ABC */ virtual void setIndTevStage(u32, J3DIndTevStage); - /* 80322AE4 */ virtual bool getIndTevStage(u32); - /* 80322BF8 */ virtual bool getTexNoOffset() const; + /* 80322AE4 */ virtual J3DIndTevStage* getIndTevStage(u32); + /* 80322BF8 */ virtual u32 getTexNoOffset() const; /* 80322C00 */ virtual bool getTevRegOffset() const; /* 80322C08 */ virtual void setTevRegOffset(u32); /* 80322C10 */ virtual ~J3DTevBlockPatched(); @@ -356,10 +375,10 @@ public: /* 80322078 */ virtual J3DTevOrder* getTevOrder(u32); /* 803220B8 */ virtual void setTevColor(u32, J3DGXColorS10 const*); /* 8032208C */ virtual void setTevColor(u32, J3DGXColorS10); - /* 803220E4 */ virtual GXColorS10* getTevColor(u32); + /* 803220E4 */ virtual J3DGXColorS10* getTevColor(u32); /* 80322124 */ virtual void setTevKColor(u32, J3DGXColor const*); /* 803220F8 */ virtual void setTevKColor(u32, J3DGXColor); - /* 80322150 */ virtual GXColor* getTevKColor(u32); + /* 80322150 */ virtual J3DGXColor* getTevKColor(u32); /* 80322170 */ virtual void setTevKColorSel(u32, u8 const*); /* 80322164 */ virtual void setTevKColorSel(u32, u8); /* 80322180 */ virtual bool getTevKColorSel(u32); @@ -376,11 +395,11 @@ public: /* 8032225C */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo); /* 803222DC */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*); /* 803222CC */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable); - /* 803222EC */ virtual bool getTevSwapModeTable(u32); + /* 803222EC */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32); /* 80322310 */ virtual void setIndTevStage(u32, J3DIndTevStage const*); /* 803222FC */ virtual void setIndTevStage(u32, J3DIndTevStage); - /* 80322324 */ virtual bool getIndTevStage(u32); - /* 80322338 */ virtual bool getTexNoOffset() const; + /* 80322324 */ virtual J3DIndTevStage* getIndTevStage(u32); + /* 80322338 */ virtual u32 getTexNoOffset() const; /* 80322340 */ virtual bool getTevRegOffset() const; /* 80322348 */ virtual void setTevRegOffset(u32); /* 80322350 */ virtual ~J3DTevBlock4(); @@ -432,10 +451,10 @@ public: /* 8032243C */ virtual J3DTevOrder* getTevOrder(u32); /* 8032247C */ virtual void setTevColor(u32, J3DGXColorS10 const*); /* 80322450 */ virtual void setTevColor(u32, J3DGXColorS10); - /* 803224A8 */ virtual GXColorS10* getTevColor(u32); + /* 803224A8 */ virtual J3DGXColorS10* getTevColor(u32); /* 803224E8 */ virtual void setTevKColor(u32, J3DGXColor const*); /* 803224BC */ virtual void setTevKColor(u32, J3DGXColor); - /* 80322514 */ virtual GXColor* getTevKColor(u32); + /* 80322514 */ virtual J3DGXColor* getTevKColor(u32); /* 80322534 */ virtual void setTevKColorSel(u32, u8 const*); /* 80322528 */ virtual void setTevKColorSel(u32, u8); /* 80322544 */ virtual bool getTevKColorSel(u32); @@ -452,11 +471,11 @@ public: /* 80322620 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo); /* 803226A0 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*); /* 80322690 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable); - /* 803226B0 */ virtual bool getTevSwapModeTable(u32); + /* 803226B0 */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32); /* 803226D4 */ virtual void setIndTevStage(u32, J3DIndTevStage const*); /* 803226C0 */ virtual void setIndTevStage(u32, J3DIndTevStage); - /* 803226E8 */ virtual bool getIndTevStage(u32); - /* 803226FC */ virtual bool getTexNoOffset() const; + /* 803226E8 */ virtual J3DIndTevStage* getIndTevStage(u32); + /* 803226FC */ virtual u32 getTexNoOffset() const; /* 80322704 */ virtual bool getTevRegOffset() const; /* 8032270C */ virtual void setTevRegOffset(u32); /* 80322714 */ virtual ~J3DTevBlock2(); @@ -508,10 +527,10 @@ public: /* 80321CAC */ virtual J3DTevOrder* getTevOrder(u32); /* 80321CEC */ virtual void setTevColor(u32, J3DGXColorS10 const*); /* 80321CC0 */ virtual void setTevColor(u32, J3DGXColorS10); - /* 80321D18 */ virtual GXColorS10* getTevColor(u32); + /* 80321D18 */ virtual J3DGXColorS10* getTevColor(u32); /* 80321D58 */ virtual void setTevKColor(u32, J3DGXColor const*); /* 80321D2C */ virtual void setTevKColor(u32, J3DGXColor); - /* 80321D84 */ virtual GXColor* getTevKColor(u32); + /* 80321D84 */ virtual J3DGXColor* getTevKColor(u32); /* 80321DA4 */ virtual void setTevKColorSel(u32, u8 const*); /* 80321D98 */ virtual void setTevKColorSel(u32, u8); /* 80321DB4 */ virtual bool getTevKColorSel(u32); @@ -528,11 +547,11 @@ public: /* 80321E90 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo); /* 80321F10 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*); /* 80321F00 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable); - /* 80321F20 */ virtual bool getTevSwapModeTable(u32); + /* 80321F20 */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32); /* 80321F44 */ virtual void setIndTevStage(u32, J3DIndTevStage const*); /* 80321F30 */ virtual void setIndTevStage(u32, J3DIndTevStage); - /* 80321F58 */ virtual bool getIndTevStage(u32); - /* 80321F6C */ virtual bool getTexNoOffset() const; + /* 80321F58 */ virtual J3DIndTevStage* getIndTevStage(u32); + /* 80321F6C */ virtual u32 getTexNoOffset() const; /* 80321F74 */ virtual bool getTevRegOffset() const; /* 80321F7C */ virtual void setTevRegOffset(u32); /* 80321F84 */ virtual ~J3DTevBlock16(); @@ -590,8 +609,8 @@ public: /* 8032289C */ virtual J3DTevStage* getTevStage(u32); /* 803228C4 */ virtual void setIndTevStage(u32, J3DIndTevStage const*); /* 803228B0 */ virtual void setIndTevStage(u32, J3DIndTevStage); - /* 803228D8 */ virtual bool getIndTevStage(u32); - /* 803228EC */ virtual bool getTexNoOffset() const; + /* 803228D8 */ virtual J3DIndTevStage* getIndTevStage(u32); + /* 803228EC */ virtual u32 getTexNoOffset() const; /* 803228F4 */ virtual ~J3DTevBlock1(); /* 0x08 */ u16 mTexNo[1]; @@ -639,6 +658,14 @@ struct J3DZMode { mZModeID = calcZModeID(j3dZModeTable[mZModeID * 3], j3dZModeTable[mZModeID * 3 + 1], i_enable); } + void load() const { + J3DGDSetZMode(getCompareEnable(), GXCompare(getFunc()), getUpdateEnable()); + } + + u8 getCompareEnable() const { return j3dZModeTable[mZModeID * 3 + 0]; } + u8 getFunc() const { return j3dZModeTable[mZModeID * 3 + 1]; } + u8 getUpdateEnable() const { return j3dZModeTable[mZModeID * 3 + 2]; } + /* 0x0 */ u16 mZModeID; }; @@ -667,6 +694,15 @@ struct J3DBlend : public J3DBlendInfo { J3DBlend(J3DBlendInfo const& info) : J3DBlendInfo(info) {} void setDstFactor(u8 i_factor) { mDstFactor = i_factor; } + + GXBlendMode getBlendMode() const { return (GXBlendMode)mType; } + GXBlendFactor getSrcFactor() const { return (GXBlendFactor)mSrcFactor; } + GXBlendFactor getDstFactor() const { return (GXBlendFactor)mDstFactor; } + GXLogicOp getLogicOp() const { return (GXLogicOp)mOp; } + + void load(u8 ditherEnable) { + J3DGDSetBlendMode(getBlendMode(), getSrcFactor(), getDstFactor(), getLogicOp(), ditherEnable); + } }; extern const J3DFogInfo j3dDefaultFogInfo; @@ -679,6 +715,12 @@ struct J3DFog : public J3DFogInfo { J3DFog() { *(J3DFogInfo*)this = j3dDefaultFogInfo; } J3DFogInfo* getFogInfo() { return this; } void setFogInfo(J3DFogInfo info) { *(J3DFogInfo*)this = info; } + void setFogInfo(J3DFogInfo* info) { *(J3DFogInfo*)this = *info; } + + void load() const { + J3DGDSetFog(GXFogType(mType), mStartZ, mEndZ, mNearZ, mFarZ, mColor); + J3DGDSetFogRangeAdj(mAdjEnable, mCenter, (GXFogAdjTable*)&mFogAdjTable); + } }; /** @@ -731,6 +773,16 @@ struct J3DAlphaComp { // mID = calcAlphaCmpID(param_1.field_0x0, param_1.mRef0, param_1.mRef1); } + GXCompare getComp0() const { return GXCompare(j3dAlphaCmpTable[mID * 3]); } + GXAlphaOp getOp() const { return GXAlphaOp(j3dAlphaCmpTable[mID * 3 + 1]); } + GXCompare getComp1() const { return GXCompare(j3dAlphaCmpTable[mID * 3 + 2]); } + u8 getRef0() const { return mRef0; } + u8 getRef1() const { return mRef1; } + + void load() { + J3DGDSetAlphaCompare(getComp0(), getRef0(), getOp(), getComp1(), getRef1()); + } + /* 0x00 */ u16 mID; /* 0x02 */ u8 mRef0; /* 0x03 */ u8 mRef1; @@ -764,11 +816,11 @@ public: /* 8000DF44 */ virtual J3DZMode* getZMode(); /* 80317378 */ virtual void setZCompLoc(u8 const*); /* 8000E010 */ virtual void setZCompLoc(u8); - /* 8000DF3C */ virtual bool getZCompLoc() const; + /* 8000DF3C */ virtual u8 getZCompLoc() const; /* 80317380 */ virtual void setDither(u8 const*); /* 8031737C */ virtual void setDither(u8); - /* 80317384 */ virtual bool getDither() const; - /* 8031738C */ virtual bool getFogOffset() const; + /* 80317384 */ virtual u8 getDither() const; + /* 8031738C */ virtual u32 getFogOffset() const; /* 80317394 */ virtual void setFogOffset(u32); virtual ~J3DPEBlock() {} }; @@ -852,11 +904,11 @@ public: /* 80321A20 */ virtual J3DZMode* getZMode(); /* 80321A30 */ virtual void setZCompLoc(u8 const*); /* 80321A28 */ virtual void setZCompLoc(u8); - /* 80321A3C */ virtual bool getZCompLoc() const; + /* 80321A3C */ virtual u8 getZCompLoc() const; /* 80321A4C */ virtual void setDither(u8 const*); /* 80321A44 */ virtual void setDither(u8); - /* 80321A58 */ virtual bool getDither() const; - /* 80321A60 */ virtual bool getFogOffset() const; + /* 80321A58 */ virtual u8 getDither() const; + /* 80321A60 */ virtual u32 getFogOffset() const; /* 80321A68 */ virtual void setFogOffset(u32); /* 80321A70 */ virtual ~J3DPEBlockFull(); @@ -897,10 +949,10 @@ public: /* 80321B84 */ virtual J3DZMode* getZMode(); /* 80321B94 */ virtual void setZCompLoc(u8 const*); /* 80321B8C */ virtual void setZCompLoc(u8); - /* 80321BA0 */ virtual bool getZCompLoc() const; + /* 80321BA0 */ virtual u8 getZCompLoc() const; /* 80321BB0 */ virtual void setDither(u8 const*); /* 80321BA8 */ virtual void setDither(u8); - /* 80321BBC */ virtual bool getDither() const; + /* 80321BBC */ virtual u8 getDither() const; /* 80321BC4 */ virtual ~J3DPEBlockFogOff(); /* 0x04 */ J3DAlphaComp mAlphaComp; @@ -931,6 +983,14 @@ struct J3DIndTexCoordScale : public J3DIndTexCoordScaleInfo { /* 8000E0E4 */ J3DIndTexCoordScale() : J3DIndTexCoordScaleInfo(j3dDefaultIndTexCoordScaleInfo) {} J3DIndTexCoordScale(J3DIndTexCoordScaleInfo const& info) : J3DIndTexCoordScaleInfo(info) {} /* 8000E024 */ ~J3DIndTexCoordScale() {} + GXIndTexScale getScaleS() { return (GXIndTexScale)mScaleS; } + GXIndTexScale getScaleT() { return (GXIndTexScale)mScaleT; } + + J3DIndTexCoordScale& operator=(const J3DIndTexCoordScale& other) { + //__memcpy(this, &other, sizeof(J3DIndTexCoordScaleInfo)); + *(u32*)this = *(u32*)&other; + return *this; + } }; // Size: 0x4 extern J3DIndTexMtxInfo const j3dDefaultIndTexMtxInfo; @@ -943,6 +1003,9 @@ struct J3DIndTexMtx : public J3DIndTexMtxInfo { /* 8000E0F0 */ J3DIndTexMtx() { *(J3DIndTexMtxInfo*)this = j3dDefaultIndTexMtxInfo; } J3DIndTexMtx(J3DIndTexMtxInfo const& info) { *(J3DIndTexMtxInfo*)this = info; } /* 8000E064 */ ~J3DIndTexMtx() {} + void load(u32 param_1) { + J3DGDSetIndTexMtx((GXIndTexMtxID)(param_1 + 1), field_0x0, field_0x18); + } }; // Size: 0x1C /** @@ -950,8 +1013,8 @@ struct J3DIndTexMtx : public J3DIndTexMtxInfo { * */ struct J3DIndTexOrderInfo { - /* 0x0 */ u8 mMap; - /* 0x1 */ u8 mCoord; + /* 0x0 */ u8 mCoord; + /* 0x1 */ u8 mMap; /* 0x2 */ u8 field_0x2; /* 0x3 */ u8 field_0x3; }; // Size: 0x04 @@ -965,6 +1028,14 @@ extern const J3DIndTexOrderInfo j3dDefaultIndTexOrderNull; struct J3DIndTexOrder : public J3DIndTexOrderInfo { /* 8000E128 */ J3DIndTexOrder() : J3DIndTexOrderInfo(j3dDefaultIndTexOrderNull) {} J3DIndTexOrder(J3DIndTexOrderInfo const& info) : J3DIndTexOrderInfo(info) {} + GXTexMapID getMap() { return (GXTexMapID)mMap; } + GXTexCoordID getCoord() { return (GXTexCoordID)mCoord; } + + J3DIndTexOrder& operator=(const J3DIndTexOrder& other) { + //__memcpy(this, &other, sizeof(J3DIndTexOrderInfo)); + *(u32*)this = *(u32*)&other; + return *this; + } }; // Size: 0x04 /** @@ -982,14 +1053,14 @@ public: /* 8000DF7C */ virtual u8 getIndTexStageNum() const; /* 80317410 */ virtual void setIndTexOrder(u32, J3DIndTexOrder); /* 8031740C */ virtual void setIndTexOrder(u32, J3DIndTexOrder const*); - /* 8000DF74 */ virtual bool getIndTexOrder(u32); + /* 8000DF74 */ virtual J3DIndTexOrder* getIndTexOrder(u32); /* 80317414 */ virtual void setIndTexMtx(u32, J3DIndTexMtx const*); /* 8000E060 */ virtual void setIndTexMtx(u32, J3DIndTexMtx); - /* 8000DF6C */ virtual bool getIndTexMtx(u32); + /* 8000DF6C */ virtual J3DIndTexMtx* getIndTexMtx(u32); /* 8000E020 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale); /* 80317418 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*); - /* 8000DF64 */ virtual bool getIndTexCoordScale(u32); - /* 8031726C */ virtual ~J3DIndBlock(); + /* 8000DF64 */ virtual J3DIndTexCoordScale* getIndTexCoordScale(u32); + /* 8031726C */ virtual ~J3DIndBlock() {} }; /** @@ -1025,13 +1096,13 @@ public: /* 803233A4 */ virtual u8 getIndTexStageNum() const; /* 803233AC */ virtual void setIndTexOrder(u32, J3DIndTexOrder); /* 803233C0 */ virtual void setIndTexOrder(u32, J3DIndTexOrder const*); - /* 803233D4 */ virtual bool getIndTexOrder(u32); + /* 803233D4 */ virtual J3DIndTexOrder* getIndTexOrder(u32); /* 8032341C */ virtual void setIndTexMtx(u32, J3DIndTexMtx const*); /* 803233E8 */ virtual void setIndTexMtx(u32, J3DIndTexMtx); - /* 80323450 */ virtual bool getIndTexMtx(u32); + /* 80323450 */ virtual J3DIndTexMtx* getIndTexMtx(u32); /* 80323478 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*); /* 80323464 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale); - /* 8032348C */ virtual bool getIndTexCoordScale(u32); + /* 8032348C */ virtual J3DIndTexCoordScale* getIndTexCoordScale(u32); /* 803234A0 */ virtual ~J3DIndBlockFull(); /* 0x04 */ u8 mIndTexStageNum; @@ -1056,9 +1127,12 @@ struct J3DColorChanInfo { extern const J3DColorChanInfo j3dDefaultColorChanInfo; -/* static inline u32 setChanCtrlMacro(u8 param_0, GXColorSrc param_1, GXColorSrc param_2, u32 param_3, GXDiffuseFn param_4, GXAttnFn param_5) { - -} */ +// static inline u32 setChanCtrlMacro(u8 enable, GXColorSrc ambSrc, GXColorSrc matSrc, u32 lightMask, +// GXDiffuseFn diffuseFn, GXAttnFn attnFn) { +// return (matSrc << 0) | enable << 1 | (lightMask & 0x0F) << 2 | ambSrc << 6 | +// ((attnFn == GX_AF_SPEC) ? GX_DF_NONE : diffuseFn) << 7 | (attnFn != GX_AF_NONE) << 9 | +// (attnFn != GX_AF_SPEC) << 10 | (lightMask >> 4 & 0x0F) << 11; +// } /** * @ingroup jsystem-j3d @@ -1100,6 +1174,20 @@ struct J3DColorChan { mColorChanID = (mColorChanID & ~0x7800) | ((param_1 & 0xf0) << 7); } + // u8 getEnable() { return (mColorChanID & 2) >> 1; } + // GXColorSrc getAmbSrc() { return (GXColorSrc)((mColorChanID & 0x40) >> 6); } + // GXColorSrc getMatSrc() { return (GXColorSrc)(mColorChanID & 1); } + // GXDiffuseFn getDiffuseFn() { return (GXDiffuseFn) ((mColorChanID & 0x180) >> 7); } + // GXAttnFn getAttnFn() { + // u8 AttnArr[] = {2,0,2,1}; + // return (GXAttnFn)AttnArr[(mColorChanID & 0x600) >> 9]; + // } + + // void load() { + // J3DGDWrite_u32(setChanCtrlMacro(getEnable(), getAmbSrc(), getMatSrc(), getLightMask(), + // getDiffuseFn(), getAttnFn())); + // } + /* 0x0 */ u16 mColorChanID; }; @@ -1123,10 +1211,10 @@ public: virtual u32 getType() = 0; /* 80317448 */ virtual void setMatColor(u32, J3DGXColor const*); /* 8000E0DC */ virtual void setMatColor(u32, J3DGXColor); - /* 8000E000 */ virtual _GXColor* getMatColor(u32); + /* 8000E000 */ virtual J3DGXColor* getMatColor(u32); /* 801A4C0C */ virtual void setAmbColor(u32, J3DGXColor const*); /* 8000E0D4 */ virtual void setAmbColor(u32, J3DGXColor); - /* 8000DFF0 */ virtual bool getAmbColor(u32); + /* 8000DFF0 */ virtual J3DGXColor* getAmbColor(u32); /* 8000E0E0 */ virtual void setColorChanNum(u8); /* 8031744C */ virtual void setColorChanNum(u8 const*); /* 8000E008 */ virtual u8 getColorChanNum() const; @@ -1138,8 +1226,8 @@ public: /* 80317460 */ virtual void setCullMode(u8 const*); /* 8031745C */ virtual void setCullMode(u8); /* 80317328 */ virtual s32 getCullMode() const; - /* 80317464 */ virtual bool getMatColorOffset() const; - /* 8031746C */ virtual bool getColorChanOffset() const; + /* 80317464 */ virtual u32 getMatColorOffset() const; + /* 8031746C */ virtual u32 getColorChanOffset() const; /* 80317474 */ virtual void setMatColorOffset(u32); /* 80317478 */ virtual void setColorChanOffset(u32); /* 80317138 */ virtual ~J3DColorBlock() {} @@ -1179,10 +1267,10 @@ public: /* 80322E80 */ virtual u32 getType(); /* 80322EB8 */ virtual void setMatColor(u32, J3DGXColor const*); /* 80322E8C */ virtual void setMatColor(u32, J3DGXColor); - /* 80322EE4 */ virtual GXColor* getMatColor(u32); + /* 80322EE4 */ virtual J3DGXColor* getMatColor(u32); /* 80322F24 */ virtual void setAmbColor(u32, J3DGXColor const*); /* 80322EF8 */ virtual void setAmbColor(u32, J3DGXColor); - /* 80322F50 */ virtual bool getAmbColor(u32); + /* 80322F50 */ virtual J3DGXColor* getAmbColor(u32); /* 80322F70 */ virtual void setColorChanNum(u8); /* 80322F64 */ virtual void setColorChanNum(u8 const*); /* 80322F78 */ virtual u8 getColorChanNum() const; @@ -1194,8 +1282,8 @@ public: /* 80322FE4 */ virtual void setCullMode(u8 const*); /* 80322FDC */ virtual void setCullMode(u8); /* 80322FF0 */ virtual s32 getCullMode() const; - /* 80322FF8 */ virtual bool getMatColorOffset() const; - /* 80323000 */ virtual bool getColorChanOffset() const; + /* 80322FF8 */ virtual u32 getMatColorOffset() const; + /* 80323000 */ virtual u32 getColorChanOffset() const; /* 80323008 */ virtual void setMatColorOffset(u32); /* 80323010 */ virtual void setColorChanOffset(u32); /* 80323018 */ virtual ~J3DColorBlockLightOn(); @@ -1233,7 +1321,7 @@ public: /* 80323560 */ virtual u32 getType(); /* 80323184 */ virtual void setMatColor(u32, J3DGXColor const*); /* 80323158 */ virtual void setMatColor(u32, J3DGXColor); - /* 803231B0 */ virtual GXColor* getMatColor(u32); + /* 803231B0 */ virtual J3DGXColor* getMatColor(u32); /* 803231D0 */ virtual void setColorChanNum(u8); /* 803231C4 */ virtual void setColorChanNum(u8 const*); /* 803231D8 */ virtual u8 getColorChanNum() const; @@ -1243,11 +1331,11 @@ public: /* 80323224 */ virtual void setCullMode(u8 const*); /* 8032321C */ virtual void setCullMode(u8); /* 80323230 */ virtual s32 getCullMode() const; - /* 80323238 */ virtual bool getMatColorOffset() const; - /* 80323240 */ virtual bool getColorChanOffset() const; + /* 80323238 */ virtual u32 getMatColorOffset() const; + /* 80323240 */ virtual u32 getColorChanOffset() const; /* 80323248 */ virtual void setMatColorOffset(u32); /* 80323250 */ virtual void setColorChanOffset(u32); - /* 803170DC */ virtual ~J3DColorBlockLightOff(); + /* 803170DC */ virtual ~J3DColorBlockLightOff() {} /* 0x04 */ J3DGXColor mMatColor[2]; /* 0x0C */ u8 mColorChanNum; @@ -1274,7 +1362,7 @@ public: /* 80323074 */ virtual u32 getType(); /* 803230AC */ virtual void setAmbColor(u32, J3DGXColor const*); /* 80323080 */ virtual void setAmbColor(u32, J3DGXColor); - /* 803230D8 */ virtual bool getAmbColor(u32); + /* 803230D8 */ virtual J3DGXColor* getAmbColor(u32); /* 803230EC */ virtual ~J3DColorBlockAmbientOn(); /* 0x20 */ J3DGXColor mAmbColor[2]; diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h index 94a4ee3fec5..499450147c2 100644 --- a/include/JSystem/J3DGraphBase/J3DMaterial.h +++ b/include/JSystem/J3DGraphBase/J3DMaterial.h @@ -65,8 +65,8 @@ public: } J3DNBTScale* getNBTScale() const { return mTexGenBlock->getNBTScale(); } u16 getTexNo(u32 idx) const { return mTevBlock->getTexNo(idx); } - GXColor* getTevKColor(u32 param_0) { return mTevBlock->getTevKColor(param_0); } - GXColorS10* getTevColor(u32 param_0) { return mTevBlock->getTevColor(param_0); } + J3DGXColor* getTevKColor(u32 param_0) { return mTevBlock->getTevKColor(param_0); } + J3DGXColorS10* getTevColor(u32 param_0) { return mTevBlock->getTevColor(param_0); } J3DFog* getFog() { return mPEBlock->getFog(); } J3DTexMtx* getTexMtx(u32 idx) { return mTexGenBlock->getTexMtx(idx); } u16 getIndex() { return mIndex; } diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h index c019217e5d6..80f1cdabe18 100644 --- a/include/JSystem/J3DGraphBase/J3DStruct.h +++ b/include/JSystem/J3DGraphBase/J3DStruct.h @@ -71,6 +71,21 @@ struct J3DTextureSRTInfo { } }; // Size: 0x14 +enum J3DTexMtxMode { + J3DTexMtxMode_None, + J3DTexMtxMode_EnvmapBasic, + J3DTexMtxMode_ProjmapBasic, + J3DTexMtxMode_ViewProjmapBasic, + J3DTexMtxMode_Unknown4, + J3DTexMtxMode_Unknown5, + J3DTexMtxMode_EnvmapOld, + J3DTexMtxMode_Envmap, + J3DTexMtxMode_Projmap, + J3DTexMtxMode_ViewProjmap, + J3DTexMtxMode_EnvmapOldEffectMtx, + J3DTexMtxMode_EnvmapEffectMtx, +}; + /** * @ingroup jsystem-j3d * @@ -105,15 +120,15 @@ struct J3DIndTexMtxInfo { struct J3DFogInfo { /* 80325800 */ J3DFogInfo& operator=(J3DFogInfo const&); - /* 0x00 */ u8 field_0x0; - /* 0x01 */ u8 field_0x1; - /* 0x02 */ u16 field_0x2; - /* 0x04 */ f32 field_0x4; - /* 0x08 */ f32 field_0x8; - /* 0x0C */ f32 field_0xc; - /* 0x10 */ f32 field_0x10; - /* 0x14 */ GXColor field_0x14; - /* 0x18 */ GXFogAdjTable field_0x18; + /* 0x00 */ u8 mType; + /* 0x01 */ u8 mAdjEnable; + /* 0x02 */ u16 mCenter; + /* 0x04 */ f32 mStartZ; + /* 0x08 */ f32 mEndZ; + /* 0x0C */ f32 mNearZ; + /* 0x10 */ f32 mFarZ; + /* 0x14 */ GXColor mColor; + /* 0x18 */ GXFogAdjTable mFogAdjTable; }; // Size: 0x2C /** diff --git a/include/JSystem/J3DGraphBase/J3DTevs.h b/include/JSystem/J3DGraphBase/J3DTevs.h index a7b668bd2c6..f27215544fb 100644 --- a/include/JSystem/J3DGraphBase/J3DTevs.h +++ b/include/JSystem/J3DGraphBase/J3DTevs.h @@ -2,6 +2,8 @@ #define J3DTEVS_H #include "dolphin/types.h" +#include "dolphin/gx/GXStruct.h" +#include "JSystem/J3DGraphBase/J3DGD.h" /** * @ingroup jsystem-j3d @@ -126,6 +128,21 @@ struct J3DTevStage { void setRasSel(u8 ras_sel) { mTevSwapModeInfo = (mTevSwapModeInfo & ~3) | ras_sel; } void setTexSel(u8 tex_sel) { mTevSwapModeInfo = (mTevSwapModeInfo & ~0xc) | (tex_sel << 2); } + void load(u32 param_1) { + J3DGDWriteBPCmd(*(u32*)&field_0x0); + J3DGDWriteBPCmd(*(u32*)&field_0x4); + } + + J3DTevStage& operator=(const J3DTevStage& other) { + mTevColorOp = other.mTevColorOp; + mTevColorAB = other.mTevColorAB; + mTevColorCD = other.mTevColorCD; + mTevAlphaOp = other.mTevAlphaOp; + mTevAlphaAB = other.mTevAlphaAB; + mTevSwapModeInfo = other.mTevSwapModeInfo; + return *this; + } + /* 0x0 */ u8 field_0x0; /* 0x1 */ u8 mTevColorOp; /* 0x2 */ u8 mTevColorAB; @@ -183,6 +200,10 @@ struct J3DIndTevStage { void setLod(u8 lod) { mInfo = (mInfo & ~0x80000) | (lod << 19); } void setAlphaSel(u8 alphaSel) { mInfo = (mInfo & ~0x180) | (alphaSel << 7); } + void load(u32 param_1) { + J3DGDWriteBPCmd(mInfo | (param_1 + 0x10) * 0x1000000); + } + /* 0x0 */ u32 mInfo; }; @@ -195,9 +216,9 @@ struct J3DTevOrderInfo { *(u32*) this = *(u32*)&other; } - /* 0x0 */ u8 field_0x0; + /* 0x0 */ u8 mTexCoord; /* 0x1 */ u8 mTexMap; - /* 0x2 */ u8 field_0x2; + /* 0x2 */ u8 mColorChan; /* 0x3 */ u8 field_0x3; // Maybe padding }; @@ -210,10 +231,13 @@ extern const J3DTevOrderInfo j3dDefaultTevOrderInfoNull; struct J3DTevOrder : public J3DTevOrderInfo { /* 8000E140 */ J3DTevOrder() : J3DTevOrderInfo(j3dDefaultTevOrderInfoNull) {} J3DTevOrder(const J3DTevOrderInfo& info) : J3DTevOrderInfo(info) {} + J3DTevOrderInfo& getTevOrderInfo() { return *this; } u8 getTexMap() { return mTexMap; } }; +extern u8 j3dTevSwapTableTable[1024]; + /** * @ingroup jsystem-j3d * @@ -221,18 +245,33 @@ struct J3DTevOrder : public J3DTevOrderInfo { struct J3DTevSwapModeTable { /* 8000E134 */ J3DTevSwapModeTable(); J3DTevSwapModeTable(J3DTevSwapModeTableInfo const& info) { - field_0x0 = calcTevSwapTableID(info.field_0x0, info.field_0x1, info.field_0x2, info.field_0x3); + mIdx = calcTevSwapTableID(info.field_0x0, info.field_0x1, info.field_0x2, info.field_0x3); } u8 calcTevSwapTableID(u8 param_0, u8 param_1, u8 param_2, u8 param_3) { return 0x40 * param_0 + 0x10 * param_1 + 4 * param_2 + param_3; } - /* 0x0 */ u8 field_0x0; + u8 getR() { return j3dTevSwapTableTable[mIdx * 4]; } + u8 getG() { return j3dTevSwapTableTable[mIdx * 4 + 1]; } + u8 getB() { return j3dTevSwapTableTable[mIdx * 4 + 2]; } + u8 getA() { return j3dTevSwapTableTable[mIdx * 4 + 3]; } + + /* 0x0 */ u8 mIdx; }; // Size: 0x1 +extern const GXColor j3dDefaultColInfo; +extern const GXColor j3dDefaultAmbInfo; +extern const GXColorS10 j3dDefaultTevColor; +extern const GXColor j3dDefaultTevKColor; +extern u8 j3dAlphaCmpTable[768]; + struct J3DNBTScale; struct J3DTexCoord; void loadNBTScale(J3DNBTScale& param_0); void loadTexCoordGens(u32 param_0, J3DTexCoord* param_1); +void loadTexNo(u32 param_0, u16 const& param_1); +void patchTexNo_PtrToIdx(u32 texID, u16 const& idx); +bool isTexNoReg(void* param_0); +u16 getTexNoReg(void* param_0); #endif /* J3DTEVS_H */ diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h index 479d674ed88..ef3838def39 100644 --- a/include/JSystem/J3DGraphBase/J3DTexture.h +++ b/include/JSystem/J3DGraphBase/J3DTexture.h @@ -96,6 +96,11 @@ struct J3DTexCoord : public J3DTexCoordInfo { u8 getTexGenMtx() { return mTexGenMtx & 0xff; } u16 getTexMtxReg() { return mTexMtxReg & 0xff; } void setTexGenMtx(u8 param_1) { mTexGenMtx = param_1; } + J3DTexCoord& operator=(const J3DTexCoord& other) { + // Fake match (__memcpy or = doesn't match) + *(u32*)this = *(u32*)&other; + return *this; + } void resetTexMtxReg() { mTexMtxReg = mTexGenMtx; diff --git a/libs/JSystem/J3DGraphBase/J3DGD.cpp b/libs/JSystem/J3DGraphBase/J3DGD.cpp index 899ecb69222..27744a3c92d 100644 --- a/libs/JSystem/J3DGraphBase/J3DGD.cpp +++ b/libs/JSystem/J3DGraphBase/J3DGD.cpp @@ -1,74 +1,11 @@ // -// Generated By: dol2asm -// Translation Unit: J3DGD +// J3DGD // #include "JSystem/J3DGraphBase/J3DGD.h" -#include "dol2asm.h" #include "dolphin/gd.h" #include "dolphin/os.h" -// -// Forward References: -// - -extern "C" void J3DGDSetGenMode__FUcUcUcUc11_GXCullMode(); -extern "C" void J3DGDSetGenMode_3Param__FUcUcUc(); -extern "C" void J3DGDSetLightAttn__F10_GXLightIDffffff(); -extern "C" void J3DGDSetLightColor__F10_GXLightID8_GXColor(); -extern "C" void J3DGDSetLightPos__F10_GXLightIDfff(); -extern "C" void J3DGDSetLightDir__F10_GXLightIDfff(); -extern "C" void J3DGDSetVtxAttrFmtv__F9_GXVtxFmtPC17_GXVtxAttrFmtListb(); -extern "C" void J3DGDSetTexCoordGen__F13_GXTexGenType12_GXTexGenSrc(); -extern "C" void J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc(); -extern "C" void -J3DGDSetTexLookupMode__F11_GXTexMapID14_GXTexWrapMode14_GXTexWrapMode12_GXTexFilter12_GXTexFilterfffUcUc13_GXAnisotropy(); -extern "C" void J3DGDSetTexImgAttr__F11_GXTexMapIDUsUs9_GXTexFmt(); -extern "C" void J3DGDSetTexImgPtr__F11_GXTexMapIDPv(); -extern "C" void J3DGDSetTexImgPtrRaw__F11_GXTexMapIDUl(); -extern "C" void J3DGDSetTexTlut__F11_GXTexMapIDUl10_GXTlutFmt(); -extern "C" void J3DGDLoadTlut__FPvUl11_GXTlutSize(); -extern "C" void J3DGDSetIndTexMtx__F14_GXIndTexMtxIDPA3_fSc(); -extern "C" void -J3DGDSetIndTexCoordScale__F16_GXIndTexStageID14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale(); -extern "C" void -J3DGDSetIndTexOrder__FUl13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID(); -extern "C" void -J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID(); -extern "C" void J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor(); -extern "C" void J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10(); -extern "C" void J3DGDSetFog__F10_GXFogTypeffff8_GXColor(); -extern "C" void J3DGDSetFogRangeAdj__FUcUsP14_GXFogAdjTable(); -extern "C" void J3DFifoLoadPosMtxImm__FPA4_fUl(); -extern "C" void J3DFifoLoadNrmMtxImm__FPA4_fUl(); -extern "C" void J3DFifoLoadNrmMtxImm3x3__FPA3_fUl(); -extern "C" void J3DFifoLoadNrmMtxToTexMtx__FPA4_fUl(); -extern "C" void J3DFifoLoadNrmMtxToTexMtx3x3__FPA3_fUl(); -extern "C" void J3DFifoLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize(); - -// -// External References: -// - -extern "C" void GDOverflowed(); -extern "C" void __cvt_fp2unsigned(); -extern "C" void _savegpr_14(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_14(); -extern "C" void _restgpr_23(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_29(); - -// -// Declarations: -// - /* 8030D098-8030D210 3079D8 0178+00 0/0 1/1 0/0 .text J3DGDSetGenMode__FUcUcUcUc11_GXCullMode */ void J3DGDSetGenMode(u8 texGenNum, u8 colorChanNum, u8 tevStageNum, u8 indTexStageNum, GXCullMode cullMode) { @@ -706,18 +643,17 @@ void J3DFifoLoadNrmMtxToTexMtx3x3(Mtx3P mtx, u32 addr) { } /* 8045093C-80450944 0003BC 0008+00 1/1 0/0 0/0 .sdata J3DTexImage1Ids */ -SECTION_SDATA static u8 J3DTexImage1Ids[8] = { +static u8 J3DTexImage1Ids[8] = { 0x8C, 0x8D, 0x8E, 0x8F, 0xAC, 0xAD, 0xAE, 0xAF, }; /* 80450944-8045094C 0003C4 0008+00 1/1 0/0 0/0 .sdata J3DTexImage2Ids */ -SECTION_SDATA static u8 J3DTexImage2Ids[8] = { +static u8 J3DTexImage2Ids[8] = { 0x90, 0x91, 0x92, 0x93, 0xB0, 0xB1, 0xB2, 0xB3, }; /* 8030FD68-8030FDE8 30A6A8 0080+00 0/0 1/1 0/0 .text * J3DFifoLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize */ -#ifdef NONMATCHING void J3DFifoLoadTexCached(GXTexMapID id, u32 param_1, GXTexCacheSize param_2, u32 param_3, GXTexCacheSize param_4) { J3DFifoLoadBPCmd(param_1 >> 5 | (param_2 + 3) << 0xf | (param_2 + 3) << 0x12 | @@ -727,14 +663,3 @@ void J3DFifoLoadTexCached(GXTexMapID id, u32 param_1, GXTexCacheSize param_2, u3 J3DTexImage2Ids[id] << 0x18); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DFifoLoadTexCached(_GXTexMapID param_0, u32 param_1, _GXTexCacheSize param_2, - u32 param_3, _GXTexCacheSize param_4) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize.s" -} -#pragma pop -#endif diff --git a/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp b/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp index 097a4c8b674..04c61f028cb 100644 --- a/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -6,8 +6,10 @@ #include "JSystem/J3DGraphBase/J3DMatBlock.h" #include "JSystem/J3DGraphBase/J3DGD.h" #include "JSystem/J3DGraphBase/J3DSys.h" +#include "JSystem/J3DGraphBase/J3DTransform.h" #include "dol2asm.h" #include "dolphin/os.h" +#include "string.h" inline void loadMatColors(const J3DGXColor* color) { J3DGDWriteXFCmdHdr(0x100C, 2); @@ -488,7 +490,7 @@ extern "C" void setTevOrder__11J3DTevBlockFUlPC11J3DTevOrder(); extern "C" void setTevStageNum__11J3DTevBlockFPCUc(); extern "C" void setTevStage__11J3DTevBlockFUlPC11J3DTevStage(); extern "C" void setIndTevStage__11J3DTevBlockFUlPC14J3DIndTevStage(); -extern "C" bool getTexNoOffset__11J3DTevBlockCFv(); +extern "C" u32 getTexNoOffset__11J3DTevBlockCFv(); extern "C" void getType__21J3DColorBlockLightOffFv(); extern "C" void __sinit_J3DMatBlock_cpp(); extern "C" extern char const* const J3DMatBlock__stringBase0; @@ -497,7 +499,6 @@ extern "C" extern char const* const J3DMatBlock__stringBase0; // External References: // -SECTION_INIT void memcpy(); extern "C" void patchTexNoAndTexCoordScale__11J3DTevBlockFv(); extern "C" void patch__10J3DPEBlockFv(); extern "C" void patch__11J3DTevBlockFv(); @@ -604,53 +605,52 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern u8 const j3dDefaultMtx[48]; extern "C" extern void* __vt__10J3DPEBlock[31]; extern "C" extern void* __vt__11J3DIndBlock[19]; extern "C" extern void* __vt__14J3DTexGenBlock[27]; extern "C" extern void* __vt__13J3DColorBlock[36]; extern "C" u8 sTexCoordScaleTable__6J3DSys[64 + 4 /* padding */]; -extern "C" extern u8 j3dTevSwapTableTable[1024]; extern "C" extern u8 j3dAlphaCmpTable[768]; extern "C" extern u8 j3dZModeTable[96]; -extern "C" extern GXColor j3dDefaultColInfo; -extern "C" extern u32 j3dDefaultAmbInfo; -extern "C" extern GXColorS10 j3dDefaultTevColor; -extern "C" extern GXColor j3dDefaultTevKColor; - -// -// Declarations: -// /* 8031747C-803174DC 311DBC 0060+00 0/0 1/1 0/0 .text initialize__21J3DColorBlockLightOffFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOff::initialize() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__21J3DColorBlockLightOffFv.s" +void J3DColorBlockLightOff::initialize() { + mColorChanNum = 0; + for (u32 i = 0; i < ARRAY_SIZE(mMatColor); i++) { + mMatColor[i] = j3dDefaultColInfo; + } + mMatColorOffset = 0; + mColorChanOffset = 0; } -#pragma pop /* 803174DC-80317580 311E1C 00A4+00 0/0 1/1 0/0 .text initialize__22J3DColorBlockAmbientOnFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockAmbientOn::initialize() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__22J3DColorBlockAmbientOnFv.s" +void J3DColorBlockAmbientOn::initialize() { + mColorChanNum = 0; + for (u32 i = 0; i < ARRAY_SIZE(mMatColor); i++) { + mMatColor[i] = j3dDefaultColInfo; + } + for (u32 i = 0; i < ARRAY_SIZE(mAmbColor); i++) { + mAmbColor[i] = j3dDefaultAmbInfo; + } + mMatColorOffset = 0; + mColorChanOffset = 0; } -#pragma pop /* 80317580-80317644 311EC0 00C4+00 0/0 1/1 0/0 .text initialize__20J3DColorBlockLightOnFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOn::initialize() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__20J3DColorBlockLightOnFv.s" +void J3DColorBlockLightOn::initialize() { + mColorChanNum = 0; + for (u32 i = 0; i < ARRAY_SIZE(mMatColor); i++) { + mMatColor[i] = j3dDefaultColInfo; + } + for (u32 i = 0; i < ARRAY_SIZE(mAmbColor); i++) { + mAmbColor[i] = j3dDefaultAmbInfo; + } + for (u32 i = 0; i < ARRAY_SIZE(mLight); i++) { + mLight[i] = NULL; + } + mMatColorOffset = 0; + mColorChanOffset = 0; } -#pragma pop /* 80317644-80317674 311F84 0030+00 0/0 2/2 0/0 .text initialize__21J3DTexGenBlockPatchedFv */ void J3DTexGenBlockPatched::initialize() { @@ -684,14 +684,27 @@ void J3DTevBlockNull::initialize() { /* 803176E0-803177E8 312020 0108+00 0/0 1/1 0/0 .text initialize__18J3DTevBlockPatchedFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlockPatched::initialize() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__18J3DTevBlockPatchedFv.s" +void J3DTevBlockPatched::initialize() { + for (u32 i = 0; i < ARRAY_SIZE(mTexNo); i++) { + mTexNo[i] = 0xFFFF; + } + for (u32 i = 0; i < ARRAY_SIZE(mTevStage); i++) { + mTevStage[i].field_0x0 = 0xC0 + i * 2; + mTevStage[i].field_0x4 = 0xC1 + i * 2; + } + for (u32 i = 0; i < 3; i++) { + mTevColor[i] = j3dDefaultTevColor; + } + for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) { + mTevKColor[i] = j3dDefaultTevKColor; + } + for (u32 i = 0; i < ARRAY_SIZE(mTevKColorSel); i++) { + mTevKColorSel[i] = GX_TEV_KCSEL_K0; + } + mTevStageNum = 1; + mTexNoOffset = 0; + mTevRegOffset = 0; } -#pragma pop /* 803177E8-80317810 312128 0028+00 0/0 1/1 0/0 .text initialize__12J3DTevBlock1Fv */ void J3DTevBlock1::initialize() { @@ -702,34 +715,90 @@ void J3DTevBlock1::initialize() { } /* 80317810-803178EC 312150 00DC+00 0/0 1/1 0/0 .text initialize__12J3DTevBlock2Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock2::initialize() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__12J3DTevBlock2Fv.s" +void J3DTevBlock2::initialize() { + mTexNo[0] = 0xFFFF; + mTexNo[1] = 0xFFFF; + mTevStageNum = 1; + + mTevStage[0].field_0x0 = 0xC0; + mTevStage[0].field_0x4 = 0xC1; + mTevStage[1].field_0x0 = 0xC2; + mTevStage[1].field_0x4 = 0xC3; + mTevKColorSel[0] = GX_TEV_KCSEL_K0; + mTevKColorSel[1] = GX_TEV_KCSEL_K0; + mTevKAlphaSel[0] = GX_TEV_KASEL_K0_A; + mTevKAlphaSel[1] = GX_TEV_KASEL_K0_A; + + for (u32 i = 0; i < 3; i++) { + mTevColor[i] = j3dDefaultTevColor; + } + for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) { + mTevKColor[i] = j3dDefaultTevKColor; + } + mTexNoOffset = 0; + mTevRegOffset = 0; } -#pragma pop /* 803178EC-80317A00 31222C 0114+00 0/0 1/1 0/0 .text initialize__12J3DTevBlock4Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock4::initialize() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__12J3DTevBlock4Fv.s" +void J3DTevBlock4::initialize() { + mTexNo[0] = 0xFFFF; + mTexNo[1] = 0xFFFF; + mTexNo[2] = 0xFFFF; + mTexNo[3] = 0xFFFF; + mTevStageNum = 1; + + mTevStage[0].field_0x0 = 0xC0; + mTevStage[0].field_0x4 = 0xC1; + mTevStage[1].field_0x0 = 0xC2; + mTevStage[1].field_0x4 = 0xC3; + mTevStage[2].field_0x0 = 0xC4; + mTevStage[2].field_0x4 = 0xC5; + mTevStage[3].field_0x0 = 0xC6; + mTevStage[3].field_0x4 = 0xC7; + mTevKColorSel[0] = GX_TEV_KCSEL_K0; + mTevKColorSel[1] = GX_TEV_KCSEL_K0; + mTevKColorSel[2] = GX_TEV_KCSEL_K0; + mTevKColorSel[3] = GX_TEV_KCSEL_K0; + mTevKAlphaSel[0] = GX_TEV_KASEL_K0_A; + mTevKAlphaSel[1] = GX_TEV_KASEL_K0_A; + mTevKAlphaSel[2] = GX_TEV_KASEL_K0_A; + mTevKAlphaSel[3] = GX_TEV_KASEL_K0_A; + + for (u32 i = 0; i < 3; i++) { + mTevColor[i] = j3dDefaultTevColor; + } + for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) { + mTevKColor[i] = j3dDefaultTevKColor; + } + mTexNoOffset = 0; + mTevRegOffset = 0; } -#pragma pop /* 80317A00-80317B28 312340 0128+00 0/0 1/1 0/0 .text initialize__13J3DTevBlock16Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock16::initialize() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__13J3DTevBlock16Fv.s" +void J3DTevBlock16::initialize() { + for (u32 i = 0; i < ARRAY_SIZE(mTexNo); i++) { + mTexNo[i] = 0xFFFF; + } + mTevStageNum = 1; + for (u32 i = 0; i < 3; i++) { + mTevColor[i] = j3dDefaultTevColor; + } + for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) { + mTevKColor[i] = j3dDefaultTevKColor; + } + for (u32 i = 0; i < ARRAY_SIZE(mTevKColorSel); i++) { + mTevKColorSel[i] = GX_TEV_KCSEL_K0; + } + for (u32 i = 0; i < ARRAY_SIZE(mTevKColorSel); i++) { + mTevKAlphaSel[i] = GX_TEV_KASEL_K0_A; + } + for (u32 i = 0; i < ARRAY_SIZE(mTevStage); i++) { + mTevStage[i].field_0x0 = 0xC0 + i * 2; + mTevStage[i].field_0x4 = 0xC1 + i * 2; + } + mTexNoOffset = 0; + mTevRegOffset = 0; } -#pragma pop /* 80317B28-80317B34 312468 000C+00 0/0 1/1 0/0 .text initialize__15J3DIndBlockFullFv */ void J3DIndBlockFull::initialize() { @@ -841,14 +910,39 @@ s32 J3DPEBlockFull::countDLSize() { return 85; } +/* ############################################################################################## */ +/* 80450960-80450964 0003E0 0004+00 5/5 0/0 0/0 .sdata SizeOfLoadMatColors */ +SECTION_SDATA static u32 SizeOfLoadMatColors = 0x0000000D; + +/* ############################################################################################## */ +/* 80450964-80450968 0003E4 0004+00 2/2 0/0 0/0 .sdata SizeOfLoadAmbColors */ +SECTION_SDATA static u32 SizeOfLoadAmbColors = 0x0000000D; + +/* 80450968-80450970 0003E8 0004+04 5/5 0/0 0/0 .sdata SizeOfLoadColorChans */ +SECTION_SDATA static u32 SizeOfLoadColorChans = 21; + /* ############################################################################################## */ /* 804515D8-804515DC 000AD8 0004+00 2/2 0/0 0/0 .sbss SizeOfJ3DColorBlockLightOffLoad */ -static u8 SizeOfJ3DColorBlockLightOffLoad[4]; +static u32 SizeOfJ3DColorBlockLightOffLoad = SizeOfLoadMatColors + SizeOfLoadColorChans; /* 804563A8-804563AC 0049A8 0004+00 7/7 0/0 0/0 .sdata2 @585 */ SECTION_SDATA2 static u32 lit_585 = 0x02000201; /* 80317C0C-8031816C 31254C 0560+00 1/0 0/0 0/0 .text load__21J3DColorBlockLightOffFv */ +// Issues with mColorChanID +#ifdef NONMATCHING +void J3DColorBlockLightOff::load() { + GDOverflowCheck(SizeOfJ3DColorBlockLightOffLoad); + mMatColorOffset = GDGetCurrOffset(); + loadMatColors(mMatColor); + mColorChanOffset = GDGetCurrOffset(); + J3DGDWriteXFCmdHdr(0x100e, 4); + mColorChan[0].load(); + mColorChan[1].load(); + mColorChan[2].load(); + mColorChan[3].load(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -858,10 +952,11 @@ extern "C" asm void load__21J3DColorBlockLightOffFv() { #include "asm/JSystem/J3DGraphBase/J3DMatBlock/load__21J3DColorBlockLightOffFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 804515DC-804515E0 000ADC 0004+00 3/3 0/0 0/0 .sbss SizeOfJ3DColorBlockAmbientOnLoad */ -static u8 SizeOfJ3DColorBlockAmbientOnLoad[4]; +static u32 SizeOfJ3DColorBlockAmbientOnLoad = SizeOfLoadMatColors + SizeOfLoadAmbColors + SizeOfLoadColorChans; /* 8031816C-803187F4 312AAC 0688+00 1/0 0/0 0/0 .text load__22J3DColorBlockAmbientOnFv */ #pragma push @@ -886,18 +981,10 @@ extern "C" asm void load__20J3DColorBlockLightOnFv() { #pragma pop /* 80318EB4-80318F00 3137F4 004C+00 2/0 0/0 0/0 .text patch__21J3DColorBlockLightOffFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOff::patch() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patch__21J3DColorBlockLightOffFv.s" +void J3DColorBlockLightOff::patch() { + patchMatColor(); + patchLight(); } -#pragma pop - -/* ############################################################################################## */ -/* 80450960-80450964 0003E0 0004+00 5/5 0/0 0/0 .sdata SizeOfLoadMatColors */ -SECTION_SDATA static u32 SizeOfLoadMatColors = 0x0000000D; /* 80318F00-803190AC 313840 01AC+00 2/0 0/0 0/0 .text patchMatColor__21J3DColorBlockLightOffFv */ void J3DColorBlockLightOff::patchMatColor() { @@ -909,17 +996,6 @@ void J3DColorBlockLightOff::patchMatColor() { DCStoreRange(start, end - start); } -/* ############################################################################################## */ -/* 80450964-80450968 0003E4 0004+00 2/2 0/0 0/0 .sdata SizeOfLoadAmbColors */ -SECTION_SDATA static u32 SizeOfLoadAmbColors = 0x0000000D; - -/* 80450968-80450970 0003E8 0004+04 5/5 0/0 0/0 .sdata SizeOfLoadColorChans */ -SECTION_SDATA static u32 SizeOfLoadColorChans[1 + 1 /* padding */] = { - 0x00000015, - /* padding */ - 0x00000000, -}; - /* 803190AC-803194E8 3139EC 043C+00 2/0 0/0 0/0 .text patchLight__21J3DColorBlockLightOffFv */ #pragma push #pragma optimization_level 0 @@ -1018,14 +1094,13 @@ asm void J3DColorBlockLightOn::diffColorChan() { #pragma pop /* 8031A8E0-8031A948 315220 0068+00 1/0 0/0 0/0 .text diffLightObj__20J3DColorBlockLightOnFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOn::diffLightObj(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffLightObj__20J3DColorBlockLightOnFUl.s" +void J3DColorBlockLightOn::diffLightObj(u32 param_1) { + for (u32 i = 0; i < param_1; i ++) { + if (mLight[i] != NULL) { + mLight[i]->load(i); + } + } } -#pragma pop /* 8031A948-8031A9E8 315288 00A0+00 1/0 0/0 0/0 .text load__15J3DTexGenBlock4Fv */ void J3DTexGenBlock4::load() { @@ -1067,590 +1142,953 @@ void J3DTexGenBlockPatched::patch() { } /* 8031AB18-8031ABC0 315458 00A8+00 1/0 0/0 0/0 .text patch__15J3DTexGenBlock4Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTexGenBlock4::patch() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patch__15J3DTexGenBlock4Fv.s" +void J3DTexGenBlock4::patch() { + GDSetCurrOffset(mTexMtxOffset); + u8* start = GDGetCurrPointer(); + for (u32 i = 0; i < 4; i++) { + if (mTexMtx[i] && mTexCoord[i].getTexGenMtx() != GX_IDENTITY) { + mTexMtx[i]->load(i); + } + } + u8* end = GDGetCurrPointer(); + DCStoreRange(start, end - start); } -#pragma pop /* 8031ABC0-8031AC68 315500 00A8+00 1/0 0/0 0/0 .text patch__19J3DTexGenBlockBasicFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTexGenBlockBasic::patch() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patch__19J3DTexGenBlockBasicFv.s" +void J3DTexGenBlockBasic::patch() { + GDSetCurrOffset(mTexMtxOffset); + u8* start = GDGetCurrPointer(); + for (u32 i = 0; i < 8; i++) { + if (mTexMtx[i] && mTexCoord[i].getTexGenMtx() != GX_IDENTITY) { + mTexMtx[i]->load(i); + } + } + u8* end = GDGetCurrPointer(); + DCStoreRange(start, end - start); } -#pragma pop /* 8031AC68-8031ACD0 3155A8 0068+00 3/0 0/0 0/0 .text diff__21J3DTexGenBlockPatchedFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTexGenBlockPatched::diff(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diff__21J3DTexGenBlockPatchedFUl.s" +void J3DTexGenBlockPatched::diff(u32 flag) { + if ((flag >> 8) & 0x0f) { + diffTexMtx(); + if (flag & 0x1000) { + diffTexGen(); + } + } } -#pragma pop /* 8031ACD0-8031AD30 315610 0060+00 3/0 0/0 0/0 .text diffTexMtx__21J3DTexGenBlockPatchedFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTexGenBlockPatched::diffTexMtx() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexMtx__21J3DTexGenBlockPatchedFv.s" +void J3DTexGenBlockPatched::diffTexMtx() { + for (u32 i = 0; i < ARRAY_SIZE(mTexMtx); ++i) { + if (mTexMtx[i] != NULL) { + mTexMtx[i]->load(i); + } + } } -#pragma pop /* 8031AD30-8031AD64 315670 0034+00 3/0 0/0 0/0 .text diffTexGen__21J3DTexGenBlockPatchedFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTexGenBlockPatched::diffTexGen() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexGen__21J3DTexGenBlockPatchedFv.s" +void J3DTexGenBlockPatched::diffTexGen() { + if (mTexGenNum > 0) { + loadTexCoordGens(mTexGenNum, mTexCoord); + } } -#pragma pop /* 8031AD64-8031AFA4 3156A4 0240+00 1/0 0/0 0/0 .text load__12J3DTevBlock1Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock1::load() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock1Fv.s" +void J3DTevBlock1::load() { + mTexNoOffset = GDGetCurrOffset(); + GDOverflowCheck(0x69); + if (mTexNo[0] != 0xffff) { + loadTexNo(0, mTexNo[0]); + } + J3DGDSetTevOrder( + GX_TEVSTAGE0, + GXTexCoordID(mTevOrder[0].getTevOrderInfo().mTexCoord), + GXTexMapID(mTevOrder[0].getTevOrderInfo().mTexMap), + GXChannelID(mTevOrder[0].getTevOrderInfo().mColorChan), + GX_TEXCOORD_NULL, + GX_TEXMAP_NULL, + GX_COLOR_NULL + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[0].getTevOrderInfo().mTexCoord), + J3DSys::sTexCoordScaleTable[mTevOrder[0].getTevOrderInfo().mTexMap & 7] + ); + mTevStage[0].load(0); + mIndTevStage[0].load(0); } -#pragma pop /* 8031AFA4-8031B4C0 3158E4 051C+00 1/0 0/0 0/0 .text load__12J3DTevBlock2Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock2::load() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock2Fv.s" +void J3DTevBlock2::load() { + u8 tevStageNum = mTevStageNum; + mTexNoOffset = GDGetCurrOffset(); + for (u32 i = 0; i < 2; i++) { + if (mTexNo[i] != 0xffff) { + loadTexNo(i, mTexNo[i]); + } + } + J3DGDSetTevOrder( + GX_TEVSTAGE0, + GXTexCoordID(mTevOrder[0].getTevOrderInfo().mTexCoord), + GXTexMapID(mTevOrder[0].getTevOrderInfo().mTexMap), + GXChannelID(mTevOrder[0].getTevOrderInfo().mColorChan), + GXTexCoordID(mTevOrder[1].getTevOrderInfo().mTexCoord), + GXTexMapID(mTevOrder[1].getTevOrderInfo().mTexMap), + GXChannelID(mTevOrder[1].getTevOrderInfo().mColorChan) + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[0].getTevOrderInfo().mTexCoord), + J3DSys::sTexCoordScaleTable[mTevOrder[0].getTevOrderInfo().mTexMap & 7] + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[1].getTevOrderInfo().mTexCoord & 7), + J3DSys::sTexCoordScaleTable[mTevOrder[1].getTevOrderInfo().mTexMap & 7] + ); + mTevRegOffset = GDGetCurrOffset(); + for (u32 i = 0; i < 3; i++) { + loadTevColor(i, mTevColor[i]); + } + for (u32 i = 0; i < 4; i++) { + loadTevKColor(i, mTevKColor[i]); + } + for (u32 i = 0; i < tevStageNum; i++) { + mTevStage[i].load(i); + mIndTevStage[i].load(i); + } + for (u32 i = 0; i < 16; i += 4) { + J3DGDSetTevKonstantSel_SwapModeTable( + GXTevStageID(i), + GXTevKColorSel(mTevKColorSel[0]), + GXTevKAlphaSel(mTevKAlphaSel[0]), + GXTevKColorSel(mTevKColorSel[1]), + GXTevKAlphaSel(mTevKAlphaSel[1]), + GXTevColor(mTevSwapModeTable[i / 4].getR()), + GXTevColor(mTevSwapModeTable[i / 4].getG()) + ); + J3DGDSetTevKonstantSel_SwapModeTable( + GXTevStageID(i + 2), + GXTevKColorSel(mTevKColorSel[0]), + GXTevKAlphaSel(mTevKAlphaSel[0]), + GXTevKColorSel(mTevKColorSel[1]), + GXTevKAlphaSel(mTevKAlphaSel[1]), + GXTevColor(mTevSwapModeTable[i / 4].getB()), + GXTevColor(mTevSwapModeTable[i / 4].getA()) + ); + } } -#pragma pop /* 8031B4C0-8031BA04 315E00 0544+00 1/0 0/0 0/0 .text load__12J3DTevBlock4Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock4::load() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock4Fv.s" +void J3DTevBlock4::load() { + u8 tevStageNum = mTevStageNum; + mTexNoOffset = GDGetCurrOffset(); + for (u32 i = 0; i < 4; i++) { + if (mTexNo[i] != 0xffff) { + loadTexNo(i, mTexNo[i]); + } + } + for (u32 i = 0; i < tevStageNum; i += 2) { + J3DGDSetTevOrder( + GXTevStageID(i), + GXTexCoordID(mTevOrder[i].getTevOrderInfo().mTexCoord), + GXTexMapID(mTevOrder[i].getTevOrderInfo().mTexMap), + GXChannelID(mTevOrder[i].getTevOrderInfo().mColorChan), + GXTexCoordID(mTevOrder[i + 1].getTevOrderInfo().mTexCoord), + GXTexMapID(mTevOrder[i + 1].getTevOrderInfo().mTexMap), + GXChannelID(mTevOrder[i + 1].getTevOrderInfo().mColorChan) + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[i].getTevOrderInfo().mTexCoord & 7), + J3DSys::sTexCoordScaleTable[mTevOrder[i].getTevOrderInfo().mTexMap & 7] + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[i + 1].getTevOrderInfo().mTexCoord & 7), + J3DSys::sTexCoordScaleTable[mTevOrder[i + 1].getTevOrderInfo().mTexMap & 7] + ); + } + mTevRegOffset = GDGetCurrOffset(); + for (u32 i = 0; i < 3; i++) { + loadTevColor(i, mTevColor[i]); + } + for (u32 i = 0; i < 4; i++) { + loadTevKColor(i, mTevKColor[i]); + } + for (u32 i = 0; i < tevStageNum; i++) { + mTevStage[i].load(i); + mIndTevStage[i].load(i); + } + for (u32 i = 0; i < 16; i += 4) { + J3DGDSetTevKonstantSel_SwapModeTable( + GXTevStageID(i), + GXTevKColorSel(mTevKColorSel[0]), + GXTevKAlphaSel(mTevKAlphaSel[0]), + GXTevKColorSel(mTevKColorSel[1]), + GXTevKAlphaSel(mTevKAlphaSel[1]), + GXTevColor(mTevSwapModeTable[i / 4].getR()), + GXTevColor(mTevSwapModeTable[i / 4].getG()) + ); + J3DGDSetTevKonstantSel_SwapModeTable( + GXTevStageID(i + 2), + GXTevKColorSel(mTevKColorSel[2]), + GXTevKAlphaSel(mTevKAlphaSel[2]), + GXTevKColorSel(mTevKColorSel[3]), + GXTevKAlphaSel(mTevKAlphaSel[3]), + GXTevColor(mTevSwapModeTable[i / 4].getB()), + GXTevColor(mTevSwapModeTable[i / 4].getA()) + ); + } } -#pragma pop /* 8031BA04-8031BF4C 316344 0548+00 1/0 0/0 0/0 .text load__13J3DTevBlock16Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock16::load() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/load__13J3DTevBlock16Fv.s" +void J3DTevBlock16::load() { + u8 tevStageNum = mTevStageNum; + mTexNoOffset = GDGetCurrOffset(); + for (u32 i = 0; i < 8; i++) { + if (mTexNo[i] != 0xffff) { + loadTexNo(i, mTexNo[i]); + } + } + for (u32 i = 0; i < tevStageNum; i += 2) { + J3DGDSetTevOrder( + GXTevStageID(i), + GXTexCoordID(mTevOrder[i].getTevOrderInfo().mTexCoord), + GXTexMapID(mTevOrder[i].getTevOrderInfo().mTexMap), + GXChannelID(mTevOrder[i].getTevOrderInfo().mColorChan), + GXTexCoordID(mTevOrder[i + 1].getTevOrderInfo().mTexCoord), + GXTexMapID(mTevOrder[i + 1].getTevOrderInfo().mTexMap), + GXChannelID(mTevOrder[i + 1].getTevOrderInfo().mColorChan) + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[i].getTevOrderInfo().mTexCoord & 7), + J3DSys::sTexCoordScaleTable[mTevOrder[i].getTevOrderInfo().mTexMap & 7] + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[i + 1].getTevOrderInfo().mTexCoord & 7), + J3DSys::sTexCoordScaleTable[mTevOrder[i + 1].getTevOrderInfo().mTexMap & 7] + ); + } + mTevRegOffset = GDGetCurrOffset(); + for (u32 i = 0; i < 3; i++) { + loadTevColor(i, mTevColor[i]); + } + for (u32 i = 0; i < 4; i++) { + loadTevKColor(i, mTevKColor[i]); + } + for (u32 i = 0; i < tevStageNum; i++) { + mTevStage[i].load(i); + mIndTevStage[i].load(i); + } + for (u32 i = 0; i < 16; i += 4) { + J3DGDSetTevKonstantSel_SwapModeTable( + GXTevStageID(i), + GXTevKColorSel(mTevKColorSel[i]), + GXTevKAlphaSel(mTevKAlphaSel[i]), + GXTevKColorSel(mTevKColorSel[i + 1]), + GXTevKAlphaSel(mTevKAlphaSel[i + 1]), + GXTevColor(mTevSwapModeTable[i / 4].getR()), + GXTevColor(mTevSwapModeTable[i / 4].getG()) + ); + J3DGDSetTevKonstantSel_SwapModeTable( + GXTevStageID(i + 2), + GXTevKColorSel(mTevKColorSel[i + 2]), + GXTevKAlphaSel(mTevKAlphaSel[i + 2]), + GXTevKColorSel(mTevKColorSel[i + 3]), + GXTevKAlphaSel(mTevKAlphaSel[i + 3]), + GXTevColor(mTevSwapModeTable[i / 4].getB()), + GXTevColor(mTevSwapModeTable[i / 4].getA()) + ); + } } -#pragma pop + /* 8031BF4C-8031BFE0 31688C 0094+00 1/0 0/0 0/0 .text patchTexNo__18J3DTevBlockPatchedFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlockPatched::patchTexNo() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__18J3DTevBlockPatchedFv.s" +void J3DTevBlockPatched::patchTexNo() { + GDSetCurrOffset(mTexNoOffset); + u8* start = GDGetCurrPointer(); + + for (u32 i = 0; i < 8; i++) { + if (mTexNo[i] != 0xffff) { + loadTexNo(i, mTexNo[i]); + } + } + + u8* end = GDGetCurrPointer(); + DCStoreRange(start, end - start); } -#pragma pop /* 8031BFE0-8031C0AC 316920 00CC+00 1/0 0/0 0/0 .text patchTevReg__18J3DTevBlockPatchedFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlockPatched::patchTevReg() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__18J3DTevBlockPatchedFv.s" +void J3DTevBlockPatched::patchTevReg() { + GDSetCurrOffset(mTevRegOffset); + u8 *pStart = GDGetCurrPointer(); + + for (u32 i = 0; i < ARRAY_SIZE(mTevColor) - 1; i++) { + J3DGDSetTevColorS10((GXTevRegID)(i + 1), mTevColor[i]); + } + for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) { + J3DGDSetTevKColor((GXTevKColorID)i, mTevKColor[i]); + } + + u8 *pEnd = GDGetCurrPointer(); + DCStoreRange(pStart, pEnd - pStart); } -#pragma pop /* 8031C0AC-8031C228 3169EC 017C+00 1/0 0/0 0/0 .text * patchTexNoAndTexCoordScale__18J3DTevBlockPatchedFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlockPatched::patchTexNoAndTexCoordScale() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__18J3DTevBlockPatchedFv.s" +void J3DTevBlockPatched::patchTexNoAndTexCoordScale() { + GDSetCurrOffset(mTexNoOffset); + u8 *start = GDGetCurrPointer(); + + u8 tevStageNum = mTevStageNum; + for (u32 i = 0; i < 8; i++) { + if (mTexNo[i] != 0xffff) { + loadTexNo(i, mTexNo[i]); + } + } + + for (u32 i = 0; i < tevStageNum; i += 2) { + J3DGDSetTevOrder( + GXTevStageID(i), + GXTexCoordID(mTevOrder[i].getTevOrderInfo().mTexCoord), + GXTexMapID(mTevOrder[i].getTevOrderInfo().mTexMap), + GXChannelID(mTevOrder[i].getTevOrderInfo().mColorChan), + GXTexCoordID(mTevOrder[i + 1].getTevOrderInfo().mTexCoord), + GXTexMapID(mTevOrder[i + 1].getTevOrderInfo().mTexMap), + GXChannelID(mTevOrder[i + 1].getTevOrderInfo().mColorChan) + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[i].getTevOrderInfo().mTexCoord & 7), + J3DSys::sTexCoordScaleTable[mTevOrder[i].getTevOrderInfo().mTexMap & 7] + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[i + 1].getTevOrderInfo().mTexCoord & 7), + J3DSys::sTexCoordScaleTable[mTevOrder[i + 1].getTevOrderInfo().mTexMap & 7] + ); + } + + u8 *end = GDGetCurrPointer(); + DCStoreRange(start, end - start); } -#pragma pop /* 8031C228-8031C274 316B68 004C+00 1/0 0/0 0/0 .text patch__18J3DTevBlockPatchedFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlockPatched::patch() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patch__18J3DTevBlockPatchedFv.s" +void J3DTevBlockPatched::patch() { + patchTexNo(); + patchTevReg(); } -#pragma pop /* 8031C274-8031C2E4 316BB4 0070+00 1/0 0/0 0/0 .text patchTexNo__12J3DTevBlock1Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock1::patchTexNo() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__12J3DTevBlock1Fv.s" +void J3DTevBlock1::patchTexNo() { + GDSetCurrOffset(mTexNoOffset); + u8 *pStart = GDGetCurrPointer(); + + if (mTexNo[0] != 0xFFFF) { + loadTexNo(0, mTexNo[0]); + } + + u8 *pEnd = GDGetCurrPointer(); + DCStoreRange(pStart, pEnd - pStart); } -#pragma pop /* 8031C2E4-8031C2E8 316C24 0004+00 1/0 0/0 0/0 .text patchTevReg__12J3DTevBlock1Fv */ void J3DTevBlock1::patchTevReg() { - /* empty function */ } /* 8031C2E8-8031C3CC 316C28 00E4+00 1/0 0/0 0/0 .text patchTexNoAndTexCoordScale__12J3DTevBlock1Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock1::patchTexNoAndTexCoordScale() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock1Fv.s" +void J3DTevBlock1::patchTexNoAndTexCoordScale() { + GDSetCurrOffset(mTexNoOffset); + u8 *start = GDGetCurrPointer(); + + if (mTexNo[0] != 0xffff) { + loadTexNo(0, mTexNo[0]); + } + + J3DGDSetTevOrder( + GX_TEVSTAGE0, + GXTexCoordID(mTevOrder[0].getTevOrderInfo().mTexCoord), + GXTexMapID(mTevOrder[0].getTevOrderInfo().mTexMap), + GXChannelID(mTevOrder[0].getTevOrderInfo().mColorChan), + GX_TEXCOORD_NULL, + GX_TEXMAP_NULL, + GX_COLOR_NULL + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[0].getTevOrderInfo().mTexCoord), + J3DSys::sTexCoordScaleTable[mTevOrder[0].getTevOrderInfo().mTexMap & 7] + ); + + u8 *end = GDGetCurrPointer(); + DCStoreRange(start, end - start); } -#pragma pop /* 8031C3CC-8031C3F8 316D0C 002C+00 1/0 0/0 0/0 .text patch__12J3DTevBlock1Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock1::patch() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patch__12J3DTevBlock1Fv.s" +void J3DTevBlock1::patch() { + patchTexNo(); } -#pragma pop /* 8031C3F8-8031C48C 316D38 0094+00 1/0 0/0 0/0 .text patchTexNo__12J3DTevBlock2Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock2::patchTexNo() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__12J3DTevBlock2Fv.s" +void J3DTevBlock2::patchTexNo() { + GDSetCurrOffset(mTexNoOffset); + u8 *start = GDGetCurrPointer(); + + for (u32 i = 0; i < 2; i++) { + if (mTexNo[i] != 0xffff) { + loadTexNo(i, mTexNo[i]); + } + } + + u8 *end = GDGetCurrPointer(); + DCStoreRange(start, end - start); } -#pragma pop /* 8031C48C-8031C558 316DCC 00CC+00 1/0 0/0 0/0 .text patchTevReg__12J3DTevBlock2Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock2::patchTevReg() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__12J3DTevBlock2Fv.s" +void J3DTevBlock2::patchTevReg() { + GDSetCurrOffset(mTevRegOffset); + u8 *pStart = GDGetCurrPointer(); + + for (u32 i = 0; i < ARRAY_SIZE(mTevColor) - 1; i++) { + J3DGDSetTevColorS10((GXTevRegID)(i + 1), mTevColor[i]); + } + for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) { + J3DGDSetTevKColor((GXTevKColorID)i, mTevKColor[i]); + } + + u8 *pEnd = GDGetCurrPointer(); + DCStoreRange(pStart, pEnd - pStart); } -#pragma pop /* 8031C558-8031C6A8 316E98 0150+00 1/0 0/0 0/0 .text patchTexNoAndTexCoordScale__12J3DTevBlock2Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock2::patchTexNoAndTexCoordScale() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock2Fv.s" +void J3DTevBlock2::patchTexNoAndTexCoordScale() { + GDSetCurrOffset(mTexNoOffset); + u8 *start = GDGetCurrPointer(); + + for (u32 i = 0; i < 2; i++) { + if (mTexNo[i] != 0xffff) { + loadTexNo(i, mTexNo[i]); + } + } + + J3DGDSetTevOrder( + GX_TEVSTAGE0, + GXTexCoordID(mTevOrder[0].getTevOrderInfo().mTexCoord), + GXTexMapID(mTevOrder[0].getTevOrderInfo().mTexMap), + GXChannelID(mTevOrder[0].getTevOrderInfo().mColorChan), + GXTexCoordID(mTevOrder[1].getTevOrderInfo().mTexCoord), + GXTexMapID(mTevOrder[1].getTevOrderInfo().mTexMap), + GXChannelID(mTevOrder[1].getTevOrderInfo().mColorChan) + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[0].getTevOrderInfo().mTexCoord), + J3DSys::sTexCoordScaleTable[mTevOrder[0].getTevOrderInfo().mTexMap & 7] + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[1].getTevOrderInfo().mTexCoord & 7), + J3DSys::sTexCoordScaleTable[mTevOrder[1].getTevOrderInfo().mTexMap & 7] + ); + + u8 *end = GDGetCurrPointer(); + DCStoreRange(start, end - start); } -#pragma pop /* 8031C6A8-8031C6F4 316FE8 004C+00 1/0 0/0 0/0 .text patch__12J3DTevBlock2Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock2::patch() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patch__12J3DTevBlock2Fv.s" +void J3DTevBlock2::patch() { + patchTexNo(); + patchTevReg(); } -#pragma pop /* 8031C6F4-8031C788 317034 0094+00 1/0 0/0 0/0 .text patchTexNo__12J3DTevBlock4Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock4::patchTexNo() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__12J3DTevBlock4Fv.s" +void J3DTevBlock4::patchTexNo() { + GDSetCurrOffset(mTexNoOffset); + u8 *start = GDGetCurrPointer(); + + for (u32 i = 0; i < 4; i++) { + if (mTexNo[i] != 0xffff) { + loadTexNo(i, mTexNo[i]); + } + } + + u8 *end = GDGetCurrPointer(); + DCStoreRange(start, end - start); } -#pragma pop /* 8031C788-8031C854 3170C8 00CC+00 1/0 0/0 0/0 .text patchTevReg__12J3DTevBlock4Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock4::patchTevReg() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__12J3DTevBlock4Fv.s" +void J3DTevBlock4::patchTevReg() { + GDSetCurrOffset(mTevRegOffset); + u8 *pStart = GDGetCurrPointer(); + + for (u32 i = 0; i < ARRAY_SIZE(mTevColor) - 1; i++) { + J3DGDSetTevColorS10((GXTevRegID)(i + 1), mTevColor[i]); + } + for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) { + J3DGDSetTevKColor((GXTevKColorID)i, mTevKColor[i]); + } + + u8 *pEnd = GDGetCurrPointer(); + DCStoreRange(pStart, pEnd - pStart); } -#pragma pop /* 8031C854-8031C9D0 317194 017C+00 1/0 0/0 0/0 .text patchTexNoAndTexCoordScale__12J3DTevBlock4Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock4::patchTexNoAndTexCoordScale() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock4Fv.s" -} -#pragma pop +void J3DTevBlock4::patchTexNoAndTexCoordScale() { + GDSetCurrOffset(mTexNoOffset); + u8 *start = GDGetCurrPointer(); -/* 8031C9D0-8031CA1C 317310 004C+00 1/0 0/0 0/0 .text patch__12J3DTevBlock4Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock4::patch() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patch__12J3DTevBlock4Fv.s" + u8 tevStageNum = mTevStageNum; + for (u32 i = 0; i < 4; i++) { + if (mTexNo[i] != 0xffff) { + loadTexNo(i, mTexNo[i]); + } + } + + for (u32 i = 0; i < tevStageNum; i += 2) { + J3DGDSetTevOrder( + GXTevStageID(i), + GXTexCoordID(mTevOrder[i].getTevOrderInfo().mTexCoord), + GXTexMapID(mTevOrder[i].getTevOrderInfo().mTexMap), + GXChannelID(mTevOrder[i].getTevOrderInfo().mColorChan), + GXTexCoordID(mTevOrder[i + 1].getTevOrderInfo().mTexCoord), + GXTexMapID(mTevOrder[i + 1].getTevOrderInfo().mTexMap), + GXChannelID(mTevOrder[i + 1].getTevOrderInfo().mColorChan) + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[i].getTevOrderInfo().mTexCoord & 7), + J3DSys::sTexCoordScaleTable[mTevOrder[i].getTevOrderInfo().mTexMap & 7] + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[i + 1].getTevOrderInfo().mTexCoord & 7), + J3DSys::sTexCoordScaleTable[mTevOrder[i + 1].getTevOrderInfo().mTexMap & 7] + ); + } + + u8 *end = GDGetCurrPointer(); + DCStoreRange(start, end - start); +} +/* 8031C9D0-8031CA1C 317310 004C+00 1/0 0/0 0/0 .text patch__12J3DTevBlock4Fv */ +void J3DTevBlock4::patch() { + patchTexNo(); + patchTevReg(); } -#pragma pop /* 8031CA1C-8031CAB0 31735C 0094+00 1/0 0/0 0/0 .text patchTexNo__13J3DTevBlock16Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock16::patchTexNo() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNo__13J3DTevBlock16Fv.s" +void J3DTevBlock16::patchTexNo() { + GDSetCurrOffset(mTexNoOffset); + u8 *start = GDGetCurrPointer(); + + for (u32 i = 0; i < 8; i++) { + if (mTexNo[i] != 0xffff) { + loadTexNo(i, mTexNo[i]); + } + } + + u8 *end = GDGetCurrPointer(); + DCStoreRange(start, end - start); } -#pragma pop /* 8031CAB0-8031CB7C 3173F0 00CC+00 1/0 0/0 0/0 .text patchTevReg__13J3DTevBlock16Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock16::patchTevReg() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patchTevReg__13J3DTevBlock16Fv.s" +void J3DTevBlock16::patchTevReg() { + GDSetCurrOffset(mTevRegOffset); + u8 *pStart = GDGetCurrPointer(); + + for (u32 i = 0; i < ARRAY_SIZE(mTevColor) - 1; i++) { + J3DGDSetTevColorS10((GXTevRegID)(i + 1), mTevColor[i]); + } + for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) { + J3DGDSetTevKColor((GXTevKColorID)i, mTevKColor[i]); + } + + u8 *pEnd = GDGetCurrPointer(); + DCStoreRange(pStart, pEnd - pStart); } -#pragma pop /* 8031CB7C-8031CCF8 3174BC 017C+00 1/0 0/0 0/0 .text * patchTexNoAndTexCoordScale__13J3DTevBlock16Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock16::patchTexNoAndTexCoordScale() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__13J3DTevBlock16Fv.s" +void J3DTevBlock16::patchTexNoAndTexCoordScale() { + GDSetCurrOffset(mTexNoOffset); + u8 *start = GDGetCurrPointer(); + + u8 tevStageNum = mTevStageNum; + for (u32 i = 0; i < 8; i++) { + if (mTexNo[i] != 0xffff) { + loadTexNo(i, mTexNo[i]); + } + } + + for (u32 i = 0; i < tevStageNum; i += 2) { + J3DGDSetTevOrder( + GXTevStageID(i), + GXTexCoordID(mTevOrder[i].getTevOrderInfo().mTexCoord), + GXTexMapID(mTevOrder[i].getTevOrderInfo().mTexMap), + GXChannelID(mTevOrder[i].getTevOrderInfo().mColorChan), + GXTexCoordID(mTevOrder[i + 1].getTevOrderInfo().mTexCoord), + GXTexMapID(mTevOrder[i + 1].getTevOrderInfo().mTexMap), + GXChannelID(mTevOrder[i + 1].getTevOrderInfo().mColorChan) + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[i].getTevOrderInfo().mTexCoord & 7), + J3DSys::sTexCoordScaleTable[mTevOrder[i].getTevOrderInfo().mTexMap & 7] + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[i + 1].getTevOrderInfo().mTexCoord & 7), + J3DSys::sTexCoordScaleTable[mTevOrder[i + 1].getTevOrderInfo().mTexMap & 7] + ); + } + + u8 *end = GDGetCurrPointer(); + DCStoreRange(start, end - start); } -#pragma pop + /* 8031CCF8-8031CD44 317638 004C+00 1/0 0/0 0/0 .text patch__13J3DTevBlock16Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock16::patch() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patch__13J3DTevBlock16Fv.s" +void J3DTevBlock16::patch() { + patchTexNo(); + patchTevReg(); } -#pragma pop /* 8031CD44-8031CE00 317684 00BC+00 6/0 1/0 0/0 .text diff__11J3DTevBlockFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock::diff(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diff__11J3DTevBlockFUl.s" +void J3DTevBlock::diff(u32 flag) { + if ((flag >> 16) & 0x0f) { + diffTexNo(); + } + if (flag & 0x4000000) { + diffTexCoordScale(); + } + if ((flag >> 20) & 0x0f) { + diffTevStage(); + if (flag & 0x8000000) { + diffTevStageIndirect(); + } + } + if (flag & 0x01000000) { + diffTevReg(); + } } -#pragma pop /* 8031CE00-8031CE64 317740 0064+00 1/0 0/0 0/0 .text diffTexNo__18J3DTevBlockPatchedFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlockPatched::diffTexNo() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__18J3DTevBlockPatchedFv.s" +void J3DTevBlockPatched::diffTexNo() { + for (u32 i = 0; i < ARRAY_SIZE(mTexNo); i++) { + if (mTexNo[i] != 0xFFFF) { + loadTexNo(i, mTexNo[i]); + } + } } -#pragma pop /* 8031CE64-8031CF78 3177A4 0114+00 1/0 0/0 0/0 .text diffTevStage__18J3DTevBlockPatchedFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlockPatched::diffTevStage() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__18J3DTevBlockPatchedFv.s" +void J3DTevBlockPatched::diffTevStage() { + u8 tevStageNum = mTevStageNum; + for (u32 i = 0; i < tevStageNum; i++) { + mTevStage[i].load(i); + } } -#pragma pop /* 8031CF78-8031D028 3178B8 00B0+00 1/0 0/0 0/0 .text diffTevStageIndirect__18J3DTevBlockPatchedFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlockPatched::diffTevStageIndirect() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__18J3DTevBlockPatchedFv.s" +void J3DTevBlockPatched::diffTevStageIndirect() { + u8 tevStageNum = mTevStageNum; + for (u32 i = 0; i < tevStageNum; i++) { + mIndTevStage[i].load(i); + } } -#pragma pop /* 8031D028-8031D0C4 317968 009C+00 1/0 0/0 0/0 .text diffTevReg__18J3DTevBlockPatchedFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlockPatched::diffTevReg() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__18J3DTevBlockPatchedFv.s" +void J3DTevBlockPatched::diffTevReg() { + for (u32 i = 0; i < ARRAY_SIZE(mTevColor) - 1; i++) { + J3DGDSetTevColorS10((GXTevRegID)(i + 1), mTevColor[i]); + } + for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) { + J3DGDSetTevKColor((GXTevKColorID)i, mTevKColor[i]); + } } -#pragma pop /* 8031D0C4-8031D1BC 317A04 00F8+00 1/0 0/0 0/0 .text diffTexCoordScale__18J3DTevBlockPatchedFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlockPatched::diffTexCoordScale() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__18J3DTevBlockPatchedFv.s" +void J3DTevBlockPatched::diffTexCoordScale() { + u8 tevStageNum = mTevStageNum; + for (u32 i = 0; i < tevStageNum; i += 2) { + loadTexCoordScale( + GXTexCoordID(mTevOrder[i].getTevOrderInfo().mTexCoord & 7), + J3DSys::sTexCoordScaleTable[mTevOrder[i].getTevOrderInfo().mTexMap & 7] + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[i + 1].getTevOrderInfo().mTexCoord & 7), + J3DSys::sTexCoordScaleTable[mTevOrder[i + 1].getTevOrderInfo().mTexMap & 7] + ); + } } -#pragma pop /* 8031D1BC-8031D1F4 317AFC 0038+00 1/0 0/0 0/0 .text diffTexNo__12J3DTevBlock1Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock1::diffTexNo() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__12J3DTevBlock1Fv.s" +void J3DTevBlock1::diffTexNo() { + if (mTexNo[0] != 0xFFFF) { + loadTexNo(0, mTexNo[0]); + } } -#pragma pop /* 8031D1F4-8031D1F8 317B34 0004+00 1/0 0/0 0/0 .text diffTevReg__12J3DTevBlock1Fv */ void J3DTevBlock1::diffTevReg() { - /* empty function */ } /* 8031D1F8-8031D2E8 317B38 00F0+00 1/0 0/0 0/0 .text diffTevStage__12J3DTevBlock1Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock1::diffTevStage() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__12J3DTevBlock1Fv.s" +void J3DTevBlock1::diffTevStage() { + mTevStage[0].load(0); } -#pragma pop /* 8031D2E8-8031D368 317C28 0080+00 1/0 0/0 0/0 .text diffTevStageIndirect__12J3DTevBlock1Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock1::diffTevStageIndirect() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__12J3DTevBlock1Fv.s" +void J3DTevBlock1::diffTevStageIndirect() { + mIndTevStage[0].load(0); } -#pragma pop /* 8031D368-8031D3D0 317CA8 0068+00 1/0 0/0 0/0 .text diffTexCoordScale__12J3DTevBlock1Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock1::diffTexCoordScale() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock1Fv.s" +void J3DTevBlock1::diffTexCoordScale() { + loadTexCoordScale( + GXTexCoordID(mTevOrder[0].getTevOrderInfo().mTexCoord), + J3DSys::sTexCoordScaleTable[mTevOrder[0].getTevOrderInfo().mTexMap & 7] + ); } -#pragma pop /* 8031D3D0-8031D434 317D10 0064+00 1/0 0/0 0/0 .text diffTexNo__12J3DTevBlock2Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock2::diffTexNo() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__12J3DTevBlock2Fv.s" +void J3DTevBlock2::diffTexNo() { + for (u32 i = 0; i < ARRAY_SIZE(mTexNo); i++) { + if (mTexNo[i] != 0xFFFF) { + loadTexNo(i, mTexNo[i]); + } + } } -#pragma pop /* 8031D434-8031D4D0 317D74 009C+00 1/0 0/0 0/0 .text diffTevReg__12J3DTevBlock2Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock2::diffTevReg() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__12J3DTevBlock2Fv.s" +void J3DTevBlock2::diffTevReg() { + for (u32 i = 0; i < ARRAY_SIZE(mTevColor) - 1; i++) { + J3DGDSetTevColorS10((GXTevRegID)(i + 1), mTevColor[i]); + } + for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) { + J3DGDSetTevKColor((GXTevKColorID)i, mTevKColor[i]); + } } -#pragma pop /* 8031D4D0-8031D5E4 317E10 0114+00 1/0 0/0 0/0 .text diffTevStage__12J3DTevBlock2Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock2::diffTevStage() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__12J3DTevBlock2Fv.s" +void J3DTevBlock2::diffTevStage() { + u8 tevStageNum = mTevStageNum; + for (u32 i = 0; i < tevStageNum; i++) { + mTevStage[i].load(i); + } } -#pragma pop /* 8031D5E4-8031D694 317F24 00B0+00 1/0 0/0 0/0 .text diffTevStageIndirect__12J3DTevBlock2Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock2::diffTevStageIndirect() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__12J3DTevBlock2Fv.s" +void J3DTevBlock2::diffTevStageIndirect() { + u8 tevStageNum = mTevStageNum; + for (u32 i = 0; i < tevStageNum; i++) { + mIndTevStage[i].load(i); + } } -#pragma pop /* 8031D694-8031D758 317FD4 00C4+00 1/0 0/0 0/0 .text diffTexCoordScale__12J3DTevBlock2Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock2::diffTexCoordScale() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock2Fv.s" +void J3DTevBlock2::diffTexCoordScale() { + loadTexCoordScale( + GXTexCoordID(mTevOrder[0].getTevOrderInfo().mTexCoord), + J3DSys::sTexCoordScaleTable[mTevOrder[0].getTevOrderInfo().mTexMap & 7] + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[1].getTevOrderInfo().mTexCoord & 7), + J3DSys::sTexCoordScaleTable[mTevOrder[1].getTevOrderInfo().mTexMap & 7] + ); } -#pragma pop /* 8031D758-8031D7BC 318098 0064+00 1/0 0/0 0/0 .text diffTexNo__12J3DTevBlock4Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock4::diffTexNo() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__12J3DTevBlock4Fv.s" +void J3DTevBlock4::diffTexNo() { + for (u32 i = 0; i < ARRAY_SIZE(mTexNo); i++) { + if (mTexNo[i] != 0xFFFF) { + loadTexNo(i, mTexNo[i]); + } + } } -#pragma pop /* 8031D7BC-8031D858 3180FC 009C+00 1/0 0/0 0/0 .text diffTevReg__12J3DTevBlock4Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock4::diffTevReg() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__12J3DTevBlock4Fv.s" +void J3DTevBlock4::diffTevReg() { + for (u32 i = 0; i < ARRAY_SIZE(mTevColor) - 1; i++) { + J3DGDSetTevColorS10((GXTevRegID)(i + 1), mTevColor[i]); + } + for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) { + J3DGDSetTevKColor((GXTevKColorID)i, mTevKColor[i]); + } } -#pragma pop /* 8031D858-8031D96C 318198 0114+00 1/0 0/0 0/0 .text diffTevStage__12J3DTevBlock4Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock4::diffTevStage() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__12J3DTevBlock4Fv.s" +void J3DTevBlock4::diffTevStage() { + u8 tevStageNum = mTevStageNum; + for (u32 i = 0; i < tevStageNum; i++) { + mTevStage[i].load(i); + } } -#pragma pop - /* 8031D96C-8031DA1C 3182AC 00B0+00 1/0 0/0 0/0 .text diffTevStageIndirect__12J3DTevBlock4Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock4::diffTevStageIndirect() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__12J3DTevBlock4Fv.s" +void J3DTevBlock4::diffTevStageIndirect() { + u8 tevStageNum = mTevStageNum; + for (u32 i = 0; i < tevStageNum; i++) { + mIndTevStage[i].load(i); + } } -#pragma pop /* 8031DA1C-8031DB14 31835C 00F8+00 1/0 0/0 0/0 .text diffTexCoordScale__12J3DTevBlock4Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock4::diffTexCoordScale() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock4Fv.s" +void J3DTevBlock4::diffTexCoordScale() { + u8 tevStageNum = mTevStageNum; + for (u32 i = 0; i < tevStageNum; i += 2) { + loadTexCoordScale( + GXTexCoordID(mTevOrder[i].getTevOrderInfo().mTexCoord & 7), + J3DSys::sTexCoordScaleTable[mTevOrder[i].getTevOrderInfo().mTexMap & 7] + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[i + 1].getTevOrderInfo().mTexCoord & 7), + J3DSys::sTexCoordScaleTable[mTevOrder[i + 1].getTevOrderInfo().mTexMap & 7] + ); + } } -#pragma pop - /* 8031DB14-8031DB78 318454 0064+00 1/0 0/0 0/0 .text diffTexNo__13J3DTevBlock16Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock16::diffTexNo() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexNo__13J3DTevBlock16Fv.s" +void J3DTevBlock16::diffTexNo() { + for (u32 i = 0; i < ARRAY_SIZE(mTexNo); i++) { + if (mTexNo[i] != 0xFFFF) { + loadTexNo(i, mTexNo[i]); + } + } } -#pragma pop /* 8031DB78-8031DC14 3184B8 009C+00 1/0 0/0 0/0 .text diffTevReg__13J3DTevBlock16Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock16::diffTevReg() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevReg__13J3DTevBlock16Fv.s" +void J3DTevBlock16::diffTevReg() { + for (u32 i = 0; i < ARRAY_SIZE(mTevColor) - 1; i++) { + J3DGDSetTevColorS10((GXTevRegID)(i + 1), mTevColor[i]); + } + for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) { + J3DGDSetTevKColor((GXTevKColorID)i, mTevKColor[i]); + } } -#pragma pop /* 8031DC14-8031DD28 318554 0114+00 1/0 0/0 0/0 .text diffTevStage__13J3DTevBlock16Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock16::diffTevStage() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStage__13J3DTevBlock16Fv.s" +void J3DTevBlock16::diffTevStage() { + u8 tevStageNum = mTevStageNum; + for (u32 i = 0; i < tevStageNum; i++) { + mTevStage[i].load(i); + } } -#pragma pop /* 8031DD28-8031DDD8 318668 00B0+00 1/0 0/0 0/0 .text diffTevStageIndirect__13J3DTevBlock16Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock16::diffTevStageIndirect() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTevStageIndirect__13J3DTevBlock16Fv.s" +void J3DTevBlock16::diffTevStageIndirect() { + u8 tevStageNum = mTevStageNum; + for (u32 i = 0; i < tevStageNum; i++) { + mIndTevStage[i].load(i); + } } -#pragma pop /* 8031DDD8-8031DED0 318718 00F8+00 1/0 0/0 0/0 .text diffTexCoordScale__13J3DTevBlock16Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock16::diffTexCoordScale() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__13J3DTevBlock16Fv.s" +void J3DTevBlock16::diffTexCoordScale() { + u8 tevStageNum = mTevStageNum; + for (u32 i = 0; i < tevStageNum; i += 2) { + loadTexCoordScale( + GXTexCoordID(mTevOrder[i].getTevOrderInfo().mTexCoord & 7), + J3DSys::sTexCoordScaleTable[mTevOrder[i].getTevOrderInfo().mTexMap & 7] + ); + loadTexCoordScale( + GXTexCoordID(mTevOrder[i + 1].getTevOrderInfo().mTexCoord & 7), + J3DSys::sTexCoordScaleTable[mTevOrder[i + 1].getTevOrderInfo().mTexMap & 7] + ); + } } -#pragma pop /* 8031DED0-8031DFB4 318810 00E4+00 1/0 0/0 0/0 .text ptrToIndex__13J3DTevBlock16Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock16::ptrToIndex() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/ptrToIndex__13J3DTevBlock16Fv.s" +void J3DTevBlock16::ptrToIndex() { + GDSetCurrOffset(mTexNoOffset); + u8* pStart = GDGetCurrPointer(); + + u32 offs = 0; + for (u32 i = 0; i < 8; i++) { + if (mTexNo[i] != 0xFFFF) { + GDSetCurrOffset(mTexNoOffset + offs); + patchTexNo_PtrToIdx(i, mTexNo[i]); + offs += 0x14; + if (j3dSys.getTexture()->getResTIMG(mTexNo[i])->indexTexture == 1) { + offs += 0x23; + } + } + } + + u8 *pEnd = GDGetCurrPointer(); + DCStoreRange(pStart, pEnd - pStart); } -#pragma pop /* 8031DFB4-8031E098 3188F4 00E4+00 1/0 0/0 0/0 .text ptrToIndex__18J3DTevBlockPatchedFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlockPatched::ptrToIndex() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/ptrToIndex__18J3DTevBlockPatchedFv.s" +void J3DTevBlockPatched::ptrToIndex() { + GDSetCurrOffset(mTexNoOffset); + u8* pStart = GDGetCurrPointer(); + + u32 offs = 0; + for (u32 i = 0; i < 8; i++) { + if (mTexNo[i] != 0xFFFF) { + GDSetCurrOffset(mTexNoOffset + offs); + patchTexNo_PtrToIdx(i, mTexNo[i]); + offs += 0x14; + if (j3dSys.getTexture()->getResTIMG(mTexNo[i])->indexTexture == 1) { + offs += 0x23; + } + } + } + + u8 *pEnd = GDGetCurrPointer(); + DCStoreRange(pStart, pEnd - pStart); } -#pragma pop /* 8031E098-8031E12C 3189D8 0094+00 5/5 1/1 0/0 .text indexToPtr_private__11J3DTevBlockFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock::indexToPtr_private(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/indexToPtr_private__11J3DTevBlockFUl.s" +void J3DTevBlock::indexToPtr_private(u32 offs) { + GDSetCurrOffset(offs); + u8* pStart = GDGetCurrPointer(); + + for (u32 i = 0; ; i++) { + u8* pDL = GDGetCurrPointer(); + if (!isTexNoReg(pDL)) { + break; + } + + u16 texNoReg = getTexNoReg(pDL); + loadTexNo(i, texNoReg); + } + + u8 *pEnd = GDGetCurrPointer(); + DCStoreRange(pStart, pEnd - pStart); } -#pragma pop /* 8031E12C-8031E328 318A6C 01FC+00 1/0 0/0 0/0 .text load__15J3DIndBlockFullFv */ +// regalloc +#ifdef NONMATCHING +void J3DIndBlockFull::load() { + u8 indTexStageNum = mIndTexStageNum; + for (u32 i = 0; i < indTexStageNum; i++) { + mIndTexMtx[i].load(i); + } + for (u32 i = 0; i < indTexStageNum; i += 2) { + J3DGDSetIndTexCoordScale( + GXIndTexStageID(i), + mIndTexCoordScale[i].getScaleS(), + mIndTexCoordScale[i].getScaleT(), + mIndTexCoordScale[i + 1].getScaleS(), + mIndTexCoordScale[i + 1].getScaleT() + ); + } + loadTexCoordScale(mIndTexOrder[0].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[0].getMap() & 7]); + loadTexCoordScale(mIndTexOrder[1].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[1].getMap() & 7]); + loadTexCoordScale(mIndTexOrder[2].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[2].getMap() & 7]); + loadTexCoordScale(mIndTexOrder[3].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[3].getMap() & 7]); + J3DGDSetIndTexOrder( + indTexStageNum, + mIndTexOrder[0].getCoord(), + mIndTexOrder[0].getMap(), + mIndTexOrder[1].getCoord(), + mIndTexOrder[1].getMap(), + mIndTexOrder[2].getCoord(), + mIndTexOrder[2].getMap(), + mIndTexOrder[3].getCoord(), + mIndTexOrder[3].getMap() + ); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1659,18 +2097,47 @@ asm void J3DIndBlockFull::load() { #include "asm/JSystem/J3DGraphBase/J3DMatBlock/load__15J3DIndBlockFullFv.s" } #pragma pop +#endif /* 8031E328-8031E408 318C68 00E0+00 1/0 0/0 0/0 .text diff__15J3DIndBlockFullFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DIndBlockFull::diff(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diff__15J3DIndBlockFullFUl.s" +void J3DIndBlockFull::diff(u32 flag) { + if ((flag & 0x08000000) == 0) { + return; + } + u8 indTexStageNum = mIndTexStageNum; + mIndTexMtx[0].load(0); + J3DGDSetIndTexCoordScale( + GX_INDTEXSTAGE0, + mIndTexCoordScale[0].getScaleS(), + mIndTexCoordScale[0].getScaleT(), + mIndTexCoordScale[1].getScaleS(), + mIndTexCoordScale[1].getScaleT() + ); + loadTexCoordScale(mIndTexOrder[0].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[0].getMap() & 7]); + J3DGDSetIndTexOrder( + indTexStageNum, + mIndTexOrder[0].getCoord(), + mIndTexOrder[0].getMap(), + mIndTexOrder[1].getCoord(), + mIndTexOrder[1].getMap(), + mIndTexOrder[2].getCoord(), + mIndTexOrder[2].getMap(), + mIndTexOrder[3].getCoord(), + mIndTexOrder[3].getMap() + ); } -#pragma pop /* 8031E408-8031E6C8 318D48 02C0+00 1/0 0/0 0/0 .text load__13J3DPEBlockOpaFv */ +// vtable +#ifdef NONMATCHING +void J3DPEBlockOpa::load() { + GDOverflowCheck(0x1e); + J3DGDSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_AND, GX_ALWAYS, 0); + J3DGDSetBlendMode(GX_BM_NONE, GX_BL_ONE, GX_BL_ZERO, GX_LO_COPY); + J3DGDSetZMode(1, GX_LEQUAL, 1); + J3DGDSetZCompLoc(1); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1680,8 +2147,19 @@ extern "C" asm void load__13J3DPEBlockOpaFv() { #include "asm/JSystem/J3DGraphBase/J3DMatBlock/load__13J3DPEBlockOpaFv.s" } #pragma pop +#endif /* 8031E6C8-8031E98C 319008 02C4+00 1/0 0/0 0/0 .text load__17J3DPEBlockTexEdgeFv */ +// vtable +#ifdef NONMATCHING +void J3DPEBlockTexEdge::load() { + GDOverflowCheck(0x1e); + J3DGDSetAlphaCompare(GX_GEQUAL, 0x80, GX_AOP_AND, GX_LEQUAL, 0xff); + J3DGDSetBlendMode(GX_BM_NONE, GX_BL_ONE, GX_BL_ZERO, GX_LO_COPY); + J3DGDSetZMode(1, GX_LEQUAL, 1); + J3DGDSetZCompLoc(0); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1691,8 +2169,19 @@ extern "C" asm void load__17J3DPEBlockTexEdgeFv() { #include "asm/JSystem/J3DGraphBase/J3DMatBlock/load__17J3DPEBlockTexEdgeFv.s" } #pragma pop +#endif /* 8031E98C-8031EC50 3192CC 02C4+00 1/0 0/0 0/0 .text load__13J3DPEBlockXluFv */ +// vtable +#ifdef NONMATCHING +void J3DPEBlockXlu::load() { + GDOverflowCheck(0x1e); + J3DGDSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_AND,GX_ALWAYS, 0); + J3DGDSetBlendMode(GX_BM_BLEND, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_COPY); + J3DGDSetZMode(1, GX_LEQUAL, 0); + J3DGDSetZCompLoc(1); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1702,109 +2191,121 @@ extern "C" asm void load__13J3DPEBlockXluFv() { #include "asm/JSystem/J3DGraphBase/J3DMatBlock/load__13J3DPEBlockXluFv.s" } #pragma pop +#endif + +inline void loadZCompLoc(u8 compLoc) { + J3DGDSetZCompLoc(compLoc); +} /* 8031EC50-8031F0D8 319590 0488+00 1/0 0/0 0/0 .text load__16J3DPEBlockFogOffFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFogOff::load() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/load__16J3DPEBlockFogOffFv.s" +void J3DPEBlockFogOff::load() { + GDOverflowCheck(0x1e); + mAlphaComp.load(); + mBlend.load(mDither); + mZMode.load(); + loadZCompLoc(mZCompLoc); } -#pragma pop /* 8031F0D8-8031F3C0 319A18 02E8+00 1/0 0/0 0/0 .text diffBlend__16J3DPEBlockFogOffFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFogOff::diffBlend() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffBlend__16J3DPEBlockFogOffFv.s" +void J3DPEBlockFogOff::diffBlend() { + GDOverflowCheck(0xf); + mBlend.load(mDither); + mZMode.load(); } -#pragma pop + /* 8031F3C0-8031F890 319D00 04D0+00 1/0 0/0 0/0 .text load__14J3DPEBlockFullFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFull::load() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/load__14J3DPEBlockFullFv.s" +void J3DPEBlockFull::load() { + mFogOffset = GDGetCurrOffset(); + GDOverflowCheck(0x55); + mFog.load(); + mAlphaComp.load(); + mBlend.load(mDither); + mZMode.load(); + loadZCompLoc(mZCompLoc); } -#pragma pop /* 8031F890-8031F940 31A1D0 00B0+00 1/0 0/0 0/0 .text patch__14J3DPEBlockFullFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFull::patch() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/patch__14J3DPEBlockFullFv.s" +void J3DPEBlockFull::patch() { + GDSetCurrOffset(mFogOffset); + GDOverflowCheck(0x37); + u8* start = GDGetCurrPointer(); + mFog.load(); + u8* end = GDGetCurrPointer(); + DCStoreRange(start, end - start); } -#pragma pop /* 8031F940-8031F9B8 31A280 0078+00 1/0 0/0 0/0 .text diffFog__14J3DPEBlockFullFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFull::diffFog() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffFog__14J3DPEBlockFullFv.s" +void J3DPEBlockFull::diffFog() { + GDOverflowCheck(0x37); + mFog.load(); } -#pragma pop /* 8031F9B8-8031FCA0 31A2F8 02E8+00 1/0 0/0 0/0 .text diffBlend__14J3DPEBlockFullFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFull::diffBlend() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diffBlend__14J3DPEBlockFullFv.s" +void J3DPEBlockFull::diffBlend() { + GDOverflowCheck(0xf); + mBlend.load(mDither); + mZMode.load(); } -#pragma pop /* 8031FCA0-8031FD08 31A5E0 0068+00 1/0 0/0 0/0 .text diff__14J3DPEBlockFullFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFull::diff(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diff__14J3DPEBlockFullFUl.s" +void J3DPEBlockFull::diff(u32 flag) { + if ((flag & 0x10000000)) { + diffFog(); + } + if ((flag & 0x20000000)) { + diffBlend(); + } } -#pragma pop /* 8031FD08-8031FDE4 31A648 00DC+00 1/0 0/0 0/0 .text * reset__21J3DColorBlockLightOffFP13J3DColorBlock */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOff::reset(J3DColorBlock* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/reset__21J3DColorBlockLightOffFP13J3DColorBlock.s" +void J3DColorBlockLightOff::reset(J3DColorBlock* pBlock) { + mColorChanNum = pBlock->getColorChanNum(); + + for (u32 i = 0; i < ARRAY_SIZE(mMatColor); i++) { + mMatColor[i] = *pBlock->getMatColor(i); + } + for (u32 i = 0; i < ARRAY_SIZE(mColorChan); i++) { + mColorChan[i] = *pBlock->getColorChan(i); + } } -#pragma pop /* 8031FDE4-8031FF34 31A724 0150+00 1/0 0/0 0/0 .text * reset__22J3DColorBlockAmbientOnFP13J3DColorBlock */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockAmbientOn::reset(J3DColorBlock* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/reset__22J3DColorBlockAmbientOnFP13J3DColorBlock.s" +void J3DColorBlockAmbientOn::reset(J3DColorBlock* pBlock) { + mColorChanNum = pBlock->getColorChanNum(); + + for (u32 i = 0; i < ARRAY_SIZE(mMatColor); i++) { + mMatColor[i] = *pBlock->getMatColor(i); + } + for (u32 i = 0; i < ARRAY_SIZE(mColorChan); i++) { + mColorChan[i] = *pBlock->getColorChan(i); + } + for (u32 i = 0; i < ARRAY_SIZE(mAmbColor); i++) { + if (pBlock->getAmbColor(i) != NULL) { + mAmbColor[i] = *pBlock->getAmbColor(i); + } + } } -#pragma pop /* 8031FF34-80320084 31A874 0150+00 1/0 0/0 0/0 .text * reset__20J3DColorBlockLightOnFP13J3DColorBlock */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOn::reset(J3DColorBlock* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/reset__20J3DColorBlockLightOnFP13J3DColorBlock.s" +void J3DColorBlockLightOn::reset(J3DColorBlock* pBlock) { + mColorChanNum = pBlock->getColorChanNum(); + + for (u32 i = 0; i < ARRAY_SIZE(mMatColor); i++) { + mMatColor[i] = *pBlock->getMatColor(i); + } + for (u32 i = 0; i < ARRAY_SIZE(mColorChan); i++) { + mColorChan[i] = *pBlock->getColorChan(i); + } + for (u32 i = 0; i < ARRAY_SIZE(mAmbColor); i++) { + if (pBlock->getAmbColor(i) != NULL) { + mAmbColor[i] = *pBlock->getAmbColor(i); + } + } } -#pragma pop /* ############################################################################################## */ /* 803A1EA8-803A1EA8 02E508 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -1817,6 +2318,25 @@ SECTION_DEAD static char const* const pad_803A1EC5 = "\0\0"; /* 80320084-803201A0 31A9C4 011C+00 1/0 0/0 0/0 .text * reset__21J3DTexGenBlockPatchedFP14J3DTexGenBlock */ +// vtable +#ifdef NONMATCHING +void J3DTexGenBlockPatched::reset(J3DTexGenBlock* pBlock) { + mTexGenNum = pBlock->getTexGenNum(); + for (u32 i = 0; i < 8; i++) { + mTexCoord[i] = *pBlock->getTexCoord(i); + } + for (u32 i = 0; i < 8; i++) { + if (pBlock->getTexMtx(i) != NULL) { + if (mTexMtx[i] != NULL) { + memcpy(mTexMtx[i], pBlock->getTexMtx(i), sizeof(*mTexMtx[i])); + DCStoreRange(mTexMtx[i], sizeof(*mTexMtx[i])); + } else { + OSReport("Error : TexMtx[%d] is Null.\n", i); + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1826,9 +2346,31 @@ extern "C" asm void reset__21J3DTexGenBlockPatchedFP14J3DTexGenBlock() { #include "asm/JSystem/J3DGraphBase/J3DMatBlock/reset__21J3DTexGenBlockPatchedFP14J3DTexGenBlock.s" } #pragma pop +#endif /* 803201A0-803202DC 31AAE0 013C+00 1/0 0/0 0/0 .text reset__15J3DTexGenBlock4FP14J3DTexGenBlock */ +// vtable +#ifdef NONMATCHING +void J3DTexGenBlock4::reset(J3DTexGenBlock* pBlock) { + mTexGenNum = pBlock->getTexGenNum(); + for (u32 i = 0; i < 4; i++) { + mTexCoord[i] = *pBlock->getTexCoord(i); + } + for (u32 i = 0; i < 4; i++) { + if (pBlock->getTexMtx(i) != NULL) { + if (mTexMtx[i] != NULL) { + memcpy(mTexMtx[i], pBlock->getTexMtx(i), sizeof(*mTexMtx[i])); + DCStoreRange(mTexMtx[i], sizeof(*mTexMtx[i])); + } else { + OSReport("Error : TexMtx[%d] is Null.\n", i); + } + } + } + + mNBTScale = *pBlock->getNBTScale(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1838,9 +2380,31 @@ extern "C" asm void reset__15J3DTexGenBlock4FP14J3DTexGenBlock() { #include "asm/JSystem/J3DGraphBase/J3DMatBlock/reset__15J3DTexGenBlock4FP14J3DTexGenBlock.s" } #pragma pop +#endif /* 803202DC-80320418 31AC1C 013C+00 1/0 0/0 0/0 .text * reset__19J3DTexGenBlockBasicFP14J3DTexGenBlock */ +// vtable +#ifdef NONMATCHING +void J3DTexGenBlockBasic::reset(J3DTexGenBlock* pBlock) { + mTexGenNum = pBlock->getTexGenNum(); + for (u32 i = 0; i < 8; i++) { + mTexCoord[i] = *pBlock->getTexCoord(i); + } + for (u32 i = 0; i < 8; i++) { + if (pBlock->getTexMtx(i) != NULL) { + if (mTexMtx[i] != NULL) { + memcpy(mTexMtx[i], pBlock->getTexMtx(i), sizeof(*mTexMtx[i])); + DCStoreRange(mTexMtx[i], sizeof(*mTexMtx[i])); + } else { + OSReport("Error : TexMtx[%d] is Null.\n", i); + } + } + } + + mNBTScale = *pBlock->getNBTScale(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1850,9 +2414,29 @@ extern "C" asm void reset__19J3DTexGenBlockBasicFP14J3DTexGenBlock() { #include "asm/JSystem/J3DGraphBase/J3DMatBlock/reset__19J3DTexGenBlockBasicFP14J3DTexGenBlock.s" } #pragma pop +#endif /* 80320418-803205D4 31AD58 01BC+00 1/0 0/0 0/0 .text reset__18J3DTevBlockPatchedFP11J3DTevBlock */ +#ifdef NONMATCHING +// vtable +void J3DTevBlockPatched::reset(J3DTevBlock* pBlock) { + mTevStageNum = pBlock->getTevStageNum(); + for (u32 i = 0; i < 8; i++) { + mTexNo[i] = pBlock->getTexNo(i); + } + for (u32 i = 0; i < 4; i++) { + mTevColor[i] = *pBlock->getTevColor(i); + } + for (u32 i = 0; i < 4; i++) { + mTevKColor[i] = *pBlock->getTevKColor(i); + } + for (u32 i = 0; i < 8; i++) { + mTevStage[i] = *pBlock->getTevStage(i); + mIndTevStage[i] = *pBlock->getIndTevStage(i); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1862,8 +2446,18 @@ extern "C" asm void reset__18J3DTevBlockPatchedFP11J3DTevBlock() { #include "asm/JSystem/J3DGraphBase/J3DMatBlock/reset__18J3DTevBlockPatchedFP11J3DTevBlock.s" } #pragma pop +#endif /* 803205D4-803206AC 31AF14 00D8+00 1/0 0/0 0/0 .text reset__12J3DTevBlock1FP11J3DTevBlock */ +// vtable +#ifdef NONMATCHING +void J3DTevBlock1::reset(J3DTevBlock* pBlock) { + mTexNo[0] = pBlock->getTexNo(0); + mTevOrder[0] = *pBlock->getTevOrder(0); + mTevStage[0] = *pBlock->getTevStage(0); + mIndTevStage[0] = *pBlock->getIndTevStage(0); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1873,8 +2467,36 @@ extern "C" asm void reset__12J3DTevBlock1FP11J3DTevBlock() { #include "asm/JSystem/J3DGraphBase/J3DMatBlock/reset__12J3DTevBlock1FP11J3DTevBlock.s" } #pragma pop +#endif /* 803206AC-8032098C 31AFEC 02E0+00 1/0 0/0 0/0 .text reset__12J3DTevBlock2FP11J3DTevBlock */ +// vtable +#ifdef NONMATCHING +void J3DTevBlock2::reset(J3DTevBlock* pBlock) { + mTevStageNum = pBlock->getTevStageNum(); + mTexNo[0] = pBlock->getTexNo(0); + mTexNo[1] = pBlock->getTexNo(1); + mTevStage[0] = *pBlock->getTevStage(0); + mTevStage[1] = *pBlock->getTevStage(1); + mIndTevStage[0] = *pBlock->getIndTevStage(0); + mIndTevStage[1] = *pBlock->getIndTevStage(1); + mTevOrder[0] = *pBlock->getTevOrder(0); + mTevOrder[1] = *pBlock->getTevOrder(1); + mTevKColorSel[0] = pBlock->getTevKColorSel(0); + mTevKColorSel[1] = pBlock->getTevKColorSel(1); + mTevKAlphaSel[0] = pBlock->getTevKAlphaSel(0); + mTevKAlphaSel[1] = pBlock->getTevKAlphaSel(1); + for (u32 i = 0; i < 4; i++) { + mTevColor[i] = *pBlock->getTevColor(i); + } + for (u32 i = 0; i < 4; i++) { + mTevKColor[i] = *pBlock->getTevKColor(i); + } + for (u32 i = 0; i < 4; i++) { + mTevSwapModeTable[i] = *pBlock->getTevSwapModeTable(i); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1884,8 +2506,45 @@ extern "C" asm void reset__12J3DTevBlock2FP11J3DTevBlock() { #include "asm/JSystem/J3DGraphBase/J3DMatBlock/reset__12J3DTevBlock2FP11J3DTevBlock.s" } #pragma pop +#endif /* 8032098C-80320E24 31B2CC 0498+00 1/0 0/0 0/0 .text reset__12J3DTevBlock4FP11J3DTevBlock */ +// vtable +#ifdef NONMATCHING +void J3DTevBlock4::reset(J3DTevBlock* pBlock) { + mTevStageNum = pBlock->getTevStageNum(); + mTexNo[0] = pBlock->getTexNo(0); + mTexNo[1] = pBlock->getTexNo(1); + mTexNo[2] = pBlock->getTexNo(2); + mTexNo[3] = pBlock->getTexNo(3); + mTevStage[0] = *pBlock->getTevStage(0); + mTevStage[1] = *pBlock->getTevStage(1); + mTevStage[2] = *pBlock->getTevStage(2); + mTevStage[3] = *pBlock->getTevStage(3); + mIndTevStage[0] = *pBlock->getIndTevStage(0); + mIndTevStage[1] = *pBlock->getIndTevStage(1); + mIndTevStage[2] = *pBlock->getIndTevStage(2); + mIndTevStage[3] = *pBlock->getIndTevStage(3); + mTevOrder[0] = *pBlock->getTevOrder(0); + mTevOrder[1] = *pBlock->getTevOrder(1); + mTevOrder[2] = *pBlock->getTevOrder(2); + mTevOrder[3] = *pBlock->getTevOrder(3); + mTevKColorSel[0] = pBlock->getTevKColorSel(0); + mTevKColorSel[1] = pBlock->getTevKColorSel(1); + mTevKColorSel[2] = pBlock->getTevKColorSel(2); + mTevKColorSel[3] = pBlock->getTevKColorSel(3); + mTevKAlphaSel[0] = pBlock->getTevKAlphaSel(0); + mTevKAlphaSel[1] = pBlock->getTevKAlphaSel(1); + mTevKAlphaSel[2] = pBlock->getTevKAlphaSel(2); + mTevKAlphaSel[3] = pBlock->getTevKAlphaSel(3); + for (u32 i = 0; i < 4; i++) + mTevColor[i] = *pBlock->getTevColor(i); + for (u32 i = 0; i < 4; i++) + mTevKColor[i] = *pBlock->getTevKColor(i); + for (u32 i = 0; i < 4; i++) + mTevSwapModeTable[i] = *pBlock->getTevSwapModeTable(i); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1895,8 +2554,40 @@ extern "C" asm void reset__12J3DTevBlock4FP11J3DTevBlock() { #include "asm/JSystem/J3DGraphBase/J3DMatBlock/reset__12J3DTevBlock4FP11J3DTevBlock.s" } #pragma pop +#endif /* 80320E24-803210B0 31B764 028C+00 1/0 0/0 0/0 .text reset__13J3DTevBlock16FP11J3DTevBlock */ +// vtable +#ifdef NONMATCHING +void J3DTevBlock16::reset(J3DTevBlock* pBlock) { + mTevStageNum = pBlock->getTevStageNum(); + for (u32 i = 0; i < 8; i++) { + mTexNo[i] = pBlock->getTexNo(i); + } + for (u32 i = 0; i < 16; i++) { + mTevOrder[i] = *pBlock->getTevOrder(i); + } + for (u32 i = 0; i < 16; i++) { + mTevStage[i] = *pBlock->getTevStage(i); + mIndTevStage[i] = *pBlock->getIndTevStage(i); + } + for (u32 i = 0; i < 4; i++) { + mTevColor[i] = *pBlock->getTevColor(i); + } + for (u32 i = 0; i < 4; i++) { + mTevKColor[i] = *pBlock->getTevKColor(i); + } + for (u32 i = 0; i < 16; i++) { + mTevKColorSel[i] = pBlock->getTevKColorSel(i); + } + for (u32 i = 0; i < 16; i++) { + mTevKAlphaSel[i] = pBlock->getTevKAlphaSel(i); + } + for (u32 i = 0; i < 4; i++) { + mTevSwapModeTable[i] = *pBlock->getTevSwapModeTable(i); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1906,8 +2597,24 @@ extern "C" asm void reset__13J3DTevBlock16FP11J3DTevBlock() { #include "asm/JSystem/J3DGraphBase/J3DMatBlock/reset__13J3DTevBlock16FP11J3DTevBlock.s" } #pragma pop +#endif /* 803210B0-803211B4 31B9F0 0104+00 1/0 0/0 0/0 .text reset__15J3DIndBlockFullFP11J3DIndBlock */ +// vtable +#ifdef NONMATCHING +void J3DIndBlockFull::reset(J3DIndBlock* pBlock) { + mIndTexStageNum = pBlock->getIndTexStageNum(); + for (u32 i = 0; i < 4; i++) { + mIndTexOrder[i] = *pBlock->getIndTexOrder(i); + } + for (u32 i = 0; i < 3; i++) { + mIndTexMtx[i] = *pBlock->getIndTexMtx(i); + } + for (u32 i = 0; i < 4; i++) { + mIndTexCoordScale[i] = *pBlock->getIndTexCoordScale(i); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1917,8 +2624,23 @@ extern "C" asm void reset__15J3DIndBlockFullFP11J3DIndBlock() { #include "asm/JSystem/J3DGraphBase/J3DMatBlock/reset__15J3DIndBlockFullFP11J3DIndBlock.s" } #pragma pop +#endif /* 803211B4-8032129C 31BAF4 00E8+00 1/0 0/0 0/0 .text reset__16J3DPEBlockFogOffFP10J3DPEBlock */ +// vtable +#ifdef NONMATCHING +void J3DPEBlockFogOff::reset(J3DPEBlock* pBlock) { + switch (pBlock->getType()) { + case 'PEFL': + case 'PEFG': + mAlphaComp = *pBlock->getAlphaComp(); + mBlend = *pBlock->getBlend(); + mZMode = *pBlock->getZMode(); + mZCompLoc = pBlock->getZCompLoc(); + break; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1928,8 +2650,27 @@ extern "C" asm void reset__16J3DPEBlockFogOffFP10J3DPEBlock() { #include "asm/JSystem/J3DGraphBase/J3DMatBlock/reset__16J3DPEBlockFogOffFP10J3DPEBlock.s" } #pragma pop +#endif /* 8032129C-803213C0 31BBDC 0124+00 1/0 0/0 0/0 .text reset__14J3DPEBlockFullFP10J3DPEBlock */ +// vtable +#ifdef NONMATCHING +void J3DPEBlockFull::reset(J3DPEBlock* pBlock) { + if (pBlock->getFog() != NULL) { + mFog = *pBlock->getFog(); + } + + switch (pBlock->getType()) { + case 'PEFL': + case 'PEFG': + mAlphaComp = *pBlock->getAlphaComp(); + mBlend = *pBlock->getBlend(); + mZMode = *pBlock->getZMode(); + mZCompLoc = pBlock->getZCompLoc(); + break; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1939,6 +2680,7 @@ extern "C" asm void reset__14J3DPEBlockFullFP10J3DPEBlock() { #include "asm/JSystem/J3DGraphBase/J3DMatBlock/reset__14J3DPEBlockFullFP10J3DPEBlock.s" } #pragma pop +#endif /* ############################################################################################## */ /* 803CDF30-803CDF60 -00001 0030+00 1/1 0/0 0/0 .data @5062 */ @@ -1966,6 +2708,67 @@ SECTION_SDATA2 static u8 lit_5060[4] = { }; /* 803213C0-80321584 31BD00 01C4+00 4/0 0/0 0/0 .text calc__21J3DTexGenBlockPatchedFPA4_Cf */ +// Matches with literals +#ifdef NONMATCHING +void J3DTexGenBlockPatched::calc(const Mtx modelMtx) { + Mtx viewMtx; + for (int i = 0; i < 8; i++) { + if (mTexMtx[i] != NULL) { + u8 texMtxMode = mTexMtx[i]->getTexMtxInfo().mInfo & 0x3f; + mTexCoord[i].resetTexMtxReg(); + switch (texMtxMode) { + case J3DTexMtxMode_EnvmapBasic: + case J3DTexMtxMode_EnvmapOld: + case J3DTexMtxMode_Envmap: + + if (j3dSys.checkFlag(8) == 0) { + MTXConcat(j3dSys.getViewMtx(), modelMtx, viewMtx); + } else { + MTXCopy(j3dSys.getViewMtx(), viewMtx); + } + viewMtx[0][3] = 0.0f; + viewMtx[1][3] = 0.0f; + viewMtx[2][3] = 0.0f; + mTexMtx[i]->calc(viewMtx); + break; + case J3DTexMtxMode_ProjmapBasic: + case J3DTexMtxMode_Projmap: + if (j3dSys.checkFlag(4) == 0) { + mTexMtx[i]->calc(modelMtx); + } else { + mTexMtx[i]->calc(j3dDefaultMtx); + } + break; + case J3DTexMtxMode_ViewProjmapBasic: + case J3DTexMtxMode_ViewProjmap: + if (j3dSys.checkFlag(4) == 0) { + MTXConcat(j3dSys.getViewMtx(), modelMtx, viewMtx); + mTexMtx[i]->calc( viewMtx); + } else { + mTexMtx[i]->calc(j3dSys.getViewMtx()); + } + break; + case J3DTexMtxMode_Unknown5: + case J3DTexMtxMode_EnvmapOldEffectMtx: + case J3DTexMtxMode_EnvmapEffectMtx: + if (j3dSys.checkFlag(8) == 0) { + MTXCopy(modelMtx, viewMtx); + viewMtx[0][3] = 0.0f; + viewMtx[1][3] = 0.0f; + viewMtx[2][3] = 0.0f; + mTexMtx[i]->calc(viewMtx); + } else { + mTexMtx[i]->calc(j3dDefaultMtx); + } + break; + default: + mTexMtx[i]->calc(j3dDefaultMtx); + break; + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1974,6 +2777,7 @@ asm void J3DTexGenBlockPatched::calc(f32 const (*param_0)[4]) { #include "asm/JSystem/J3DGraphBase/J3DMatBlock/calc__21J3DTexGenBlockPatchedFPA4_Cf.s" } #pragma pop +#endif /* ############################################################################################## */ /* 803CDF60-803CDF90 -00001 0030+00 1/1 0/0 0/0 .data @5110 */ @@ -2061,28 +2865,23 @@ asm void J3DTexGenBlockPatched::calcPostTexMtxWithoutViewMtx(f32 const (*param_0 /* 80321938-8032193C 31C278 0004+00 1/0 1/0 0/0 .text diffTevReg__11J3DTevBlockFv */ void J3DTevBlock::diffTevReg() { - /* empty function */ } /* 8032193C-80321940 31C27C 0004+00 1/0 1/0 0/0 .text diffTevStageIndirect__11J3DTevBlockFv */ void J3DTevBlock::diffTevStageIndirect() { - /* empty function */ } /* 80321940-80321944 31C280 0004+00 1/0 1/0 0/0 .text diffTevStage__11J3DTevBlockFv */ void J3DTevBlock::diffTevStage() { - /* empty function */ } /* 80321944-80321948 31C284 0004+00 1/0 1/0 0/0 .text diffTexCoordScale__11J3DTevBlockFv */ void J3DTevBlock::diffTexCoordScale() { - /* empty function */ } /* 80321948-8032194C 31C288 0004+00 1/0 1/0 0/0 .text diffTexNo__11J3DTevBlockFv */ void J3DTevBlock::diffTexNo() { - /* empty function */ } /* 8032194C-80321958 31C28C 000C+00 1/0 0/0 0/0 .text getType__14J3DPEBlockFullFv */ @@ -2092,193 +2891,108 @@ u32 J3DPEBlockFull::getType() { /* 80321958-8032197C 31C298 0024+00 1/0 0/0 0/0 .text setFog__14J3DPEBlockFullFP6J3DFog */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFull::setFog(J3DFog* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setFog__14J3DPEBlockFullFP6J3DFog.s" +void J3DPEBlockFull::setFog(J3DFog* pFog) { + mFog.setFogInfo(pFog->getFogInfo()); } -#pragma pop /* 8032197C-803219A0 31C2BC 0024+00 1/0 0/0 0/0 .text setFog__14J3DPEBlockFullF6J3DFog */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFull::setFog(J3DFog param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setFog__14J3DPEBlockFullF6J3DFog.s" +void J3DPEBlockFull::setFog(J3DFog fog) { + mFog.setFogInfo(fog.getFogInfo()); } -#pragma pop /* 803219A0-803219A8 31C2E0 0008+00 1/0 0/0 0/0 .text getFog__14J3DPEBlockFullFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFog* J3DPEBlockFull::getFog() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getFog__14J3DPEBlockFullFv.s" +J3DFog* J3DPEBlockFull::getFog() { + return &mFog; } -#pragma pop /* 803219A8-803219C4 31C2E8 001C+00 1/0 0/0 0/0 .text * setAlphaComp__14J3DPEBlockFullFRC12J3DAlphaComp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFull::setAlphaComp(J3DAlphaComp const& param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__14J3DPEBlockFullFRC12J3DAlphaComp.s" +void J3DPEBlockFull::setAlphaComp(J3DAlphaComp const& alphaComp) { + mAlphaComp = alphaComp; } -#pragma pop /* 803219C4-803219E0 31C304 001C+00 1/0 0/0 0/0 .text * setAlphaComp__14J3DPEBlockFullFPC12J3DAlphaComp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFull::setAlphaComp(J3DAlphaComp const* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__14J3DPEBlockFullFPC12J3DAlphaComp.s" +void J3DPEBlockFull::setAlphaComp(J3DAlphaComp const* alphaComp) { + mAlphaComp = *alphaComp; } -#pragma pop /* 803219E0-803219E8 31C320 0008+00 1/0 0/0 0/0 .text getAlphaComp__14J3DPEBlockFullFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DAlphaComp* J3DPEBlockFull::getAlphaComp() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getAlphaComp__14J3DPEBlockFullFv.s" +J3DAlphaComp* J3DPEBlockFull::getAlphaComp() { + return &mAlphaComp; } -#pragma pop /* 803219E8-803219F4 31C328 000C+00 1/0 0/0 0/0 .text setBlend__14J3DPEBlockFullFRC8J3DBlend */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFull::setBlend(J3DBlend const& param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__14J3DPEBlockFullFRC8J3DBlend.s" +void J3DPEBlockFull::setBlend(J3DBlend const& blend) { + mBlend = blend; } -#pragma pop /* 803219F4-80321A00 31C334 000C+00 1/0 0/0 0/0 .text setBlend__14J3DPEBlockFullFPC8J3DBlend */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFull::setBlend(J3DBlend const* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__14J3DPEBlockFullFPC8J3DBlend.s" +void J3DPEBlockFull::setBlend(J3DBlend const* blend) { + mBlend = *blend; } -#pragma pop /* 80321A00-80321A08 31C340 0008+00 1/0 0/0 0/0 .text getBlend__14J3DPEBlockFullFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DBlend* J3DPEBlockFull::getBlend() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getBlend__14J3DPEBlockFullFv.s" +J3DBlend* J3DPEBlockFull::getBlend() { + return &mBlend; } -#pragma pop /* 80321A08-80321A14 31C348 000C+00 1/0 0/0 0/0 .text setZMode__14J3DPEBlockFullF8J3DZMode */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFull::setZMode(J3DZMode param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__14J3DPEBlockFullF8J3DZMode.s" +void J3DPEBlockFull::setZMode(J3DZMode zMode) { + mZMode = zMode; } -#pragma pop /* 80321A14-80321A20 31C354 000C+00 1/0 0/0 0/0 .text setZMode__14J3DPEBlockFullFPC8J3DZMode */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFull::setZMode(J3DZMode const* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__14J3DPEBlockFullFPC8J3DZMode.s" +void J3DPEBlockFull::setZMode(J3DZMode const* zMode) { + mZMode = *zMode; } -#pragma pop /* 80321A20-80321A28 31C360 0008+00 1/0 0/0 0/0 .text getZMode__14J3DPEBlockFullFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DZMode* J3DPEBlockFull::getZMode() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getZMode__14J3DPEBlockFullFv.s" +J3DZMode* J3DPEBlockFull::getZMode() { + return &mZMode; } -#pragma pop /* 80321A28-80321A30 -00001 0008+00 0/0 0/0 0/0 .text setZCompLoc__14J3DPEBlockFullFUc */ -void J3DPEBlockFull::setZCompLoc(u8 param_0) { - *(u8*)(((u8*)this) + 58) /* this->field_0x3a */ = (u8)(param_0); +void J3DPEBlockFull::setZCompLoc(u8 zCompLoc) { + mZCompLoc = zCompLoc; } /* 80321A30-80321A3C 31C370 000C+00 1/0 0/0 0/0 .text setZCompLoc__14J3DPEBlockFullFPCUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFull::setZCompLoc(u8 const* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__14J3DPEBlockFullFPCUc.s" +void J3DPEBlockFull::setZCompLoc(u8 const* zCompLoc) { + mZCompLoc = *zCompLoc; } -#pragma pop /* 80321A3C-80321A44 31C37C 0008+00 1/0 0/0 0/0 .text getZCompLoc__14J3DPEBlockFullCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J3DPEBlockFull::getZCompLoc() const { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getZCompLoc__14J3DPEBlockFullCFv.s" +u8 J3DPEBlockFull::getZCompLoc() const { + return mZCompLoc; } -#pragma pop /* 80321A44-80321A4C -00001 0008+00 0/0 0/0 0/0 .text setDither__14J3DPEBlockFullFUc */ -void J3DPEBlockFull::setDither(u8 param_0) { - *(u8*)(((u8*)this) + 59) /* this->field_0x3b */ = (u8)(param_0); +void J3DPEBlockFull::setDither(u8 dither) { + mDither = dither; } /* 80321A4C-80321A58 31C38C 000C+00 1/0 0/0 0/0 .text setDither__14J3DPEBlockFullFPCUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFull::setDither(u8 const* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__14J3DPEBlockFullFPCUc.s" +void J3DPEBlockFull::setDither(u8 const* dither) { + mDither = *dither; } -#pragma pop /* 80321A58-80321A60 31C398 0008+00 1/0 0/0 0/0 .text getDither__14J3DPEBlockFullCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J3DPEBlockFull::getDither() const { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getDither__14J3DPEBlockFullCFv.s" +u8 J3DPEBlockFull::getDither() const { + return mDither; } -#pragma pop /* 80321A60-80321A68 31C3A0 0008+00 1/0 0/0 0/0 .text getFogOffset__14J3DPEBlockFullCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J3DPEBlockFull::getFogOffset() const { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getFogOffset__14J3DPEBlockFullCFv.s" +u32 J3DPEBlockFull::getFogOffset() const { + return mFogOffset; } -#pragma pop /* 80321A68-80321A70 -00001 0008+00 0/0 0/0 0/0 .text setFogOffset__14J3DPEBlockFullFUl */ -void J3DPEBlockFull::setFogOffset(u32 param_0) { - *(u32*)(((u8*)this) + 60) /* this->field_0x3c */ = (u32)(param_0); +void J3DPEBlockFull::setFogOffset(u32 fogOffset) { + mFogOffset = fogOffset; } /* ############################################################################################## */ @@ -2318,24 +3032,14 @@ SECTION_DATA extern void* __vt__14J3DPEBlockFull[31] = { }; /* 80321A70-80321ACC 31C3B0 005C+00 1/0 0/0 0/0 .text __dt__14J3DPEBlockFullFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DPEBlockFull::~J3DPEBlockFull() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__14J3DPEBlockFullFv.s" -} -#pragma pop +J3DPEBlockFull::~J3DPEBlockFull() {} /* 80321ACC-80321B00 31C40C 0034+00 1/0 0/0 0/0 .text diff__16J3DPEBlockFogOffFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFogOff::diff(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/diff__16J3DPEBlockFogOffFUl.s" +void J3DPEBlockFogOff::diff(u32 param_1) { + if ((param_1 & 0x20000000) != 0) { + diffBlend(); + } } -#pragma pop /* 80321B00-80321B0C 31C440 000C+00 1/0 0/0 0/0 .text getType__16J3DPEBlockFogOffFv */ u32 J3DPEBlockFogOff::getType() { @@ -2344,149 +3048,84 @@ u32 J3DPEBlockFogOff::getType() { /* 80321B0C-80321B28 31C44C 001C+00 1/0 0/0 0/0 .text * setAlphaComp__16J3DPEBlockFogOffFRC12J3DAlphaComp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFogOff::setAlphaComp(J3DAlphaComp const& param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__16J3DPEBlockFogOffFRC12J3DAlphaComp.s" +void J3DPEBlockFogOff::setAlphaComp(J3DAlphaComp const& alphaComp) { + mAlphaComp = alphaComp; } -#pragma pop /* 80321B28-80321B44 31C468 001C+00 1/0 0/0 0/0 .text * setAlphaComp__16J3DPEBlockFogOffFPC12J3DAlphaComp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFogOff::setAlphaComp(J3DAlphaComp const* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setAlphaComp__16J3DPEBlockFogOffFPC12J3DAlphaComp.s" +void J3DPEBlockFogOff::setAlphaComp(J3DAlphaComp const* alphaComp) { + mAlphaComp = *alphaComp; } -#pragma pop /* 80321B44-80321B4C 31C484 0008+00 1/0 0/0 0/0 .text getAlphaComp__16J3DPEBlockFogOffFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DAlphaComp* J3DPEBlockFogOff::getAlphaComp() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getAlphaComp__16J3DPEBlockFogOffFv.s" +J3DAlphaComp* J3DPEBlockFogOff::getAlphaComp() { + return &mAlphaComp; } -#pragma pop /* 80321B4C-80321B58 31C48C 000C+00 1/0 0/0 0/0 .text setBlend__16J3DPEBlockFogOffFRC8J3DBlend */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFogOff::setBlend(J3DBlend const& param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__16J3DPEBlockFogOffFRC8J3DBlend.s" +void J3DPEBlockFogOff::setBlend(J3DBlend const& blend) { + mBlend = blend; } -#pragma pop /* 80321B58-80321B64 31C498 000C+00 1/0 0/0 0/0 .text setBlend__16J3DPEBlockFogOffFPC8J3DBlend */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFogOff::setBlend(J3DBlend const* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setBlend__16J3DPEBlockFogOffFPC8J3DBlend.s" +void J3DPEBlockFogOff::setBlend(J3DBlend const* blend) { + mBlend = *blend; } -#pragma pop /* 80321B64-80321B6C 31C4A4 0008+00 1/0 0/0 0/0 .text getBlend__16J3DPEBlockFogOffFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DBlend* J3DPEBlockFogOff::getBlend() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getBlend__16J3DPEBlockFogOffFv.s" +J3DBlend* J3DPEBlockFogOff::getBlend() { + return &mBlend; } -#pragma pop /* 80321B6C-80321B78 31C4AC 000C+00 1/0 0/0 0/0 .text setZMode__16J3DPEBlockFogOffF8J3DZMode */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFogOff::setZMode(J3DZMode param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__16J3DPEBlockFogOffF8J3DZMode.s" +void J3DPEBlockFogOff::setZMode(J3DZMode zMode) { + mZMode = zMode; } -#pragma pop /* 80321B78-80321B84 31C4B8 000C+00 1/0 0/0 0/0 .text setZMode__16J3DPEBlockFogOffFPC8J3DZMode */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFogOff::setZMode(J3DZMode const* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setZMode__16J3DPEBlockFogOffFPC8J3DZMode.s" +void J3DPEBlockFogOff::setZMode(J3DZMode const* zMode) { + mZMode = *zMode; } -#pragma pop /* 80321B84-80321B8C 31C4C4 0008+00 1/0 0/0 0/0 .text getZMode__16J3DPEBlockFogOffFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DZMode* J3DPEBlockFogOff::getZMode() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getZMode__16J3DPEBlockFogOffFv.s" +J3DZMode* J3DPEBlockFogOff::getZMode() { + return &mZMode; } -#pragma pop /* 80321B8C-80321B94 -00001 0008+00 0/0 0/0 0/0 .text setZCompLoc__16J3DPEBlockFogOffFUc */ -void J3DPEBlockFogOff::setZCompLoc(u8 param_0) { - *(u8*)(((u8*)this) + 14) /* this->field_0xe */ = (u8)(param_0); +void J3DPEBlockFogOff::setZCompLoc(u8 zCompLoc) { + mZCompLoc = zCompLoc; } /* 80321B94-80321BA0 31C4D4 000C+00 1/0 0/0 0/0 .text setZCompLoc__16J3DPEBlockFogOffFPCUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFogOff::setZCompLoc(u8 const* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__16J3DPEBlockFogOffFPCUc.s" +void J3DPEBlockFogOff::setZCompLoc(u8 const* zCompLoc) { + mZCompLoc = *zCompLoc; } -#pragma pop /* 80321BA0-80321BA8 31C4E0 0008+00 1/0 0/0 0/0 .text getZCompLoc__16J3DPEBlockFogOffCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J3DPEBlockFogOff::getZCompLoc() const { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getZCompLoc__16J3DPEBlockFogOffCFv.s" +u8 J3DPEBlockFogOff::getZCompLoc() const { + return mZCompLoc; } -#pragma pop /* 80321BA8-80321BB0 -00001 0008+00 0/0 0/0 0/0 .text setDither__16J3DPEBlockFogOffFUc */ -void J3DPEBlockFogOff::setDither(u8 param_0) { - *(u8*)(((u8*)this) + 15) /* this->field_0xf */ = (u8)(param_0); +void J3DPEBlockFogOff::setDither(u8 dither) { + mDither = dither; } /* 80321BB0-80321BBC 31C4F0 000C+00 1/0 0/0 0/0 .text setDither__16J3DPEBlockFogOffFPCUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFogOff::setDither(u8 const* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__16J3DPEBlockFogOffFPCUc.s" +void J3DPEBlockFogOff::setDither(u8 const* dither) { + mDither = *dither; } -#pragma pop /* 80321BBC-80321BC4 31C4FC 0008+00 1/0 0/0 0/0 .text getDither__16J3DPEBlockFogOffCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J3DPEBlockFogOff::getDither() const { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getDither__16J3DPEBlockFogOffCFv.s" +u8 J3DPEBlockFogOff::getDither() const { + return mDither; } -#pragma pop /* ############################################################################################## */ /* 803CE06C-803CE0E8 02B18C 007C+00 1/1 1/1 0/0 .data __vt__16J3DPEBlockFogOff */ @@ -2525,24 +3164,12 @@ SECTION_DATA extern void* __vt__16J3DPEBlockFogOff[31] = { }; /* 80321BC4-80321C20 31C504 005C+00 1/0 0/0 0/0 .text __dt__16J3DPEBlockFogOffFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DPEBlockFogOff::~J3DPEBlockFogOff() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__16J3DPEBlockFogOffFv.s" -} -#pragma pop +J3DPEBlockFogOff::~J3DPEBlockFogOff() {} /* 80321C20-80321C44 31C560 0024+00 1/0 0/0 0/0 .text indexToPtr__13J3DTevBlock16Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock16::indexToPtr() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/indexToPtr__13J3DTevBlock16Fv.s" +void J3DTevBlock16::indexToPtr() { + indexToPtr_private(mTexNoOffset); } -#pragma pop /* 80321C44-80321C50 31C584 000C+00 1/0 0/0 0/0 .text getType__13J3DTevBlock16Fv */ u32 J3DTevBlock16::getType() { @@ -2550,14 +3177,9 @@ u32 J3DTevBlock16::getType() { } /* 80321C50-80321C60 31C590 0010+00 1/0 0/0 0/0 .text setTexNo__13J3DTevBlock16FUlUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock16::setTexNo(u32 param_0, u16 param_1) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTexNo__13J3DTevBlock16FUlUs.s" +void J3DTevBlock16::setTexNo(u32 param_1, u16 param_2) { + mTexNo[param_1] = param_2; } -#pragma pop /* 80321C60-80321C74 31C5A0 0014+00 1/0 0/0 0/0 .text setTexNo__13J3DTevBlock16FUlPCUs */ #pragma push @@ -2637,7 +3259,7 @@ asm void J3DTevBlock16::setTevColor(u32 param_0, J3DGXColorS10 const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm GXColorS10* J3DTevBlock16::getTevColor(u32 param_0) { +asm J3DGXColorS10* J3DTevBlock16::getTevColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevColor__13J3DTevBlock16FUl.s" } @@ -2669,7 +3291,7 @@ asm void J3DTevBlock16::setTevKColor(u32 param_0, J3DGXColor const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm GXColor* J3DTevBlock16::getTevKColor(u32 param_0) { +asm J3DGXColor* J3DTevBlock16::getTevKColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevKColor__13J3DTevBlock16FUl.s" } @@ -2844,7 +3466,7 @@ asm void J3DTevBlock16::setTevSwapModeTable(u32 param_0, J3DTevSwapModeTable con #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTevBlock16::getTevSwapModeTable(u32 param_0) { +asm J3DTevSwapModeTable* J3DTevBlock16::getTevSwapModeTable(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevSwapModeTable__13J3DTevBlock16FUl.s" } @@ -2877,7 +3499,7 @@ asm void J3DTevBlock16::setIndTevStage(u32 param_0, J3DIndTevStage const* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTevBlock16::getIndTevStage(u32 param_0) { +asm J3DIndTevStage* J3DTevBlock16::getIndTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTevStage__13J3DTevBlock16FUl.s" } @@ -2888,7 +3510,7 @@ asm bool J3DTevBlock16::getIndTevStage(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTevBlock16::getTexNoOffset() const { +asm u32 J3DTevBlock16::getTexNoOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexNoOffset__13J3DTevBlock16CFv.s" } @@ -3690,7 +4312,7 @@ asm void J3DTevBlock4::setTevColor(u32 param_0, J3DGXColorS10 const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm GXColorS10* J3DTevBlock4::getTevColor(u32 param_0) { +asm J3DGXColorS10* J3DTevBlock4::getTevColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevColor__12J3DTevBlock4FUl.s" } @@ -3722,7 +4344,7 @@ asm void J3DTevBlock4::setTevKColor(u32 param_0, J3DGXColor const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm GXColor* J3DTevBlock4::getTevKColor(u32 param_0) { +asm J3DGXColor* J3DTevBlock4::getTevKColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevKColor__12J3DTevBlock4FUl.s" } @@ -3898,7 +4520,7 @@ asm void J3DTevBlock4::setTevSwapModeTable(u32 param_0, J3DTevSwapModeTable cons #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTevBlock4::getTevSwapModeTable(u32 param_0) { +asm J3DTevSwapModeTable* J3DTevBlock4::getTevSwapModeTable(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevSwapModeTable__12J3DTevBlock4FUl.s" } @@ -3931,7 +4553,7 @@ asm void J3DTevBlock4::setIndTevStage(u32 param_0, J3DIndTevStage const* param_1 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTevBlock4::getIndTevStage(u32 param_0) { +asm J3DIndTevStage* J3DTevBlock4::getIndTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTevStage__12J3DTevBlock4FUl.s" } @@ -3942,7 +4564,7 @@ asm bool J3DTevBlock4::getIndTevStage(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTevBlock4::getTexNoOffset() const { +asm u32 J3DTevBlock4::getTexNoOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexNoOffset__12J3DTevBlock4CFv.s" } @@ -4083,7 +4705,7 @@ asm void J3DTevBlock2::setTevColor(u32 param_0, J3DGXColorS10 const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm GXColorS10* J3DTevBlock2::getTevColor(u32 param_0) { +asm J3DGXColorS10* J3DTevBlock2::getTevColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevColor__12J3DTevBlock2FUl.s" } @@ -4115,7 +4737,7 @@ asm void J3DTevBlock2::setTevKColor(u32 param_0, J3DGXColor const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm GXColor* J3DTevBlock2::getTevKColor(u32 param_0) { +asm J3DGXColor* J3DTevBlock2::getTevKColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevKColor__12J3DTevBlock2FUl.s" } @@ -4291,7 +4913,7 @@ asm void J3DTevBlock2::setTevSwapModeTable(u32 param_0, J3DTevSwapModeTable cons #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTevBlock2::getTevSwapModeTable(u32 param_0) { +asm J3DTevSwapModeTable* J3DTevBlock2::getTevSwapModeTable(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevSwapModeTable__12J3DTevBlock2FUl.s" } @@ -4324,7 +4946,7 @@ asm void J3DTevBlock2::setIndTevStage(u32 param_0, J3DIndTevStage const* param_1 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTevBlock2::getIndTevStage(u32 param_0) { +asm J3DIndTevStage* J3DTevBlock2::getIndTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTevStage__12J3DTevBlock2FUl.s" } @@ -4335,7 +4957,7 @@ asm bool J3DTevBlock2::getIndTevStage(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTevBlock2::getTexNoOffset() const { +asm u32 J3DTevBlock2::getTexNoOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexNoOffset__12J3DTevBlock2CFv.s" } @@ -4527,7 +5149,7 @@ asm void J3DTevBlock1::setIndTevStage(u32 param_0, J3DIndTevStage const* param_1 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTevBlock1::getIndTevStage(u32 param_0) { +asm J3DIndTevStage* J3DTevBlock1::getIndTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTevStage__12J3DTevBlock1FUl.s" } @@ -4538,7 +5160,7 @@ asm bool J3DTevBlock1::getIndTevStage(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTevBlock1::getTexNoOffset() const { +asm u32 J3DTevBlock1::getTexNoOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexNoOffset__12J3DTevBlock1CFv.s" } @@ -4762,7 +5384,7 @@ asm void J3DTevBlockPatched::setIndTevStage(u32 param_0, J3DIndTevStage const* p #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTevBlockPatched::getIndTevStage(u32 param_0) { +asm J3DIndTevStage* J3DTevBlockPatched::getIndTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTevStage__18J3DTevBlockPatchedFUl.s" } @@ -4794,7 +5416,7 @@ asm void J3DTevBlockPatched::setTevColor(u32 param_0, J3DGXColorS10 const* param #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm GXColorS10* J3DTevBlockPatched::getTevColor(u32 param_0) { +asm J3DGXColorS10* J3DTevBlockPatched::getTevColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevColor__18J3DTevBlockPatchedFUl.s" } @@ -4826,7 +5448,7 @@ asm void J3DTevBlockPatched::setTevKColor(u32 param_0, J3DGXColor const* param_1 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm GXColor* J3DTevBlockPatched::getTevKColor(u32 param_0) { +asm J3DGXColor* J3DTevBlockPatched::getTevKColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevKColor__18J3DTevBlockPatchedFUl.s" } @@ -4868,7 +5490,7 @@ asm bool J3DTevBlockPatched::getTevKColorSel(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTevBlockPatched::getTexNoOffset() const { +asm u32 J3DTevBlockPatched::getTexNoOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexNoOffset__18J3DTevBlockPatchedCFv.s" } @@ -5121,7 +5743,7 @@ asm void J3DColorBlockLightOn::setMatColor(u32 param_0, J3DGXColor const* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm GXColor* J3DColorBlockLightOn::getMatColor(u32 param_0) { +asm J3DGXColor* J3DColorBlockLightOn::getMatColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getMatColor__20J3DColorBlockLightOnFUl.s" } @@ -5153,7 +5775,7 @@ asm void J3DColorBlockLightOn::setAmbColor(u32 param_0, J3DGXColor const* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DColorBlockLightOn::getAmbColor(u32 param_0) { +asm J3DGXColor* J3DColorBlockLightOn::getAmbColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getAmbColor__20J3DColorBlockLightOnFUl.s" } @@ -5271,7 +5893,7 @@ asm s32 J3DColorBlockLightOn::getCullMode() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DColorBlockLightOn::getMatColorOffset() const { +asm u32 J3DColorBlockLightOn::getMatColorOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getMatColorOffset__20J3DColorBlockLightOnCFv.s" } @@ -5282,7 +5904,7 @@ asm bool J3DColorBlockLightOn::getMatColorOffset() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DColorBlockLightOn::getColorChanOffset() const { +asm u32 J3DColorBlockLightOn::getColorChanOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChanOffset__20J3DColorBlockLightOnCFv.s" } @@ -5342,7 +5964,7 @@ asm void J3DColorBlockAmbientOn::setAmbColor(u32 param_0, J3DGXColor const* para #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DColorBlockAmbientOn::getAmbColor(u32 param_0) { +asm J3DGXColor* J3DColorBlockAmbientOn::getAmbColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getAmbColor__22J3DColorBlockAmbientOnFUl.s" } @@ -5392,164 +6014,97 @@ SECTION_DATA extern void* __vt__21J3DColorBlockLightOff[36 + 1 /* padding */] = }; /* 803230EC-80323158 31DA2C 006C+00 1/0 0/0 0/0 .text __dt__22J3DColorBlockAmbientOnFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DColorBlockAmbientOn::~J3DColorBlockAmbientOn() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__22J3DColorBlockAmbientOnFv.s" -} -#pragma pop +J3DColorBlockAmbientOn::~J3DColorBlockAmbientOn() {} /* 80323158-80323184 31DA98 002C+00 2/0 0/0 0/0 .text * setMatColor__21J3DColorBlockLightOffFUl10J3DGXColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOff::setMatColor(u32 param_0, J3DGXColor param_1) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColor__21J3DColorBlockLightOffFUl10J3DGXColor.s" +void J3DColorBlockLightOff::setMatColor(u32 param_0, J3DGXColor param_1) { + mMatColor[param_0] = param_1; } -#pragma pop /* 80323184-803231B0 31DAC4 002C+00 2/0 0/0 0/0 .text * setMatColor__21J3DColorBlockLightOffFUlPC10J3DGXColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOff::setMatColor(u32 param_0, J3DGXColor const* param_1) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColor__21J3DColorBlockLightOffFUlPC10J3DGXColor.s" +void J3DColorBlockLightOff::setMatColor(u32 param_0, J3DGXColor const* param_1) { + mMatColor[param_0] = *param_1; } -#pragma pop /* 803231B0-803231C4 31DAF0 0014+00 2/0 0/0 0/0 .text getMatColor__21J3DColorBlockLightOffFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm GXColor* J3DColorBlockLightOff::getMatColor(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getMatColor__21J3DColorBlockLightOffFUl.s" +J3DGXColor* J3DColorBlockLightOff::getMatColor(u32 param_0) { + return &mMatColor[param_0]; } -#pragma pop /* 803231C4-803231D0 31DB04 000C+00 2/0 0/0 0/0 .text * setColorChanNum__21J3DColorBlockLightOffFPCUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOff::setColorChanNum(u8 const* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__21J3DColorBlockLightOffFPCUc.s" +void J3DColorBlockLightOff::setColorChanNum(u8 const* param_0) { + mColorChanNum = *param_0; } -#pragma pop /* 803231D0-803231D8 -00001 0008+00 0/0 0/0 0/0 .text setColorChanNum__21J3DColorBlockLightOffFUc */ void J3DColorBlockLightOff::setColorChanNum(u8 param_0) { - *(u8*)(((u8*)this) + 12) /* this->field_0xc */ = (u8)(param_0); + mColorChanNum = param_0; } /* 803231D8-803231E0 31DB18 0008+00 2/0 0/0 0/0 .text getColorChanNum__21J3DColorBlockLightOffCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8 J3DColorBlockLightOff::getColorChanNum() const { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChanNum__21J3DColorBlockLightOffCFv.s" +u8 J3DColorBlockLightOff::getColorChanNum() const { + return mColorChanNum; } -#pragma pop /* 803231E0-803231F4 31DB20 0014+00 2/0 0/0 0/0 .text * setColorChan__21J3DColorBlockLightOffFUlPC12J3DColorChan */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOff::setColorChan(u32 param_0, J3DColorChan const* param_1) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChan__21J3DColorBlockLightOffFUlPC12J3DColorChan.s" +void J3DColorBlockLightOff::setColorChan(u32 param_0, J3DColorChan const* param_1) { + mColorChan[param_0] = *param_1; } -#pragma pop /* 803231F4-80323208 31DB34 0014+00 2/0 0/0 0/0 .text * setColorChan__21J3DColorBlockLightOffFUlRC12J3DColorChan */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOff::setColorChan(u32 param_0, J3DColorChan const& param_1) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChan__21J3DColorBlockLightOffFUlRC12J3DColorChan.s" +void J3DColorBlockLightOff::setColorChan(u32 param_0, J3DColorChan const& param_1) { + mColorChan[param_0] = param_1; } -#pragma pop /* 80323208-8032321C 31DB48 0014+00 2/0 0/0 0/0 .text getColorChan__21J3DColorBlockLightOffFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DColorChan* J3DColorBlockLightOff::getColorChan(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChan__21J3DColorBlockLightOffFUl.s" +J3DColorChan* J3DColorBlockLightOff::getColorChan(u32 param_0) { + return &mColorChan[param_0]; } -#pragma pop /* 8032321C-80323224 -00001 0008+00 0/0 0/0 0/0 .text setCullMode__21J3DColorBlockLightOffFUc */ void J3DColorBlockLightOff::setCullMode(u8 param_0) { - *(u8*)(((u8*)this) + 22) /* this->field_0x16 */ = (u8)(param_0); + mCullMode = param_0; } /* 80323224-80323230 31DB64 000C+00 2/0 0/0 0/0 .text setCullMode__21J3DColorBlockLightOffFPCUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOff::setCullMode(u8 const* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__21J3DColorBlockLightOffFPCUc.s" +void J3DColorBlockLightOff::setCullMode(u8 const* param_0) { + mCullMode = *param_0; } -#pragma pop /* 80323230-80323238 31DB70 0008+00 2/0 0/0 0/0 .text getCullMode__21J3DColorBlockLightOffCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 J3DColorBlockLightOff::getCullMode() const { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getCullMode__21J3DColorBlockLightOffCFv.s" +s32 J3DColorBlockLightOff::getCullMode() const { + return mCullMode; } -#pragma pop /* 80323238-80323240 31DB78 0008+00 2/0 0/0 0/0 .text * getMatColorOffset__21J3DColorBlockLightOffCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J3DColorBlockLightOff::getMatColorOffset() const { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getMatColorOffset__21J3DColorBlockLightOffCFv.s" +u32 J3DColorBlockLightOff::getMatColorOffset() const { + return mMatColorOffset; } -#pragma pop /* 80323240-80323248 31DB80 0008+00 2/0 0/0 0/0 .text * getColorChanOffset__21J3DColorBlockLightOffCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J3DColorBlockLightOff::getColorChanOffset() const { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChanOffset__21J3DColorBlockLightOffCFv.s" +u32 J3DColorBlockLightOff::getColorChanOffset() const { + return mColorChanOffset; } -#pragma pop /* 80323248-80323250 -00001 0008+00 0/0 0/0 0/0 .text * setMatColorOffset__21J3DColorBlockLightOffFUl */ void J3DColorBlockLightOff::setMatColorOffset(u32 param_0) { - *(u32*)(((u8*)this) + 24) /* this->field_0x18 */ = (u32)(param_0); + mMatColorOffset = param_0; } /* 80323250-80323258 -00001 0008+00 0/0 0/0 0/0 .text * setColorChanOffset__21J3DColorBlockLightOffFUl */ void J3DColorBlockLightOff::setColorChanOffset(u32 param_0) { - *(u32*)(((u8*)this) + 28) /* this->field_0x1c */ = (u32)(param_0); + mColorChanOffset = param_0; } /* 80323258-80323264 31DB98 000C+00 1/0 0/0 0/0 .text getType__13J3DPEBlockXluFv */ @@ -5558,14 +6113,7 @@ u32 J3DPEBlockXlu::getType() { } /* 80323264-803232C0 31DBA4 005C+00 1/0 0/0 0/0 .text __dt__13J3DPEBlockXluFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DPEBlockXlu::~J3DPEBlockXlu() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DPEBlockXluFv.s" -} -#pragma pop +J3DPEBlockXlu::~J3DPEBlockXlu() {} /* 803232C0-803232CC 31DC00 000C+00 1/0 0/0 0/0 .text getType__17J3DPEBlockTexEdgeFv */ u32 J3DPEBlockTexEdge::getType() { @@ -5573,14 +6121,7 @@ u32 J3DPEBlockTexEdge::getType() { } /* 803232CC-80323328 31DC0C 005C+00 1/0 0/0 0/0 .text __dt__17J3DPEBlockTexEdgeFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DPEBlockTexEdge::~J3DPEBlockTexEdge() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__17J3DPEBlockTexEdgeFv.s" -} -#pragma pop +J3DPEBlockTexEdge::~J3DPEBlockTexEdge() {} /* 80323328-80323334 31DC68 000C+00 1/0 0/0 0/0 .text getType__13J3DPEBlockOpaFv */ u32 J3DPEBlockOpa::getType() { @@ -5588,14 +6129,7 @@ u32 J3DPEBlockOpa::getType() { } /* 80323334-80323390 31DC74 005C+00 1/0 0/0 0/0 .text __dt__13J3DPEBlockOpaFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DPEBlockOpa::~J3DPEBlockOpa() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DPEBlockOpaFv.s" -} -#pragma pop +J3DPEBlockOpa::~J3DPEBlockOpa() {} /* 80323390-8032339C 31DCD0 000C+00 1/0 0/0 0/0 .text getType__15J3DIndBlockFullFv */ u32 J3DIndBlockFull::getType() { @@ -5608,164 +6142,100 @@ void J3DIndBlockFull::setIndTexStageNum(u8 param_0) { } /* 803233A4-803233AC 31DCE4 0008+00 1/0 0/0 0/0 .text getIndTexStageNum__15J3DIndBlockFullCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8 J3DIndBlockFull::getIndTexStageNum() const { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexStageNum__15J3DIndBlockFullCFv.s" +u8 J3DIndBlockFull::getIndTexStageNum() const { + return mIndTexStageNum; } -#pragma pop /* 803233AC-803233C0 31DCEC 0014+00 1/0 0/0 0/0 .text * setIndTexOrder__15J3DIndBlockFullFUl14J3DIndTexOrder */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DIndBlockFull::setIndTexOrder(u32 param_0, J3DIndTexOrder param_1) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexOrder__15J3DIndBlockFullFUl14J3DIndTexOrder.s" +void J3DIndBlockFull::setIndTexOrder(u32 param_0, J3DIndTexOrder param_1) { + mIndTexOrder[param_0] = param_1; } -#pragma pop /* 803233C0-803233D4 31DD00 0014+00 1/0 0/0 0/0 .text * setIndTexOrder__15J3DIndBlockFullFUlPC14J3DIndTexOrder */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DIndBlockFull::setIndTexOrder(u32 param_0, J3DIndTexOrder const* param_1) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexOrder__15J3DIndBlockFullFUlPC14J3DIndTexOrder.s" +void J3DIndBlockFull::setIndTexOrder(u32 param_0, J3DIndTexOrder const* param_1) { + mIndTexOrder[param_0] = *param_1; } -#pragma pop /* 803233D4-803233E8 31DD14 0014+00 1/0 0/0 0/0 .text getIndTexOrder__15J3DIndBlockFullFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J3DIndBlockFull::getIndTexOrder(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexOrder__15J3DIndBlockFullFUl.s" +J3DIndTexOrder* J3DIndBlockFull::getIndTexOrder(u32 param_0) { + return &mIndTexOrder[param_0]; } -#pragma pop /* 803233E8-8032341C 31DD28 0034+00 1/0 0/0 0/0 .text * setIndTexMtx__15J3DIndBlockFullFUl12J3DIndTexMtx */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DIndBlockFull::setIndTexMtx(u32 param_0, J3DIndTexMtx param_1) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexMtx__15J3DIndBlockFullFUl12J3DIndTexMtx.s" +void J3DIndBlockFull::setIndTexMtx(u32 param_0, J3DIndTexMtx param_1) { + mIndTexMtx[param_0] = param_1; } -#pragma pop /* 8032341C-80323450 31DD5C 0034+00 1/0 0/0 0/0 .text * setIndTexMtx__15J3DIndBlockFullFUlPC12J3DIndTexMtx */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DIndBlockFull::setIndTexMtx(u32 param_0, J3DIndTexMtx const* param_1) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexMtx__15J3DIndBlockFullFUlPC12J3DIndTexMtx.s" +void J3DIndBlockFull::setIndTexMtx(u32 param_0, J3DIndTexMtx const* param_1) { + mIndTexMtx[param_0] = *param_1; } -#pragma pop /* 80323450-80323464 31DD90 0014+00 1/0 0/0 0/0 .text getIndTexMtx__15J3DIndBlockFullFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J3DIndBlockFull::getIndTexMtx(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexMtx__15J3DIndBlockFullFUl.s" +J3DIndTexMtx* J3DIndBlockFull::getIndTexMtx(u32 param_0) { + return &mIndTexMtx[param_0]; } -#pragma pop /* 80323464-80323478 31DDA4 0014+00 1/0 0/0 0/0 .text * setIndTexCoordScale__15J3DIndBlockFullFUl19J3DIndTexCoordScale */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DIndBlockFull::setIndTexCoordScale(u32 param_0, J3DIndTexCoordScale param_1) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexCoordScale__15J3DIndBlockFullFUl19J3DIndTexCoordScale.s" +void J3DIndBlockFull::setIndTexCoordScale(u32 param_0, J3DIndTexCoordScale param_1) { + mIndTexCoordScale[param_0] = param_1; } -#pragma pop /* 80323478-8032348C 31DDB8 0014+00 1/0 0/0 0/0 .text * setIndTexCoordScale__15J3DIndBlockFullFUlPC19J3DIndTexCoordScale */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DIndBlockFull::setIndTexCoordScale(u32 param_0, J3DIndTexCoordScale const* param_1) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexCoordScale__15J3DIndBlockFullFUlPC19J3DIndTexCoordScale.s" +void J3DIndBlockFull::setIndTexCoordScale(u32 param_0, J3DIndTexCoordScale const* param_1) { + mIndTexCoordScale[param_0] = *param_1; } -#pragma pop /* 8032348C-803234A0 31DDCC 0014+00 1/0 0/0 0/0 .text getIndTexCoordScale__15J3DIndBlockFullFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J3DIndBlockFull::getIndTexCoordScale(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexCoordScale__15J3DIndBlockFullFUl.s" +J3DIndTexCoordScale* J3DIndBlockFull::getIndTexCoordScale(u32 param_0) { + return &mIndTexCoordScale[param_0]; } -#pragma pop /* 803234A0-8032353C 31DDE0 009C+00 1/0 0/0 0/0 .text __dt__15J3DIndBlockFullFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DIndBlockFull::~J3DIndBlockFull() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__15J3DIndBlockFullFv.s" -} -#pragma pop +J3DIndBlockFull::~J3DIndBlockFull() {} /* 8032353C-80323540 31DE7C 0004+00 1/0 1/0 0/0 .text patchTexNo__11J3DTevBlockFv */ void J3DTevBlock::patchTexNo() { - /* empty function */ } /* 80323540-80323544 31DE80 0004+00 1/0 1/0 0/0 .text patchTevReg__11J3DTevBlockFv */ void J3DTevBlock::patchTevReg() { - /* empty function */ } /* 80323544-80323548 31DE84 0004+00 1/0 1/0 0/0 .text setTexNo__11J3DTevBlockFUlPCUs */ void J3DTevBlock::setTexNo(u32 param_0, u16 const* param_1) { - /* empty function */ } /* 80323548-8032354C 31DE88 0004+00 1/0 1/0 0/0 .text setTevOrder__11J3DTevBlockFUlPC11J3DTevOrder */ void J3DTevBlock::setTevOrder(u32 param_0, J3DTevOrder const* param_1) { - /* empty function */ } /* 8032354C-80323550 31DE8C 0004+00 1/0 1/0 0/0 .text setTevStageNum__11J3DTevBlockFPCUc */ void J3DTevBlock::setTevStageNum(u8 const* param_0) { - /* empty function */ } /* 80323550-80323554 31DE90 0004+00 1/0 1/0 0/0 .text setTevStage__11J3DTevBlockFUlPC11J3DTevStage */ void J3DTevBlock::setTevStage(u32 param_0, J3DTevStage const* param_1) { - /* empty function */ } /* 80323554-80323558 31DE94 0004+00 1/0 1/0 0/0 .text * setIndTevStage__11J3DTevBlockFUlPC14J3DIndTevStage */ void J3DTevBlock::setIndTevStage(u32 param_0, J3DIndTevStage const* param_1) { - /* empty function */ } /* 80323558-80323560 31DE98 0008+00 1/0 1/0 0/0 .text getTexNoOffset__11J3DTevBlockCFv */ -bool J3DTevBlock::getTexNoOffset() const { - return false; +u32 J3DTevBlock::getTexNoOffset() const { + return 0; } /* 80323560-8032356C 31DEA0 000C+00 1/0 0/0 0/0 .text getType__21J3DColorBlockLightOffFv @@ -5774,19 +6244,4 @@ u32 J3DColorBlockLightOff::getType() { return 'CLOF'; } -/* 8032356C-80323590 31DEAC 0024+00 0/0 1/0 0/0 .text __sinit_J3DMatBlock_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_J3DMatBlock_cpp() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/__sinit_J3DMatBlock_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8032356C, __sinit_J3DMatBlock_cpp); -#pragma pop - /* 803A1EA8-803A1EA8 02E508 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/J3DGraphBase/J3DMaterial.cpp b/libs/JSystem/J3DGraphBase/J3DMaterial.cpp index 258c0b6d135..e7aa1c6e9c3 100644 --- a/libs/JSystem/J3DGraphBase/J3DMaterial.cpp +++ b/libs/JSystem/J3DGraphBase/J3DMaterial.cpp @@ -118,7 +118,7 @@ extern "C" void setColorChan__13J3DColorBlockFUlPC12J3DColorChan(); extern "C" bool getLight__13J3DColorBlockFUl(); extern "C" void setCullMode__13J3DColorBlockFUc(); extern "C" void setCullMode__13J3DColorBlockFPCUc(); -extern "C" bool getMatColorOffset__13J3DColorBlockCFv(); +extern "C" u32 getMatColorOffset__13J3DColorBlockCFv(); extern "C" bool getColorChanOffset__13J3DColorBlockCFv(); extern "C" void setMatColorOffset__13J3DColorBlockFUl(); extern "C" void setColorChanOffset__13J3DColorBlockFUl(); @@ -938,7 +938,8 @@ void J3DLockedMaterial::change() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DColorBlockLightOff::~J3DColorBlockLightOff() { +asm void __dt__21J3DColorBlockLightOffFv() { +//asm J3DColorBlockLightOff::~J3DColorBlockLightOff() { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMaterial/__dt__21J3DColorBlockLightOffFv.s" } @@ -991,7 +992,7 @@ extern "C" asm void __dt__11J3DTevBlockFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DIndBlock::~J3DIndBlock() { +asm void __dt__11J3DIndBlockFv() { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMaterial/__dt__11J3DIndBlockFv.s" } @@ -1150,13 +1151,13 @@ void J3DPEBlock::setDither(u8 const* param_0) { } /* 80317384-8031738C 311CC4 0008+00 1/0 4/0 0/0 .text getDither__10J3DPEBlockCFv */ -bool J3DPEBlock::getDither() const { - return false; +u8 J3DPEBlock::getDither() const { + return 0; } /* 8031738C-80317394 311CCC 0008+00 1/0 5/0 0/0 .text getFogOffset__10J3DPEBlockCFv */ -bool J3DPEBlock::getFogOffset() const { - return false; +u32 J3DPEBlock::getFogOffset() const { + return 0; } /* 80317394-80317398 311CD4 0004+00 1/0 5/0 0/0 .text setFogOffset__10J3DPEBlockFUl */ @@ -1305,13 +1306,13 @@ void J3DColorBlock::setCullMode(u8 const* param_0) { } /* 80317464-8031746C 311DA4 0008+00 1/0 1/0 0/0 .text getMatColorOffset__13J3DColorBlockCFv */ -bool J3DColorBlock::getMatColorOffset() const { - return false; +u32 J3DColorBlock::getMatColorOffset() const { + return 0; } /* 8031746C-80317474 311DAC 0008+00 1/0 1/0 0/0 .text getColorChanOffset__13J3DColorBlockCFv */ -bool J3DColorBlock::getColorChanOffset() const { - return false; +u32 J3DColorBlock::getColorChanOffset() const { + return 0; } /* 80317474-80317478 311DB4 0004+00 1/0 1/0 0/0 .text setMatColorOffset__13J3DColorBlockFUl */ diff --git a/libs/JSystem/J3DGraphBase/J3DStruct.cpp b/libs/JSystem/J3DGraphBase/J3DStruct.cpp index e1bc18315e4..8ee47fc799b 100644 --- a/libs/JSystem/J3DGraphBase/J3DStruct.cpp +++ b/libs/JSystem/J3DGraphBase/J3DStruct.cpp @@ -52,16 +52,16 @@ J3DIndTexMtxInfo& J3DIndTexMtxInfo::operator=(J3DIndTexMtxInfo const& param_0) { /* 80325800-8032587C 320140 007C+00 0/0 6/6 0/0 .text __as__10J3DFogInfoFRC10J3DFogInfo */ J3DFogInfo& J3DFogInfo::operator=(J3DFogInfo const& param_0) { - field_0x0 = param_0.field_0x0; - field_0x1 = param_0.field_0x1; - field_0x2 = param_0.field_0x2; - field_0x4 = param_0.field_0x4; - field_0x8 = param_0.field_0x8; - field_0xc = param_0.field_0xc; - field_0x10 = param_0.field_0x10; - field_0x14 = param_0.field_0x14; + mType = param_0.mType; + mAdjEnable = param_0.mAdjEnable; + mCenter = param_0.mCenter; + mStartZ = param_0.mStartZ; + mEndZ = param_0.mEndZ; + mNearZ = param_0.mNearZ; + mFarZ = param_0.mFarZ; + mColor = param_0.mColor; for (int i = 0; i < 10; i++) { - field_0x18.fogVals[i] = param_0.field_0x18.fogVals[i]; + mFogAdjTable.fogVals[i] = param_0.mFogAdjTable.fogVals[i]; } return *this; } diff --git a/libs/JSystem/J3DGraphBase/J3DSys.cpp b/libs/JSystem/J3DGraphBase/J3DSys.cpp index a813a1b7bbe..858b25992f9 100644 --- a/libs/JSystem/J3DGraphBase/J3DSys.cpp +++ b/libs/JSystem/J3DGraphBase/J3DSys.cpp @@ -29,8 +29,6 @@ extern "C" void GXInvalidateVtxCache(); extern "C" extern const GXColor j3dDefaultColInfo; extern "C" extern u8 data_804563C8; -extern "C" extern const GXColorS10 j3dDefaultTevColor; -extern "C" extern const GXColor j3dDefaultTevKColor; // // Declarations: diff --git a/libs/JSystem/J3DGraphBase/J3DTevs.cpp b/libs/JSystem/J3DGraphBase/J3DTevs.cpp index 82327d9b800..33f763aa1b3 100644 --- a/libs/JSystem/J3DGraphBase/J3DTevs.cpp +++ b/libs/JSystem/J3DGraphBase/J3DTevs.cpp @@ -511,7 +511,7 @@ static void J3DGDLoadPostTexMtxImm(f32 (*param_1)[4], u32 param_2) { extern const GXColor j3dDefaultColInfo = {0xFF, 0xFF, 0xFF, 0xFF}; /* 804563C4-804563C8 0049C4 0004+00 0/0 2/2 0/0 .sdata2 j3dDefaultAmbInfo */ -extern const u32 j3dDefaultAmbInfo = 0x32323232; +extern const GXColor j3dDefaultAmbInfo = {0x32, 0x32, 0x32, 0x32}; /* 804563C8-804563CC 0049C8 0004+00 0/0 1/1 0/0 .sdata2 None */ extern const u8 data_804563C8 = 0x01; diff --git a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp index d928c4ed574..130d4647382 100644 --- a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp @@ -223,7 +223,7 @@ extern "C" void setColorChan__13J3DColorBlockFUlPC12J3DColorChan(); extern "C" bool getLight__13J3DColorBlockFUl(); extern "C" void setCullMode__13J3DColorBlockFUc(); extern "C" void setCullMode__13J3DColorBlockFPCUc(); -extern "C" bool getMatColorOffset__13J3DColorBlockCFv(); +extern "C" u32 getMatColorOffset__13J3DColorBlockCFv(); extern "C" bool getColorChanOffset__13J3DColorBlockCFv(); extern "C" void setMatColorOffset__13J3DColorBlockFUl(); extern "C" void setColorChanOffset__13J3DColorBlockFUl(); @@ -252,7 +252,7 @@ extern "C" void setTevOrder__11J3DTevBlockFUlPC11J3DTevOrder(); extern "C" void setTevStageNum__11J3DTevBlockFPCUc(); extern "C" void setTevStage__11J3DTevBlockFUlPC11J3DTevStage(); extern "C" void setIndTevStage__11J3DTevBlockFUlPC14J3DIndTevStage(); -extern "C" bool getTexNoOffset__11J3DTevBlockCFv(); +extern "C" u32 getTexNoOffset__11J3DTevBlockCFv(); extern "C" void __as__13J3DTexMtxInfoFRC13J3DTexMtxInfo(); extern "C" void __as__16J3DIndTexMtxInfoFRC16J3DIndTexMtxInfo(); extern "C" void __as__10J3DFogInfoFRC10J3DFogInfo(); diff --git a/rel/d/a/d_a_vrbox/d_a_vrbox.cpp b/rel/d/a/d_a_vrbox/d_a_vrbox.cpp index 7ef2160115c..82ed8230f22 100644 --- a/rel/d/a/d_a_vrbox/d_a_vrbox.cpp +++ b/rel/d/a/d_a_vrbox/d_a_vrbox.cpp @@ -51,7 +51,7 @@ static int daVrbox_Draw(vrbox_class* i_this) { fogInfo_p = material_p->getFog()->getFogInfo(); } - fogInfo_p->field_0x0 = 2; + fogInfo_p->mType = 2; } dComIfGd_setListSky(); diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index f339a74c988..5480d7f6846 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -298,7 +298,7 @@ static void addWarpMaterial(J3DModelData* param_1) { texGenBlock->setTexMtx(texGenNum, texMtxInfo); J3DTevBlock* tevBlock = pMaterial->getTevBlock(); u8 tevStageNum = tevBlock->getTevStageNum(); - l_tevOrderInfo.field_0x0 = texGenNum; + l_tevOrderInfo.mTexCoord = texGenNum; tevBlock->setTexNo(3, textureNum); tevBlock->setTevOrder(tevStageNum, l_tevOrderInfo); tevBlock->setTevStage(tevStageNum, l_tevStageInfo); diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 97855c5e451..4944c8145bb 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -1676,8 +1676,8 @@ void mDoExt_brkAnmRemove(J3DModelData* i_modelData) { } /* 8000DF3C-8000DF44 00887C 0008+00 0/0 5/0 0/0 .text getZCompLoc__10J3DPEBlockCFv */ -bool J3DPEBlock::getZCompLoc() const { - return false; +u8 J3DPEBlock::getZCompLoc() const { + return 0; } /* 8000DF44-8000DF4C 008884 0008+00 0/0 5/0 0/0 .text getZMode__10J3DPEBlockFv */ @@ -1701,18 +1701,18 @@ J3DFog* J3DPEBlock::getFog() { } /* 8000DF64-8000DF6C 0088A4 0008+00 0/0 2/0 0/0 .text getIndTexCoordScale__11J3DIndBlockFUl */ -bool J3DIndBlock::getIndTexCoordScale(u32 param_0) { - return false; +J3DIndTexCoordScale* J3DIndBlock::getIndTexCoordScale(u32 param_0) { + return NULL; } /* 8000DF6C-8000DF74 0088AC 0008+00 0/0 2/0 0/0 .text getIndTexMtx__11J3DIndBlockFUl */ -bool J3DIndBlock::getIndTexMtx(u32 param_0) { - return false; +J3DIndTexMtx* J3DIndBlock::getIndTexMtx(u32 param_0) { + return NULL; } /* 8000DF74-8000DF7C 0088B4 0008+00 0/0 2/0 0/0 .text getIndTexOrder__11J3DIndBlockFUl */ -bool J3DIndBlock::getIndTexOrder(u32 param_0) { - return false; +J3DIndTexOrder* J3DIndBlock::getIndTexOrder(u32 param_0) { + return NULL; } /* 8000DF7C-8000DF84 0088BC 0008+00 0/0 2/0 0/0 .text getIndTexStageNum__11J3DIndBlockCFv @@ -1722,8 +1722,8 @@ u8 J3DIndBlock::getIndTexStageNum() const { } /* 8000DF84-8000DF8C 0088C4 0008+00 0/0 2/0 0/0 .text getIndTevStage__11J3DTevBlockFUl */ -bool J3DTevBlock::getIndTevStage(u32 param_0) { - return false; +J3DIndTevStage* J3DTevBlock::getIndTevStage(u32 param_0) { + return NULL; } /* 8000DF8C-8000DF94 0088CC 0008+00 0/0 2/0 0/0 .text getTevStage__11J3DTevBlockFUl */ @@ -1742,8 +1742,8 @@ asm u16 J3DTevBlock::getTexNo(u32 param_0) const { #pragma pop /* 8000DFA0-8000DFA8 0088E0 0008+00 0/0 4/0 0/0 .text getTevSwapModeTable__11J3DTevBlockFUl */ -bool J3DTevBlock::getTevSwapModeTable(u32 param_0) { - return false; +J3DTevSwapModeTable* J3DTevBlock::getTevSwapModeTable(u32 param_0) { + return NULL; } /* 8000DFA8-8000DFB0 0088E8 0008+00 0/0 4/0 0/0 .text getTevKAlphaSel__11J3DTevBlockFUl @@ -1764,12 +1764,12 @@ J3DTevOrder* J3DTevBlock::getTevOrder(u32 param_0) { } /* 8000DFC0-8000DFC8 008900 0008+00 0/0 3/0 0/0 .text getTevKColor__11J3DTevBlockFUl */ -GXColor* J3DTevBlock::getTevKColor(u32 param_0) { +J3DGXColor* J3DTevBlock::getTevKColor(u32 param_0) { return NULL; } /* 8000DFC8-8000DFD0 008908 0008+00 0/0 3/0 0/0 .text getTevColor__11J3DTevBlockFUl */ -GXColorS10* J3DTevBlock::getTevColor(u32 param_0) { +J3DGXColorS10* J3DTevBlock::getTevColor(u32 param_0) { return NULL; } @@ -1795,8 +1795,8 @@ u32 J3DTexGenBlock::getTexGenNum() const { } /* 8000DFF0-8000DFF8 008930 0008+00 0/0 3/0 0/0 .text getAmbColor__13J3DColorBlockFUl */ -bool J3DColorBlock::getAmbColor(u32 param_0) { - return false; +J3DGXColor* J3DColorBlock::getAmbColor(u32 param_0) { + return NULL; } /* 8000DFF8-8000E000 008938 0008+00 0/0 2/0 0/0 .text getColorChan__13J3DColorBlockFUl */ @@ -1805,7 +1805,7 @@ J3DColorChan* J3DColorBlock::getColorChan(u32 param_0) { } /* 8000E000-8000E008 008940 0008+00 0/0 2/0 0/0 .text getMatColor__13J3DColorBlockFUl */ -GXColor* J3DColorBlock::getMatColor(u32 param_0) { +J3DGXColor* J3DColorBlock::getMatColor(u32 param_0) { return NULL; }