mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-12 21:45:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Various Matches, J2DTextBoxEx and J2DTevs OK (#2025)

Browse Source 
* Work on src/d/bg

* misc work

* J2dTextBoxEx OK

* J2DTevs OK

* Better return values for bool
This commit is contained in:
hatal175
2024-01-08 12:10:05 +02:00
committed by GitHub
parent dea6243c35
commit a8a159ae2c
31 changed files with 328 additions and 1386 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DMatBlock.h
+2 -4
View File
@@ -444,8 +444,6 @@ struct J2DAlphaCompInfo {
/* 0x7 */ u8 field_0x7;
};
extern u16 j2dDefaultAlphaCmp;
inline u16 J2DCalcAlphaCmp(s32 param_1, u32 param_2, u32 param_3) {
return ((param_1) << 5) | ((param_2 & 0xff) << 3) | (param_3 & 0xff);
}
@@ -486,7 +484,7 @@ struct J2DBlendInfo {
/* 0x3 */ u8 mOp;
};
extern J2DBlendInfo j2dDefaultBlendInfo;
extern const J2DBlendInfo j2dDefaultBlendInfo;
struct J2DBlend {
J2DBlend() { mBlendInfo = j2dDefaultBlendInfo; }
@@ -595,7 +593,7 @@ struct J2DColorChanInfo {
};
inline u8 J2DCalcColorChanID(u8 param_1) { return param_1; }
extern J2DColorChanInfo j2dDefaultColorChanInfo;
extern const J2DColorChanInfo j2dDefaultColorChanInfo;
class J2DColorChan {
public:
include/JSystem/J2DGraph/J2DTevs.h
+12 -1
View File
@@ -2,6 +2,7 @@
#define J2DTEVS_H
#include "dolphin/gx/GXEnum.h"
#include "dolphin/gx/GXStruct.h"
#include "dolphin/mtx/mtxvec.h"
struct J2DTextureSRTInfo {
@@ -244,7 +245,7 @@ struct J2DTevOrderInfo {
}
};
extern J2DTevOrderInfo j2dDefaultTevOrderInfoNull;
extern const J2DTevOrderInfo j2dDefaultTevOrderInfoNull;
class J2DTevOrder {
public:
@@ -294,6 +295,8 @@ struct J2DTevSwapModeInfo {
/* 0x3 */ u8 field_0x3;
};
extern const J2DTevSwapModeInfo j2dDefaultTevSwapMode;
class J2DTevStage {
public:
/* 802F4110 */ J2DTevStage(J2DTevStageInfo const&);
@@ -455,4 +458,12 @@ private:
/* 0x0 */ u8 field_0x0;
};
extern const GXColor j2dDefaultColInfo;
extern const GXColorS10 j2dDefaultTevColor;
extern const GXColor j2dDefaultTevKColor;
extern const J2DTevOrderInfo j2dDefaultTevOrderInfoNull;
extern const u8 j2dDefaultPEBlockDither;
extern const u8 data_804561AC;
extern const u16 j2dDefaultAlphaCmp;
#endif /* J2DTEVS_H */