Merge branch 'tphd' into depth-bias-poc-hack

This commit is contained in:
MelonSpeedruns
2026-05-25 14:43:25 -04:00
171 changed files with 3520 additions and 1066 deletions
@@ -4,6 +4,7 @@
#include "JSystem/J2DGraph/J2DMaterial.h"
#include "JSystem/J2DGraph/J2DPane.h"
#include "dusk/endian.h"
#include "dusk/string.hpp"
class J2DMaterial;
class JUTFont;
@@ -98,7 +99,8 @@ public:
void initiate(ResFONT const*, char const*, s16, J2DTextBoxHBinding,
J2DTextBoxVBinding);
void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*);
char* getStringPtr() const;
TEXT_SPAN getStringPtr() const;
dusk::TextSpan getSpan() const;
s32 setString(s16, char const*, ...);
s32 setString(char const*, ...);
@@ -1575,6 +1575,12 @@ struct J3DAlphaComp {
u8 getRef1() const { return mRef1; }
void load() const {
#ifdef AVOID_UB
if (mID > 255) {
J3DGDSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_OR, GX_ALWAYS, 0);
return;
}
#endif
J3DGDSetAlphaCompare((GXCompare)getComp0(), mRef0, (GXAlphaOp)getOp(), (GXCompare)getComp1(), mRef1);
}