mirror of
https://github.com/zeldaret/tp
synced 2026-07-08 14:36:36 -04:00
Various Matches, J2DTextBoxEx and J2DTevs OK (#2025)
* Work on src/d/bg * misc work * J2dTextBoxEx OK * J2DTevs OK * Better return values for bool
This commit is contained in:
hatal175
@@ -1,66 +1,13 @@
|
||||
//
|
||||
// Generated By: dol2asm
|
||||
// Translation Unit: J2DTevs
|
||||
// J2DTevs
|
||||
//
|
||||
|
||||
#include "JSystem/J2DGraph/J2DTevs.h"
|
||||
#include "JSystem/J2DGraph/J2DMatBlock.h"
|
||||
#include "JSystem/JUtility/TColor.h"
|
||||
#include "math.h"
|
||||
#include "dol2asm.h"
|
||||
#include "dolphin/gx/GX.h"
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" void load__9J2DTexMtxFUl();
|
||||
extern "C" void calc__9J2DTexMtxFv();
|
||||
extern "C" void getTextureMtx__9J2DTexMtxFRC17J2DTextureSRTInfo3VecPA4_f();
|
||||
extern "C" void getTextureMtxMaya__9J2DTexMtxFRC17J2DTextureSRTInfoPA4_f();
|
||||
extern "C" void load__14J2DIndTevStageFUc();
|
||||
extern "C" void load__12J2DIndTexMtxFUc();
|
||||
extern "C" void load__19J2DIndTexCoordScaleFUc();
|
||||
extern "C" void load__14J2DIndTexOrderFUc();
|
||||
extern "C" bool getTevSwapModeTable__11J2DTevBlockFUl();
|
||||
extern "C" bool getTevStage__11J2DTevBlockFUl();
|
||||
extern "C" bool getTevColor__11J2DTevBlockFUl();
|
||||
extern "C" bool getTevOrder__11J2DTevBlockFUl();
|
||||
extern "C" bool getTevKAlphaSel__11J2DTevBlockFUl();
|
||||
extern "C" bool getTevKColorSel__11J2DTevBlockFUl();
|
||||
extern "C" bool getTevKColor__11J2DTevBlockFUl();
|
||||
extern "C" void getFontNo__11J2DTevBlockCFv();
|
||||
extern "C" void getTexNo__11J2DTevBlockCFUl();
|
||||
extern "C" bool getTevStageNum__11J2DTevBlockCFv();
|
||||
extern "C" bool getIndTevStage__11J2DTevBlockFUl();
|
||||
extern "C" bool getIndTexCoordScale__11J2DIndBlockFUl();
|
||||
extern "C" bool getIndTexMtx__11J2DIndBlockFUl();
|
||||
extern "C" bool getIndTexOrder__11J2DIndBlockFUl();
|
||||
extern "C" bool getIndTexStageNum__11J2DIndBlockCFv();
|
||||
extern "C" extern J2DTexCoordInfo const j2dDefaultTexCoordInfo[8];
|
||||
extern "C" extern J2DTexMtxInfo const j2dDefaultTexMtxInfo;
|
||||
extern "C" extern J2DIndTexMtxInfo const j2dDefaultIndTexMtxInfo;
|
||||
extern "C" extern J2DTevStageInfo const j2dDefaultTevStageInfo;
|
||||
extern "C" extern GXColor j2dDefaultColInfo;
|
||||
extern "C" extern GXColorS10 j2dDefaultTevColor;
|
||||
extern "C" extern GXColor j2dDefaultTevKColor;
|
||||
extern "C" extern J2DTevSwapModeInfo j2dDefaultTevSwapMode;
|
||||
extern "C" extern J2DBlendInfo j2dDefaultBlendInfo;
|
||||
extern "C" extern u8 data_804561A4[4];
|
||||
extern "C" extern J2DColorChanInfo j2dDefaultColorChanInfo;
|
||||
extern "C" extern u8 data_804561AC;
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
|
||||
extern "C" void _savegpr_29();
|
||||
extern "C" void _restgpr_29();
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
|
||||
/* 802E9C90-802E9CC4 2E45D0 0034+00 0/0 1/1 0/0 .text load__9J2DTexMtxFUl */
|
||||
void J2DTexMtx::load(u32 mtxIdx) {
|
||||
GXLoadTexMtxImm(mTexMtx, mtxIdx * 3 + GX_TEXMTX0, mInfo.getTexMtxType());
|
||||
@@ -75,99 +22,45 @@ void J2DTexMtx::calc() {
|
||||
}
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80456168-8045616C 004768 0004+00 2/2 0/0 0/0 .sdata2 @1488 */
|
||||
SECTION_SDATA2 static f32 lit_1488 = 3.1415927410125732f;
|
||||
|
||||
/* 8045616C-80456170 00476C 0004+00 2/2 0/0 0/0 .sdata2 @1489 */
|
||||
SECTION_SDATA2 static f32 lit_1489 = 180.0f;
|
||||
|
||||
/* 80456170-80456174 004770 0004+00 2/2 0/0 0/0 .sdata2 @1490 */
|
||||
SECTION_SDATA2 static u8 lit_1490[4] = {
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
|
||||
/* 80456174-80456178 004774 0004+00 2/2 0/0 0/0 .sdata2 @1491 */
|
||||
SECTION_SDATA2 static f32 lit_1491 = 1.0f;
|
||||
|
||||
/* 802E9D2C-802E9EBC 2E466C 0190+00 1/1 0/0 0/0 .text
|
||||
* getTextureMtx__9J2DTexMtxFRC17J2DTextureSRTInfo3VecPA4_f */
|
||||
// regalloc
|
||||
#ifdef NONMATCHING
|
||||
void J2DTexMtx::getTextureMtx(J2DTextureSRTInfo const& param_0, Vec param_1, Mtx param_2) {
|
||||
float f31 = (param_0.field_0x8 * M_PI) / 180.0f;
|
||||
param_2[0][0] = param_0.field_0x0 * i_cosf(f31);
|
||||
param_2[0][1] = -param_0.field_0x0 * i_sinf(f31);
|
||||
param_2[0][2] = 0.0f;
|
||||
float f30 = i_sinf(f31);
|
||||
float tmp = i_cosf(f31);
|
||||
param_2[0][3] = -param_0.field_0x0 * tmp * param_1.x + param_1.y * (param_0.field_0x0 * f30) +
|
||||
param_0.field_0xc + param_1.x;
|
||||
param_2[0][3] = -param_0.field_0x0 * i_cosf(f31) * param_1.x + param_1.y * (param_0.field_0x0 * i_sinf(f31)) +
|
||||
param_1.x + param_0.field_0xc;
|
||||
param_2[1][0] = param_0.field_0x4 * i_sinf(f31);
|
||||
param_2[1][1] = param_0.field_0x4 * i_cosf(f31);
|
||||
param_2[1][2] = 0.0f;
|
||||
f30 = i_cosf(f31);
|
||||
tmp = i_sinf(f31);
|
||||
param_2[1][3] = -param_0.field_0x4 * tmp * param_1.x - param_1.y * (param_0.field_0x4 * f30) +
|
||||
param_0.field_0x10 + param_1.y;
|
||||
param_2[1][3] = -param_0.field_0x4 * i_sinf(f31) * param_1.x - param_1.y * (param_0.field_0x4 * i_cosf(f31)) +
|
||||
param_1.y + param_0.field_0x10;
|
||||
param_2[2][0] = 0.0f;
|
||||
param_2[2][1] = 0.0f;
|
||||
param_2[2][2] = 1.0f;
|
||||
param_2[2][3] = 0.0f;
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void J2DTexMtx::getTextureMtx(J2DTextureSRTInfo const& param_0, Vec param_1, Mtx param_2) {
|
||||
nofralloc
|
||||
#include "asm/JSystem/J2DGraph/J2DTevs/getTextureMtx__9J2DTexMtxFRC17J2DTextureSRTInfo3VecPA4_f.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80456178-8045617C 004778 0004+00 1/1 0/0 0/0 .sdata2 @1507 */
|
||||
SECTION_SDATA2 static f32 lit_1507 = 0.5f;
|
||||
|
||||
/* 802E9EBC-802EA044 2E47FC 0188+00 1/1 0/0 0/0 .text
|
||||
* getTextureMtxMaya__9J2DTexMtxFRC17J2DTextureSRTInfoPA4_f */
|
||||
// regswap
|
||||
#ifdef NONMATCHING
|
||||
void J2DTexMtx::getTextureMtxMaya(J2DTextureSRTInfo const& param_0, Mtx param_1) {
|
||||
float f31 = (param_0.field_0x8 * M_PI) / 180.0f;
|
||||
param_1[0][0] = param_0.field_0x0 * i_cosf(f31);
|
||||
param_1[0][1] = param_0.field_0x4 * i_sinf(f31);
|
||||
param_1[0][2] = 0.0f;
|
||||
float f30 = i_sinf(f31);
|
||||
float tmp = i_cosf(f31);
|
||||
param_1[0][3] = (param_0.field_0xc - 0.5f) * tmp -
|
||||
(param_0.field_0x10 - 0.5f + param_0.field_0x4) * f30 + 0.5f;
|
||||
param_1[0][3] = (param_0.field_0xc - 0.5f) * i_cosf(f31) -
|
||||
(param_0.field_0x10 - 0.5f + param_0.field_0x4) * i_sinf(f31) + 0.5f;
|
||||
param_1[1][0] = -param_0.field_0x0 * i_sinf(f31);
|
||||
param_1[1][1] = param_0.field_0x4 * i_cosf(f31);
|
||||
param_1[1][2] = 0.0f;
|
||||
f30 = i_cosf(f31);
|
||||
tmp = i_sinf(f31);
|
||||
param_1[1][3] = -(param_0.field_0xc - 0.5f) * tmp -
|
||||
(param_0.field_0x10 - 0.5f + param_0.field_0x4) * f30 + 0.5f;
|
||||
param_1[1][3] = -(param_0.field_0xc - 0.5f) * i_sinf(f31) -
|
||||
(param_0.field_0x10 - 0.5f + param_0.field_0x4) * i_cosf(f31) + 0.5f;
|
||||
param_1[2][0] = 0.0f;
|
||||
param_1[2][1] = 0.0f;
|
||||
param_1[2][2] = 1.0f;
|
||||
param_1[2][3] = 0.0f;
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void J2DTexMtx::getTextureMtxMaya(J2DTextureSRTInfo const& param_0, Mtx param_1) {
|
||||
nofralloc
|
||||
#include "asm/JSystem/J2DGraph/J2DTevs/getTextureMtxMaya__9J2DTexMtxFRC17J2DTextureSRTInfoPA4_f.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 802EA044-802EA098 2E4984 0054+00 0/0 5/5 0/0 .text load__14J2DIndTevStageFUc */
|
||||
void J2DIndTevStage::load(u8 tevStage) {
|
||||
@@ -271,7 +164,7 @@ u8 J2DIndBlock::getIndTexStageNum() const {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 803A1B80-803A1BA0 02E1E0 0020+00 0/0 3/3 0/0 .rodata j2dDefaultTexCoordInfo */
|
||||
extern J2DTexCoordInfo const j2dDefaultTexCoordInfo[8] = {
|
||||
J2DTexCoordInfo const j2dDefaultTexCoordInfo[8] = {
|
||||
{GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY, 0}, {GX_TG_MTX2x4, GX_TG_TEX1, GX_IDENTITY, 0},
|
||||
{GX_TG_MTX2x4, GX_TG_TEX2, GX_IDENTITY, 0}, {GX_TG_MTX2x4, GX_TG_TEX3, GX_IDENTITY, 0},
|
||||
{GX_TG_MTX2x4, GX_TG_TEX4, GX_IDENTITY, 0}, {GX_TG_MTX2x4, GX_TG_TEX5, GX_IDENTITY, 0},
|
||||
@@ -279,11 +172,11 @@ extern J2DTexCoordInfo const j2dDefaultTexCoordInfo[8] = {
|
||||
};
|
||||
|
||||
/* 803A1BA0-803A1BC4 02E200 0024+00 0/0 3/3 0/0 .rodata j2dDefaultTexMtxInfo */
|
||||
extern J2DTexMtxInfo const j2dDefaultTexMtxInfo = {1, 1, 255, 255, 0.5f, 0.5f,
|
||||
0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f};
|
||||
J2DTexMtxInfo const j2dDefaultTexMtxInfo = {1, 1, 255, 255, 0.5f, 0.5f,
|
||||
0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f};
|
||||
|
||||
/* 803A1BC4-803A1BE0 02E224 001C+00 0/0 3/3 0/0 .rodata j2dDefaultIndTexMtxInfo */
|
||||
extern J2DIndTexMtxInfo const j2dDefaultIndTexMtxInfo = {{0.5f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f}, 1};
|
||||
J2DIndTexMtxInfo const j2dDefaultIndTexMtxInfo = {{0.5f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f}, 1};
|
||||
|
||||
/* 803A1BE0-803A1BF4 02E240 0014+00 0/0 1/1 0/0 .rodata j2dDefaultTevStageInfo */
|
||||
extern J2DTevStageInfo const j2dDefaultTevStageInfo = {
|
||||
@@ -293,61 +186,55 @@ extern J2DTevStageInfo const j2dDefaultTevStageInfo = {
|
||||
GX_TEVPREV};
|
||||
|
||||
/* 803A1BF4-803A1C00 02E254 000C+00 0/0 7/7 0/0 .rodata j2dDefaultIndTevStageInfo */
|
||||
SECTION_RODATA extern const J2DIndTevStageInfo j2dDefaultIndTevStageInfo = {
|
||||
extern const J2DIndTevStageInfo j2dDefaultIndTevStageInfo = {
|
||||
GX_INDTEXSTAGE0, GX_ITB_NONE, GX_ITB_NONE, GX_ITM_OFF, GX_ITW_OFF,
|
||||
GX_ITW_OFF, 0, 0, GX_ITBA_OFF,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x803A1BF4, &j2dDefaultIndTevStageInfo);
|
||||
|
||||
/* 8045617C-80456180 00477C 0004+00 0/0 1/1 0/0 .sdata2 j2dDefaultColInfo */
|
||||
SECTION_SDATA2 extern GXColor j2dDefaultColInfo = {255, 255, 255, 255};
|
||||
extern const GXColor j2dDefaultColInfo = {255, 255, 255, 255};
|
||||
|
||||
/* 80456180-80456184 004780 0004+00 0/0 7/7 0/0 .sdata2 j2dDefaultTevOrderInfoNull */
|
||||
SECTION_SDATA2 extern J2DTevOrderInfo j2dDefaultTevOrderInfoNull = {
|
||||
extern const J2DTevOrderInfo j2dDefaultTevOrderInfoNull = {
|
||||
GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR_NULL, 0};
|
||||
|
||||
/* 80456184-80456188 004784 0002+02 0/0 3/3 0/0 .sdata2 j2dDefaultIndTexOrderNull */
|
||||
SECTION_SDATA2 extern const J2DIndTexOrderInfo j2dDefaultIndTexOrderNull = {
|
||||
extern const J2DIndTexOrderInfo j2dDefaultIndTexOrderNull = {
|
||||
GX_TEXCOORD_NULL,
|
||||
GX_TEXMAP_NULL,
|
||||
};
|
||||
|
||||
/* 80456188-80456190 004788 0008+00 0/0 5/5 0/0 .sdata2 j2dDefaultTevColor */
|
||||
SECTION_SDATA2 extern GXColorS10 j2dDefaultTevColor = {255, 255, 255, 255};
|
||||
extern const GXColorS10 j2dDefaultTevColor = {255, 255, 255, 255};
|
||||
|
||||
/* 80456190-80456194 004790 0002+02 0/0 3/3 0/0 .sdata2 j2dDefaultIndTexCoordScaleInfo */
|
||||
SECTION_SDATA2 extern const J2DIndTexCoordScaleInfo j2dDefaultIndTexCoordScaleInfo = {
|
||||
extern const J2DIndTexCoordScaleInfo j2dDefaultIndTexCoordScaleInfo = {
|
||||
GX_ITS_1,
|
||||
GX_ITS_1,
|
||||
};
|
||||
|
||||
/* 80456194-80456198 004794 0004+00 0/0 5/5 0/0 .sdata2 j2dDefaultTevKColor */
|
||||
SECTION_SDATA2 extern GXColor j2dDefaultTevKColor = {255, 255, 255, 255};
|
||||
extern const GXColor j2dDefaultTevKColor = {255, 255, 255, 255};
|
||||
|
||||
/* 80456198-8045619C 004798 0004+00 0/0 2/2 0/0 .sdata2 j2dDefaultTevSwapMode */
|
||||
SECTION_SDATA2 extern J2DTevSwapModeInfo j2dDefaultTevSwapMode = {GX_TEV_SWAP0, GX_TEV_SWAP0, 0, 0};
|
||||
extern const J2DTevSwapModeInfo j2dDefaultTevSwapMode = {GX_TEV_SWAP0, GX_TEV_SWAP0, 0, 0};
|
||||
|
||||
/* 8045619C-804561A0 00479C 0004+00 0/0 6/6 0/0 .sdata2 j2dDefaultTevSwapModeTable */
|
||||
SECTION_SDATA2 extern const J2DTevSwapModeTableInfo j2dDefaultTevSwapModeTable = {
|
||||
extern const J2DTevSwapModeTableInfo j2dDefaultTevSwapModeTable = {
|
||||
GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE, GX_CH_ALPHA};
|
||||
|
||||
/* 804561A0-804561A4 0047A0 0004+00 0/0 3/3 0/0 .sdata2 j2dDefaultBlendInfo */
|
||||
SECTION_SDATA2 extern J2DBlendInfo j2dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRC_ALPHA,
|
||||
GX_BL_INV_SRC_ALPHA, GX_LO_NOOP};
|
||||
extern const J2DBlendInfo j2dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA,
|
||||
GX_LO_NOOP};
|
||||
|
||||
/* 804561A4-804561A8 0047A4 0004+00 0/0 1/1 0/0 .sdata2 None */
|
||||
SECTION_SDATA2 extern u8 data_804561A4[4] = {
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
extern const u8 j2dDefaultPEBlockDither = 0;
|
||||
|
||||
/* 804561A8-804561AC 0047A8 0004+00 0/0 3/3 0/0 .sdata2 j2dDefaultColorChanInfo */
|
||||
SECTION_SDATA2 extern J2DColorChanInfo j2dDefaultColorChanInfo = {0, 3, 0, 0};
|
||||
extern const J2DColorChanInfo j2dDefaultColorChanInfo = {0, 3, 0, 0};
|
||||
|
||||
/* 804561AC-804561AE 0047AC 0002+00 0/0 1/1 0/0 .sdata2 None */
|
||||
SECTION_SDATA2 extern u8 data_804561AC = 0x1B;
|
||||
extern const u8 data_804561AC = 0x1B;
|
||||
|
||||
/* 804561AE-804561B0 0047AE 0002+00 0/0 3/3 0/0 .sdata2 j2dDefaultAlphaCmp */
|
||||
SECTION_SDATA2 extern u16 j2dDefaultAlphaCmp = 0x00E7;
|
||||
extern const u16 j2dDefaultAlphaCmp = 0x00E7;
|
||||
|
||||
Reference in New Issue
Block a user