moved strings + decompile simple store functions

This commit is contained in:
Julgodis
2021-04-10 07:02:38 +02:00
parent 2661db6aaa
commit 0ad6ebe7b4
1299 changed files with 51830 additions and 43634 deletions
+1 -1
View File
@@ -349,7 +349,7 @@ asm void __sinit_J3DDrawBuffer_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_803255F0 = (void*)__sinit_J3DDrawBuffer_cpp;
REGISTER_CTORS(0x803255F0, __sinit_J3DDrawBuffer_cpp);
#pragma pop
/* ############################################################################################## */
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -107,12 +107,12 @@ struct J3DPEBlockFogOff {
/* 80317B34 */ void initialize();
};
struct J3DBlend {};
struct J3DFog {};
struct J3DAlphaComp {};
struct J3DBlend {};
struct J3DPEBlock {
/* 8000DBCC */ void patch();
/* 8000DF3C */ bool getZCompLoc() const;
@@ -542,7 +542,7 @@ extern "C" extern void* __vt__21J3DColorBlockLightOff[36 + 1 /* padding */];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 __GDCurrentDL[4];
extern "C" extern u32 j3dDefaultBlendInfo;
extern "C" extern u8 struct_804563F8[4];
extern "C" extern u16 j3dDefaultAlphaCmpID;
extern "C" extern u16 j3dDefaultZModeID[1 + 1 /* padding */];
//
+1 -1
View File
@@ -140,7 +140,7 @@ asm void J3DShape::initialize() {
SECTION_RODATA static u8 const lit_697[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02,
};
COMPILER_STRIP_GATE(803A1E98, &lit_697);
COMPILER_STRIP_GATE(0x803A1E98, &lit_697);
/* 80314BB8-80314CBC 30F4F8 0104+00 0/0 1/1 0/0 .text addTexMtxIndexInDL__8J3DShapeF7_GXAttrUl */
#pragma push
+1 -1
View File
@@ -938,5 +938,5 @@ asm void __sinit_J3DShapeMtx_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_803147EC = (void*)__sinit_J3DShapeMtx_cpp;
REGISTER_CTORS(0x803147EC, __sinit_J3DShapeMtx_cpp);
#pragma pop
+4 -4
View File
@@ -182,13 +182,13 @@ asm void J3DSys::loadNrmMtxIndx(int param_0, u16 param_1) const {
SECTION_RODATA static u8 const lit_695[16] = {
0x00, 0x00, 0x80, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1DF8, &lit_695);
COMPILER_STRIP_GATE(0x803A1DF8, &lit_695);
/* 803A1E08-803A1E18 02E468 0010+00 1/1 0/0 0/0 .rodata @696 */
SECTION_RODATA static u8 const lit_696[16] = {
0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1E08, &lit_696);
COMPILER_STRIP_GATE(0x803A1E08, &lit_696);
/* 8030FF0C-803100BC 30A84C 01B0+00 1/1 0/0 0/0 .text setTexCacheRegion__6J3DSysF15_GXTexCacheSize
*/
@@ -207,7 +207,7 @@ SECTION_RODATA static u8 const lit_737[24] = {
0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1E18, &lit_737);
COMPILER_STRIP_GATE(0x803A1E18, &lit_737);
/* 803CD8A0-803CD8B0 02A9C0 0010+00 1/1 0/0 0/0 .data NullTexData */
SECTION_DATA static u8 NullTexData[16] = {
@@ -361,7 +361,7 @@ asm void __sinit_J3DSys_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80310ED0 = (void*)__sinit_J3DSys_cpp;
REGISTER_CTORS(0x80310ED0, __sinit_J3DSys_cpp);
#pragma pop
/* ############################################################################################## */
+16 -20
View File
@@ -96,7 +96,8 @@ extern "C" extern u8 j3dDefaultTevSwapMode[4];
extern "C" extern u32 j3dDefaultTevSwapModeTable;
extern "C" extern u32 j3dDefaultBlendInfo;
extern "C" extern u8 j3dDefaultColorChanInfo[8];
extern "C" extern u8 struct_804563F8[4];
extern "C" extern u16 data_804563F8;
extern "C" extern u16 j3dDefaultAlphaCmpID;
extern "C" extern u16 j3dDefaultZModeID[1 + 1 /* padding */];
//
@@ -326,14 +327,14 @@ SECTION_RODATA extern u8 const j3dDefaultLightInfo[52] = {
0xFF, 0xFF, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1EC8, &j3dDefaultLightInfo);
COMPILER_STRIP_GATE(0x803A1EC8, &j3dDefaultLightInfo);
/* 803A1EFC-803A1F1C 02E55C 0020+00 0/0 5/5 0/0 .rodata j3dDefaultTexCoordInfo */
SECTION_RODATA extern u8 const j3dDefaultTexCoordInfo[32] = {
0x01, 0x04, 0x3C, 0x00, 0x01, 0x05, 0x3C, 0x00, 0x01, 0x06, 0x3C, 0x00, 0x01, 0x07, 0x3C, 0x00,
0x01, 0x08, 0x3C, 0x00, 0x01, 0x09, 0x3C, 0x00, 0x01, 0x0A, 0x3C, 0x00, 0x01, 0x0B, 0x3C, 0x00,
};
COMPILER_STRIP_GATE(803A1EFC, &j3dDefaultTexCoordInfo);
COMPILER_STRIP_GATE(0x803A1EFC, &j3dDefaultTexCoordInfo);
/* 803A1F1C-803A1F80 02E57C 0064+00 0/0 1/1 0/0 .rodata j3dDefaultTexMtxInfo */
SECTION_RODATA extern u8 const j3dDefaultTexMtxInfo[100] = {
@@ -345,27 +346,27 @@ SECTION_RODATA extern u8 const j3dDefaultTexMtxInfo[100] = {
0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1F1C, &j3dDefaultTexMtxInfo);
COMPILER_STRIP_GATE(0x803A1F1C, &j3dDefaultTexMtxInfo);
/* 803A1F80-803A1F9C 02E5E0 001C+00 0/0 2/2 0/0 .rodata j3dDefaultIndTexMtxInfo */
SECTION_RODATA extern u8 const j3dDefaultIndTexMtxInfo[28] = {
0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1F80, &j3dDefaultIndTexMtxInfo);
COMPILER_STRIP_GATE(0x803A1F80, &j3dDefaultIndTexMtxInfo);
/* 803A1F9C-803A1FB0 02E5FC 0014+00 0/0 1/1 0/0 .rodata j3dDefaultTevStageInfo */
SECTION_RODATA extern u8 const j3dDefaultTevStageInfo[20] = {
0x04, 0x0A, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
0x05, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1F9C, &j3dDefaultTevStageInfo);
COMPILER_STRIP_GATE(0x803A1F9C, &j3dDefaultTevStageInfo);
/* 803A1FB0-803A1FBC 02E610 000C+00 0/0 2/2 0/0 .rodata j3dDefaultIndTevStageInfo */
SECTION_RODATA extern u8 const j3dDefaultIndTevStageInfo[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1FB0, &j3dDefaultIndTevStageInfo);
COMPILER_STRIP_GATE(0x803A1FB0, &j3dDefaultIndTevStageInfo);
/* 803A1FBC-803A1FE8 02E61C 002C+00 0/0 3/3 0/0 .rodata j3dDefaultFogInfo */
SECTION_RODATA extern u8 const j3dDefaultFogInfo[44] = {
@@ -373,13 +374,13 @@ SECTION_RODATA extern u8 const j3dDefaultFogInfo[44] = {
0xCD, 0x46, 0x1C, 0x40, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1FBC, &j3dDefaultFogInfo);
COMPILER_STRIP_GATE(0x803A1FBC, &j3dDefaultFogInfo);
/* 803A1FE8-803A1FF8 02E648 0010+00 0/0 3/3 0/0 .rodata j3dDefaultNBTScaleInfo */
SECTION_RODATA extern u8 const j3dDefaultNBTScaleInfo[16] = {
0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1FE8, &j3dDefaultNBTScaleInfo);
COMPILER_STRIP_GATE(0x803A1FE8, &j3dDefaultNBTScaleInfo);
/* 803A1FF8-803A2008 02E658 000B+05 1/1 0/0 0/0 .rodata @1197 */
SECTION_RODATA static u8 const lit_1197[11 + 5 /* padding */] = {
@@ -401,7 +402,7 @@ SECTION_RODATA static u8 const lit_1197[11 + 5 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(803A1FF8, &lit_1197);
COMPILER_STRIP_GATE(0x803A1FF8, &lit_1197);
/* 80434C98-80436A60 0619B8 1DC7+01 1/1 0/0 0/0 .bss j3dTexCoordTable */
static u8 j3dTexCoordTable[7623 + 1 /* padding */];
@@ -553,16 +554,11 @@ SECTION_SDATA2 extern u8 j3dDefaultColorChanInfo[8] = {
0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0xFF, 0xFF,
};
/* 804563F8-804563FC -00001 0004+00 0/0 2/2 0/0 .sdata2 None */
SECTION_SDATA2 extern u8 struct_804563F8[4];
SECTION_SDATA2 u8 struct_804563F8[4] = {
/* 804563F8 0002+00 data_804563F8 None */
0x1B,
0x00,
/* 804563FA 0002+00 data_804563FA j3dDefaultAlphaCmpID */
0x00,
0xE7,
};
/* 804563F8-804563FA 0049F8 0002+00 0/0 1/1 0/0 .sdata2 None */
SECTION_SDATA2 extern u16 data_804563F8 = 0x1B00;
/* 804563FA-804563FC 0049FA 0002+00 0/0 1/1 0/0 .sdata2 j3dDefaultAlphaCmpID */
SECTION_SDATA2 extern u16 j3dDefaultAlphaCmpID = 0x00E7;
/* 804563FC-80456400 0049FC 0002+02 0/0 3/3 0/0 .sdata2 j3dDefaultZModeID */
SECTION_SDATA2 extern u16 j3dDefaultZModeID[1 + 1 /* padding */] = {
+12 -13
View File
@@ -25,7 +25,7 @@ struct J3DTextureSRTInfo {};
// Forward References:
//
extern "C" static void __MTGQR7__FUl();
extern "C" void __MTGQR7__FUl();
extern "C" void J3DGQRSetup7__FUlUlUlUl();
extern "C" void J3DCalcBBoardMtx__FPA4_f();
extern "C" void J3DCalcYBBoardMtx__FPA4_f();
@@ -53,15 +53,14 @@ extern "C" u8 sincosTable___5JMath[65536];
// Declarations:
//
/* 80311630-80311638 30BF70 0008+00 1/1 0/0 0/0 .text __MTGQR7__FUl */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void __MTGQR7(u32 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DTransform/__MTGQR7__FUl.s"
/* 80311630-80311638 -00001 0008+00 0/0 0/0 0/0 .text __MTGQR7__FUl */
asm void __MTGQR7(u32 param_0) {
// clang-format off
nofralloc
mtspr 0x397, r3
blr
// clang-format on
}
#pragma pop
/* 80311638-80311670 30BF78 0038+00 0/0 2/2 0/0 .text J3DGQRSetup7__FUlUlUlUl */
#pragma push
@@ -98,13 +97,13 @@ SECTION_RODATA extern u8 const j3dDefaultTransformInfo[32] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1E30, &j3dDefaultTransformInfo);
COMPILER_STRIP_GATE(0x803A1E30, &j3dDefaultTransformInfo);
/* 803A1E50-803A1E5C 02E4B0 000C+00 0/0 1/1 0/0 .rodata j3dDefaultScale */
SECTION_RODATA extern u8 const j3dDefaultScale[12] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1E50, &j3dDefaultScale);
COMPILER_STRIP_GATE(0x803A1E50, &j3dDefaultScale);
/* 803A1E5C-803A1E8C 02E4BC 0030+00 0/0 8/8 7/7 .rodata j3dDefaultMtx */
SECTION_RODATA extern u8 const j3dDefaultMtx[48] = {
@@ -112,13 +111,13 @@ SECTION_RODATA extern u8 const j3dDefaultMtx[48] = {
0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1E5C, &j3dDefaultMtx);
COMPILER_STRIP_GATE(0x803A1E5C, &j3dDefaultMtx);
/* 803A1E8C-803A1E98 02E4EC 000C+00 1/1 0/0 0/0 .rodata @443 */
SECTION_RODATA static u8 const lit_443[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1E8C, &lit_443);
COMPILER_STRIP_GATE(0x803A1E8C, &lit_443);
/* 80311760-8031189C 30C0A0 013C+00 0/0 2/2 0/0 .text J3DCalcYBBoardMtx__FPA4_f */
#pragma push