mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-24 07:11:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Various JSystem work (#2383)

Browse Source 
* JKernel and JStudio cleanup

* JMessage cleanup

* JAudio cleanup

* JASBNKParser work

* functionvalue work

* fvb work

* J2D and J3D cleanup

* steal from tww

* J2DPictureEx mostly done

* fix build
This commit is contained in:
Caroline Madsen
2025-04-09 16:45:30 -04:00
committed by GitHub
parent 6672817e41
commit c6f76e7240
78 changed files with 1793 additions and 2710 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/J3DGraphBase/J3DMatBlock.cpp
+7 -8
View File
@@ -7,7 +7,6 @@
#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"
#include "global.h"
@@ -359,8 +358,8 @@ void J3DColorBlockLightOff::load() {
mColorChanOffset = GDGetCurrOffset();
J3DGDWriteXFCmdHdr(0x100e, 4);
mColorChan[0].load();
mColorChan[1].load();
mColorChan[2].load();
mColorChan[1].load();
mColorChan[3].load();
}
@@ -376,8 +375,8 @@ void J3DColorBlockAmbientOn::load() {
mColorChanOffset = GDGetCurrOffset();
J3DGDWriteXFCmdHdr(0x100e, 4);
mColorChan[0].load();
mColorChan[1].load();
mColorChan[2].load();
mColorChan[1].load();
mColorChan[3].load();
}
@@ -390,8 +389,8 @@ void J3DColorBlockLightOn::load() {
mColorChanOffset = GDGetCurrOffset();
J3DGDWriteXFCmdHdr(0x100e, 4);
mColorChan[0].load();
mColorChan[1].load();
mColorChan[2].load();
mColorChan[1].load();
mColorChan[3].load();
for (u32 i = 0; i < 8; i++) {
if (mLight[i] != NULL) {
@@ -423,8 +422,8 @@ void J3DColorBlockLightOff::patchLight() {
GDOverflowCheck(SizeOfLoadColorChans);
J3DGDWriteXFCmdHdr(0x100e, 4);
mColorChan[0].load();
mColorChan[1].load();
mColorChan[2].load();
mColorChan[1].load();
mColorChan[3].load();
void* end = GDGetCurrPointer();
DCStoreRange(start, (u32)end - (u32)start);
@@ -453,8 +452,8 @@ void J3DColorBlockLightOn::patchLight() {
GDOverflowCheck(SizeOfLoadColorChans);
J3DGDWriteXFCmdHdr(0x100e, 4);
mColorChan[0].load();
mColorChan[1].load();
mColorChan[2].load();
mColorChan[1].load();
mColorChan[3].load();
for (u32 i = 0; i < 8; i++) {
if (mLight[i] != NULL) {
@@ -484,8 +483,8 @@ void J3DColorBlockLightOff::diffColorChan() {
GDOverflowCheck(SizeOfLoadColorChans);
J3DGDWriteXFCmdHdr(0x100e, 4);
mColorChan[0].load();
mColorChan[1].load();
mColorChan[2].load();
mColorChan[1].load();
mColorChan[3].load();
}
@@ -521,8 +520,8 @@ void J3DColorBlockLightOn::diffColorChan() {
GDOverflowCheck(SizeOfLoadColorChans);
J3DGDWriteXFCmdHdr(0x100e, 4);
mColorChan[0].load();
mColorChan[1].load();
mColorChan[2].load();
mColorChan[1].load();
mColorChan[3].load();
}