mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-22 06:44:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

moved strings + decompile simple store functions

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/J2DGraph/J2DAnimation.cpp
+6 -4
View File
@@ -147,8 +147,8 @@ extern "C" void getVisibility__20J2DAnmVisibilityFullCFUsPUc();
extern "C" void getTevColorReg__15J2DAnmTevRegKeyCFUsP11_GXColorS10();
extern "C" void getTevKonstReg__15J2DAnmTevRegKeyCFUsP8_GXColor();
extern "C" void searchUpdateMaterialID__15J2DAnmTevRegKeyFP9J2DScreen();
extern "C" void func_8030C77C(f32, J3DAnmKeyTableBase*, s16*);
extern "C" void func_8030C9B0(f32, J3DAnmKeyTableBase*, f32*);
extern "C" void func_8030C77C(void* _this, f32, J3DAnmKeyTableBase*, s16*);
extern "C" void func_8030C9B0(void* _this, f32, J3DAnmKeyTableBase*, f32*);
extern "C" void __ct__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv();
extern "C" void __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv();
extern "C" void __dt__16J2DAnmTexPatternFv();
@@ -419,7 +419,8 @@ SECTION_SDATA2 static f64 lit_2379 = 4503601774854144.0 /* cast s32 to float */;
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8030C77C(f32 param_0, J3DAnmKeyTableBase* param_1, s16* param_2) {
extern "C" asm void func_8030C77C(void* _this, f32 param_0, J3DAnmKeyTableBase* param_1,
s16* param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DAnimation/func_8030C77C.s"
}
@@ -430,7 +431,8 @@ extern "C" asm void func_8030C77C(f32 param_0, J3DAnmKeyTableBase* param_1, s16*
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8030C9B0(f32 param_0, J3DAnmKeyTableBase* param_1, f32* param_2) {
extern "C" asm void func_8030C9B0(void* _this, f32 param_0, J3DAnmKeyTableBase* param_1,
f32* param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DAnimation/func_8030C9B0.s"
}
libs/JSystem/J2DGraph/J2DAnmLoader.cpp
+30 -30
View File
@@ -73,12 +73,12 @@ struct J2DAnmLoader {
/* 8030A410 */ ~J2DAnmLoader();
};
struct J2DAnmColorKey {};
struct J2DAnmBase {
/* 800569B0 */ void searchUpdateMaterialID(J2DScreen*);
};
struct J2DAnmColorKey {};
struct J2DAnmKeyLoader_v15 {
/* 80309290 */ J2DAnmKeyLoader_v15();
/* 803092AC */ ~J2DAnmKeyLoader_v15();
@@ -158,19 +158,19 @@ setAnmVtxColor__20J2DAnmFullLoader_v15FP18J2DAnmVtxColorFullPC22J3DAnmVtxColorFu
extern "C" void __dt__14J2DAnmVtxColorFv();
extern "C" void __dt__20J2DAnmVisibilityFullFv();
extern "C" void __dt__12J2DAnmLoaderFv();
extern "C" void func_8030A458(void const*, void const*);
extern "C" void func_8030A470(void const*, void const*);
extern "C" void func_8030A488(void const*, void const*);
extern "C" void func_8030A4A0(void const*, void const*);
extern "C" void func_8030A4B8(void const*, void const*);
extern "C" void func_8030A4D0(void const*, void const*);
extern "C" void func_8030A4E8(void const*, void const*);
extern "C" void func_8030A500(void const*, void const*);
extern "C" void func_8030A518(void const*, void const*);
extern "C" void func_8030A530(void const*, void const*);
extern "C" void func_8030A548(void const*, void const*);
extern "C" void func_8030A560(void const*, void const*);
extern "C" void func_8030A578(void const*, void const*);
extern "C" void func_8030A458(void* _this, void const*, void const*);
extern "C" void func_8030A470(void* _this, void const*, void const*);
extern "C" void func_8030A488(void* _this, void const*, void const*);
extern "C" void func_8030A4A0(void* _this, void const*, void const*);
extern "C" void func_8030A4B8(void* _this, void const*, void const*);
extern "C" void func_8030A4D0(void* _this, void const*, void const*);
extern "C" void func_8030A4E8(void* _this, void const*, void const*);
extern "C" void func_8030A500(void* _this, void const*, void const*);
extern "C" void func_8030A518(void* _this, void const*, void const*);
extern "C" void func_8030A530(void* _this, void const*, void const*);
extern "C" void func_8030A548(void* _this, void const*, void const*);
extern "C" void func_8030A560(void* _this, void const*, void const*);
extern "C" void func_8030A578(void* _this, void const*, void const*);
//
// External References:
@@ -181,8 +181,8 @@ extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
extern "C" void __ct__10JUTNameTabFv();
extern "C" void setResource__10JUTNameTabFPC7ResNTAB();
extern "C" void func_802F4260(void const*, void const*);
extern "C" void func_802F42C0(void const*, void const*);
extern "C" void func_802F4260(void* _this, void const*, void const*);
extern "C" void func_802F42C0(void* _this, void const*, void const*);
extern "C" void getColor__14J2DAnmVtxColorCFUcUsP8_GXColor();
extern "C" void _savegpr_26();
extern "C" void _savegpr_27();
@@ -611,7 +611,7 @@ asm J2DAnmLoader::~J2DAnmLoader() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8030A458(void const* param_0, void const* param_1) {
extern "C" asm void func_8030A458(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A458.s"
}
@@ -622,7 +622,7 @@ extern "C" asm void func_8030A458(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8030A470(void const* param_0, void const* param_1) {
extern "C" asm void func_8030A470(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A470.s"
}
@@ -633,7 +633,7 @@ extern "C" asm void func_8030A470(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8030A488(void const* param_0, void const* param_1) {
extern "C" asm void func_8030A488(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A488.s"
}
@@ -644,7 +644,7 @@ extern "C" asm void func_8030A488(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8030A4A0(void const* param_0, void const* param_1) {
extern "C" asm void func_8030A4A0(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A4A0.s"
}
@@ -655,7 +655,7 @@ extern "C" asm void func_8030A4A0(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8030A4B8(void const* param_0, void const* param_1) {
extern "C" asm void func_8030A4B8(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A4B8.s"
}
@@ -666,7 +666,7 @@ extern "C" asm void func_8030A4B8(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8030A4D0(void const* param_0, void const* param_1) {
extern "C" asm void func_8030A4D0(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A4D0.s"
}
@@ -677,7 +677,7 @@ extern "C" asm void func_8030A4D0(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8030A4E8(void const* param_0, void const* param_1) {
extern "C" asm void func_8030A4E8(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A4E8.s"
}
@@ -688,7 +688,7 @@ extern "C" asm void func_8030A4E8(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8030A500(void const* param_0, void const* param_1) {
extern "C" asm void func_8030A500(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A500.s"
}
@@ -698,7 +698,7 @@ extern "C" asm void func_8030A500(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8030A518(void const* param_0, void const* param_1) {
extern "C" asm void func_8030A518(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A518.s"
}
@@ -709,7 +709,7 @@ extern "C" asm void func_8030A518(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8030A530(void const* param_0, void const* param_1) {
extern "C" asm void func_8030A530(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A530.s"
}
@@ -720,7 +720,7 @@ extern "C" asm void func_8030A530(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8030A548(void const* param_0, void const* param_1) {
extern "C" asm void func_8030A548(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A548.s"
}
@@ -731,7 +731,7 @@ extern "C" asm void func_8030A548(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8030A560(void const* param_0, void const* param_1) {
extern "C" asm void func_8030A560(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A560.s"
}
@@ -742,7 +742,7 @@ extern "C" asm void func_8030A560(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8030A578(void const* param_0, void const* param_1) {
extern "C" asm void func_8030A578(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A578.s"
}
libs/JSystem/J2DGraph/J2DMatBlock.cpp
+33 -82
View File
@@ -793,7 +793,8 @@ extern "C" extern u32 j2dDefaultTevSwapModeTable;
extern "C" extern u32 j2dDefaultBlendInfo;
extern "C" extern u8 data_804561A4[4];
extern "C" extern u32 j2dDefaultColorChanInfo;
extern "C" extern u8 struct_804561AC[4];
extern "C" extern u16 data_804561AC;
extern "C" extern u16 j2dDefaultAlphaCmp;
//
// Declarations:
@@ -814,7 +815,7 @@ asm void J2DColorBlock::initialize() {
SECTION_RODATA static u8 const lit_1463[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03,
};
COMPILER_STRIP_GATE(803A1C00, &lit_1463);
COMPILER_STRIP_GATE(0x803A1C00, &lit_1463);
/* 802EB424-802EB510 2E5D64 00EC+00 0/0 1/1 0/0 .text setGX__13J2DColorBlockFv */
#pragma push
@@ -2116,15 +2117,10 @@ asm void J2DIndBlockFull::getType() {
}
#pragma pop
/* 802F1BA0-802F1BA8 2EC4E0 0008+00 1/0 0/0 0/0 .text setIndTexStageNum__15J2DIndBlockFullFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DIndBlockFull::setIndTexStageNum(u8 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setIndTexStageNum__15J2DIndBlockFullFUc.s"
/* 802F1BA0-802F1BA8 -00001 0008+00 0/0 0/0 0/0 .text setIndTexStageNum__15J2DIndBlockFullFUc */
void J2DIndBlockFull::setIndTexStageNum(u8 param_0) {
*(u8*)(((u8*)this) + 4) /* this->field_0x4 */ = (u8)(param_0);
}
#pragma pop
/* 802F1BA8-802F1BB0 2EC4E8 0008+00 1/0 0/0 0/0 .text getIndTexStageNum__15J2DIndBlockFullCFv */
#pragma push
@@ -2245,15 +2241,10 @@ asm void J2DTevBlock16::getTexNo(u32 param_0) const {
}
#pragma pop
/* 802F1D4C-802F1D54 2EC68C 0008+00 1/0 0/0 0/0 .text setFontNo__13J2DTevBlock16FUs */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::setFontNo(u16 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__13J2DTevBlock16FUs.s"
/* 802F1D4C-802F1D54 -00001 0008+00 0/0 0/0 0/0 .text setFontNo__13J2DTevBlock16FUs */
void J2DTevBlock16::setFontNo(u16 param_0) {
*(u16*)(((u8*)this) + 20) /* this->field_0x14 */ = (u16)(param_0);
}
#pragma pop
/* 802F1D54-802F1D5C 2EC694 0008+00 1/0 0/0 0/0 .text getFontNo__13J2DTevBlock16CFv */
#pragma push
@@ -2370,16 +2361,11 @@ asm void J2DTevBlock16::getTevKAlphaSel(u32 param_0) {
}
#pragma pop
/* 802F1E44-802F1E4C 2EC784 0008+00 1/0 0/0 0/0 .text setTevStageNum__13J2DTevBlock16FUc
/* 802F1E44-802F1E4C -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__13J2DTevBlock16FUc
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::setTevStageNum(u8 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__13J2DTevBlock16FUc.s"
void J2DTevBlock16::setTevStageNum(u8 param_0) {
*(u8*)(((u8*)this) + 118) /* this->field_0x76 */ = (u8)(param_0);
}
#pragma pop
/* 802F1E4C-802F1E54 2EC78C 0008+00 1/0 0/0 0/0 .text getTevStageNum__13J2DTevBlock16CFv
*/
@@ -2564,15 +2550,10 @@ asm void J2DTevBlock8::getTexNo(u32 param_0) const {
}
#pragma pop
/* 802F1FEC-802F1FF4 2EC92C 0008+00 1/0 0/0 0/0 .text setFontNo__12J2DTevBlock8FUs */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::setFontNo(u16 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock8FUs.s"
/* 802F1FEC-802F1FF4 -00001 0008+00 0/0 0/0 0/0 .text setFontNo__12J2DTevBlock8FUs */
void J2DTevBlock8::setFontNo(u16 param_0) {
*(u16*)(((u8*)this) + 20) /* this->field_0x14 */ = (u16)(param_0);
}
#pragma pop
/* 802F1FF4-802F1FFC 2EC934 0008+00 1/0 0/0 0/0 .text getFontNo__12J2DTevBlock8CFv */
#pragma push
@@ -2689,16 +2670,11 @@ asm void J2DTevBlock8::getTevKAlphaSel(u32 param_0) {
}
#pragma pop
/* 802F20E4-802F20EC 2ECA24 0008+00 1/0 0/0 0/0 .text setTevStageNum__12J2DTevBlock8FUc
/* 802F20E4-802F20EC -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__12J2DTevBlock8FUc
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::setTevStageNum(u8 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__12J2DTevBlock8FUc.s"
void J2DTevBlock8::setTevStageNum(u8 param_0) {
*(u8*)(((u8*)this) + 86) /* this->field_0x56 */ = (u8)(param_0);
}
#pragma pop
/* 802F20EC-802F20F4 2ECA2C 0008+00 1/0 0/0 0/0 .text getTevStageNum__12J2DTevBlock8CFv
*/
@@ -2883,15 +2859,10 @@ asm void J2DTevBlock4::getTexNo(u32 param_0) const {
}
#pragma pop
/* 802F228C-802F2294 2ECBCC 0008+00 1/0 0/0 0/0 .text setFontNo__12J2DTevBlock4FUs */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::setFontNo(u16 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock4FUs.s"
/* 802F228C-802F2294 -00001 0008+00 0/0 0/0 0/0 .text setFontNo__12J2DTevBlock4FUs */
void J2DTevBlock4::setFontNo(u16 param_0) {
*(u16*)(((u8*)this) + 12) /* this->field_0xc */ = (u16)(param_0);
}
#pragma pop
/* 802F2294-802F229C 2ECBD4 0008+00 1/0 0/0 0/0 .text getFontNo__12J2DTevBlock4CFv */
#pragma push
@@ -3008,16 +2979,11 @@ asm void J2DTevBlock4::getTevKAlphaSel(u32 param_0) {
}
#pragma pop
/* 802F2384-802F238C 2ECCC4 0008+00 1/0 0/0 0/0 .text setTevStageNum__12J2DTevBlock4FUc
/* 802F2384-802F238C -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__12J2DTevBlock4FUc
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::setTevStageNum(u8 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__12J2DTevBlock4FUc.s"
void J2DTevBlock4::setTevStageNum(u8 param_0) {
*(u8*)(((u8*)this) + 62) /* this->field_0x3e */ = (u8)(param_0);
}
#pragma pop
/* 802F238C-802F2394 2ECCCC 0008+00 1/0 0/0 0/0 .text getTevStageNum__12J2DTevBlock4CFv
*/
@@ -3202,15 +3168,10 @@ asm void J2DTevBlock2::getTexNo(u32 param_0) const {
}
#pragma pop
/* 802F2530-802F2538 2ECE70 0008+00 1/0 0/0 0/0 .text setFontNo__12J2DTevBlock2FUs */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::setFontNo(u16 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock2FUs.s"
/* 802F2530-802F2538 -00001 0008+00 0/0 0/0 0/0 .text setFontNo__12J2DTevBlock2FUs */
void J2DTevBlock2::setFontNo(u16 param_0) {
*(u16*)(((u8*)this) + 8) /* this->field_0x8 */ = (u16)(param_0);
}
#pragma pop
/* 802F2538-802F2540 2ECE78 0008+00 1/0 0/0 0/0 .text getFontNo__12J2DTevBlock2CFv */
#pragma push
@@ -3327,16 +3288,11 @@ asm void J2DTevBlock2::getTevKAlphaSel(u32 param_0) {
}
#pragma pop
/* 802F2628-802F2630 2ECF68 0008+00 1/0 0/0 0/0 .text setTevStageNum__12J2DTevBlock2FUc
/* 802F2628-802F2630 -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__12J2DTevBlock2FUc
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::setTevStageNum(u8 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__12J2DTevBlock2FUc.s"
void J2DTevBlock2::setTevStageNum(u8 param_0) {
*(u8*)(((u8*)this) + 50) /* this->field_0x32 */ = (u8)(param_0);
}
#pragma pop
/* 802F2630-802F2638 2ECF70 0008+00 1/0 0/0 0/0 .text getTevStageNum__12J2DTevBlock2CFv
*/
@@ -3521,15 +3477,10 @@ asm void J2DTevBlock1::getTexNo(u32 param_0) const {
}
#pragma pop
/* 802F27D4-802F27DC 2ED114 0008+00 1/0 0/0 0/0 .text setFontNo__12J2DTevBlock1FUs */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::setFontNo(u16 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock1FUs.s"
/* 802F27D4-802F27DC -00001 0008+00 0/0 0/0 0/0 .text setFontNo__12J2DTevBlock1FUs */
void J2DTevBlock1::setFontNo(u16 param_0) {
*(u16*)(((u8*)this) + 6) /* this->field_0x6 */ = (u16)(param_0);
}
#pragma pop
/* 802F27DC-802F27E4 2ED11C 0008+00 1/0 0/0 0/0 .text getFontNo__12J2DTevBlock1CFv */
#pragma push
libs/JSystem/J2DGraph/J2DMaterial.cpp
+9 -9
View File
@@ -82,25 +82,25 @@ struct J2DPEBlock {
/* 802F1840 */ void setGX();
};
struct J2DAnmTextureSRTKey {
/* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
};
struct J2DAnmTexPattern {
/* 8030BEE8 */ void getTexNo(u16, u16*) const;
/* 8030BF9C */ void getResTIMG(u16) const;
/* 8030BFF0 */ void getPalette(u16) const;
};
struct J2DAnmColor {
/* 802EB390 */ void getColor(u16, _GXColor*) const;
};
struct J2DAnmTevRegKey {
/* 8030C0F0 */ void getTevColorReg(u16, _GXColorS10*) const;
/* 8030C3B4 */ void getTevKonstReg(u16, _GXColor*) const;
};
struct J2DAnmTextureSRTKey {
/* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
};
struct J2DAnmColor {
/* 802EB390 */ void getColor(u16, _GXColor*) const;
};
struct J2DMaterial {
struct J2DMaterialAnmPointer {
/* 802EA79C */ J2DMaterialAnmPointer();
@@ -250,7 +250,7 @@ extern "C" extern u16 j2dDefaultIndTexOrderNull[1 + 1 /* padding */];
extern "C" extern u8 j2dDefaultIndTexCoordScaleInfo[2 + 2 /* padding */];
extern "C" extern u32 j2dDefaultBlendInfo;
extern "C" extern u32 j2dDefaultColorChanInfo;
extern "C" extern u8 struct_804561AC[4];
extern "C" extern u16 j2dDefaultAlphaCmp;
//
// Declarations:
libs/JSystem/J2DGraph/J2DMaterialFactory.cpp
+33 -33
View File
@@ -111,22 +111,22 @@ extern "C" void newAlphaComp__18J2DMaterialFactoryCFi();
extern "C" void newBlend__18J2DMaterialFactoryCFi();
extern "C" void newDither__18J2DMaterialFactoryCFi();
extern "C" void __ct__11J2DTevStageFRC15J2DTevStageInfo();
extern "C" void func_802F4170(void const*, void const*);
extern "C" void func_802F4188(void const*, void const*);
extern "C" void func_802F41A0(void const*, void const*);
extern "C" void func_802F41B8(void const*, void const*);
extern "C" void func_802F41D0(void const*, void const*);
extern "C" void func_802F41E8(void const*, void const*);
extern "C" void func_802F4200(void const*, void const*);
extern "C" void func_802F4218(void const*, void const*);
extern "C" void func_802F4230(void const*, void const*);
extern "C" void func_802F4248(void const*, void const*);
extern "C" void func_802F4260(void const*, void const*);
extern "C" void func_802F4278(void const*, void const*);
extern "C" void func_802F4290(void const*, void const*);
extern "C" void func_802F42A8(void const*, void const*);
extern "C" void func_802F42C0(void const*, void const*);
extern "C" void func_802F42D8(void const*, void const*);
extern "C" void func_802F4170(void* _this, void const*, void const*);
extern "C" void func_802F4188(void* _this, void const*, void const*);
extern "C" void func_802F41A0(void* _this, void const*, void const*);
extern "C" void func_802F41B8(void* _this, void const*, void const*);
extern "C" void func_802F41D0(void* _this, void const*, void const*);
extern "C" void func_802F41E8(void* _this, void const*, void const*);
extern "C" void func_802F4200(void* _this, void const*, void const*);
extern "C" void func_802F4218(void* _this, void const*, void const*);
extern "C" void func_802F4230(void* _this, void const*, void const*);
extern "C" void func_802F4248(void* _this, void const*, void const*);
extern "C" void func_802F4260(void* _this, void const*, void const*);
extern "C" void func_802F4278(void* _this, void const*, void const*);
extern "C" void func_802F4290(void* _this, void const*, void const*);
extern "C" void func_802F42A8(void* _this, void const*, void const*);
extern "C" void func_802F42C0(void* _this, void const*, void const*);
extern "C" void func_802F42D8(void* _this, void const*, void const*);
//
// External References:
@@ -158,7 +158,7 @@ extern "C" extern u8 j2dDefaultTevSwapMode[4];
extern "C" extern u32 j2dDefaultTevSwapModeTable;
extern "C" extern u32 j2dDefaultBlendInfo;
extern "C" extern u32 j2dDefaultColorChanInfo;
extern "C" extern u8 struct_804561AC[4];
extern "C" extern u16 j2dDefaultAlphaCmp;
//
// Declarations:
@@ -467,7 +467,7 @@ asm J2DTevStage::J2DTevStage(J2DTevStageInfo const& param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802F4170(void const* param_0, void const* param_1) {
extern "C" asm void func_802F4170(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4170.s"
}
@@ -478,7 +478,7 @@ extern "C" asm void func_802F4170(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802F4188(void const* param_0, void const* param_1) {
extern "C" asm void func_802F4188(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4188.s"
}
@@ -489,7 +489,7 @@ extern "C" asm void func_802F4188(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802F41A0(void const* param_0, void const* param_1) {
extern "C" asm void func_802F41A0(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F41A0.s"
}
@@ -500,7 +500,7 @@ extern "C" asm void func_802F41A0(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802F41B8(void const* param_0, void const* param_1) {
extern "C" asm void func_802F41B8(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F41B8.s"
}
@@ -511,7 +511,7 @@ extern "C" asm void func_802F41B8(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802F41D0(void const* param_0, void const* param_1) {
extern "C" asm void func_802F41D0(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F41D0.s"
}
@@ -522,7 +522,7 @@ extern "C" asm void func_802F41D0(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802F41E8(void const* param_0, void const* param_1) {
extern "C" asm void func_802F41E8(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F41E8.s"
}
@@ -533,7 +533,7 @@ extern "C" asm void func_802F41E8(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802F4200(void const* param_0, void const* param_1) {
extern "C" asm void func_802F4200(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4200.s"
}
@@ -544,7 +544,7 @@ extern "C" asm void func_802F4200(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802F4218(void const* param_0, void const* param_1) {
extern "C" asm void func_802F4218(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4218.s"
}
@@ -555,7 +555,7 @@ extern "C" asm void func_802F4218(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802F4230(void const* param_0, void const* param_1) {
extern "C" asm void func_802F4230(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4230.s"
}
@@ -566,7 +566,7 @@ extern "C" asm void func_802F4230(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802F4248(void const* param_0, void const* param_1) {
extern "C" asm void func_802F4248(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4248.s"
}
@@ -576,7 +576,7 @@ extern "C" asm void func_802F4248(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802F4260(void const* param_0, void const* param_1) {
extern "C" asm void func_802F4260(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4260.s"
}
@@ -586,7 +586,7 @@ extern "C" asm void func_802F4260(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802F4278(void const* param_0, void const* param_1) {
extern "C" asm void func_802F4278(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4278.s"
}
@@ -597,7 +597,7 @@ extern "C" asm void func_802F4278(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802F4290(void const* param_0, void const* param_1) {
extern "C" asm void func_802F4290(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4290.s"
}
@@ -608,7 +608,7 @@ extern "C" asm void func_802F4290(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802F42A8(void const* param_0, void const* param_1) {
extern "C" asm void func_802F42A8(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F42A8.s"
}
@@ -618,7 +618,7 @@ extern "C" asm void func_802F42A8(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802F42C0(void const* param_0, void const* param_1) {
extern "C" asm void func_802F42C0(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F42C0.s"
}
@@ -629,7 +629,7 @@ extern "C" asm void func_802F42C0(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802F42D8(void const* param_0, void const* param_1) {
extern "C" asm void func_802F42D8(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F42D8.s"
}
libs/JSystem/J2DGraph/J2DPane.cpp
+12 -18
View File
@@ -60,31 +60,30 @@ struct J2DScreen {
struct J2DRotateAxis {};
struct J2DAnmVtxColor {};
struct J2DAnmVisibilityFull {};
struct J2DAnmBase {};
struct J2DAnmTexPattern {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
struct J2DAnmTevRegKey {};
struct J2DBasePosition {};
struct J2DGrafContext {
/* 802E8E20 */ void setScissor();
/* 802E90C0 */ void scissor(JGeometry::TBox2<f32> const&);
};
struct J2DAnmVisibilityFull {};
struct J2DBasePosition {};
struct J2DAnmColor {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmVtxColor {};
struct J2DAnmTransform {};
struct J2DAnmBase {};
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
/* 80053BC0 */ void calcMtx();
/* 80053C00 */ void makeMatrix(f32, f32);
/* 802F7540 */ void makeMatrix(f32, f32, f32, f32);
@@ -745,15 +744,10 @@ asm void J2DPane::setAnimation(J2DAnmBase* param_0) {
}
#pragma pop
/* 802F7FC4-802F7FCC 2F2904 0008+00 1/0 7/4 0/0 .text setAnimation__7J2DPaneFP15J2DAnmTransform */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPane::setAnimation(J2DAnmTransform* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPane/setAnimation__7J2DPaneFP15J2DAnmTransform.s"
/* 802F7FC4-802F7FCC -00001 0008+00 0/0 0/0 0/0 .text setAnimation__7J2DPaneFP15J2DAnmTransform */
void J2DPane::setAnimation(J2DAnmTransform* param_0) {
*(u32*)(((u8*)this) + 248) /* this->field_0xf8 */ = (u32)(param_0);
}
#pragma pop
/* 802F7FCC-802F8004 2F290C 0038+00 0/0 57/57 0/0 .text animationTransform__7J2DPaneFv */
#pragma push
@@ -915,5 +909,5 @@ asm void __sinit_J2DPane_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_802F847C = (void*)__sinit_J2DPane_cpp;
REGISTER_CTORS(0x802F847C, __sinit_J2DPane_cpp);
#pragma pop
libs/JSystem/J2DGraph/J2DPicture.cpp
+13 -15
View File
@@ -65,7 +65,7 @@ struct JGeometry {
struct TVec2 {};
/* TVec2<s16> */
struct TVec2__template0 {
/* 802FF204 */ void func_802FF204();
/* 802FF204 */ void func_802FF204(void* _this);
};
};
@@ -77,22 +77,21 @@ struct J2DMirror {};
struct J2DAnmTexPattern {};
struct J2DAnmVtxColor {};
struct J2DAnmVisibilityFull {};
struct J2DAnmColor {};
struct J2DAnmTransform {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmTevRegKey {};
struct J2DAnmBase {};
struct J2DAnmColor {};
struct J2DAnmTevRegKey {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmTransform {};
struct J2DAnmVtxColor {};
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
/* 80053BC0 */ void calcMtx();
/* 80053C00 */ void makeMatrix(f32, f32);
/* 802F7540 */ void makeMatrix(f32, f32, f32, f32);
@@ -100,7 +99,6 @@ struct J2DPane {
/* 8025601C */ void setAnimation(J2DAnmVisibilityFull*);
/* 80256020 */ void setAnimation(J2DAnmTexPattern*);
/* 8018BF28 */ void setAnimation(J2DAnmTextureSRTKey*);
/* 802F7FC4 */ void setAnimation(J2DAnmTransform*);
/* 80126350 */ void setAnimation(J2DAnmTevRegKey*);
/* 80126354 */ void setAnimation(J2DAnmColor*);
/* 802F7EF4 */ void setAnimation(J2DAnmBase*);
@@ -252,7 +250,7 @@ extern "C" void func_802FED84();
extern "C" void isUsed__10J2DPictureFPC7ResTIMG();
extern "C" void getUsableTlut__10J2DPictureFUc();
extern "C" void getTlutID__10J2DPictureFPC7ResTIMGUc();
extern "C" void func_802FF204();
extern "C" void func_802FF204(void* _this);
extern "C" void append__10J2DPictureFP10JUTTexturef();
extern "C" void append__10J2DPictureFPC7ResTIMGP10JUTPalettef();
extern "C" void load__10J2DPictureFUc();
@@ -916,7 +914,7 @@ asm void J2DPicture::getTlutID(ResTIMG const* param_0, u8 param_1) {
#pragma pop
/* 802FF204-802FF208 2F9B44 0004+00 5/5 1/1 0/0 .text __ct__Q29JGeometry8TVec2<s>Fv */
extern "C" void func_802FF204() {
extern "C" void func_802FF204(void* _this) {
/* empty function */
}
libs/JSystem/J2DGraph/J2DPictureEx.cpp
+26 -31
View File
@@ -55,7 +55,7 @@ struct JGeometry {
struct TVec2 {};
/* TVec2<s16> */
struct TVec2__template0 {
/* 802FF204 */ void func_802FF204();
/* 802FF204 */ void func_802FF204(void* _this);
};
};
@@ -73,30 +73,20 @@ struct J2DScreen {
struct J2DAnmTexPattern {};
struct J2DAnmVtxColor {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
struct J2DAnmTevRegKey {};
struct J2DMaterial {
/* 802EA38C */ void setGX();
/* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
/* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
/* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
/* 802EA89C */ void setAnimation(J2DAnmColor*);
};
struct J2DAnmVisibilityFull {
/* 8030C048 */ void getVisibility(u16, u8*) const;
};
struct J2DAnmTransform {};
struct J2DAnmBase {};
struct J2DAnmTevRegKey {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmVtxColor {};
struct J2DAnmTransform {};
struct J2DPane {
/* 80053BC0 */ void calcMtx();
/* 80053C00 */ void makeMatrix(f32, f32);
@@ -122,6 +112,16 @@ struct J2DPane {
/* 802F8474 */ void update();
};
struct J2DAnmColor {};
struct J2DMaterial {
/* 802EA38C */ void setGX();
/* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
/* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
/* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
/* 802EA89C */ void setAnimation(J2DAnmColor*);
};
struct J2DPictureEx {
struct stage_enum {};
@@ -336,7 +336,7 @@ extern "C" void __ct__10J2DPictureFv();
extern "C" void __dt__10J2DPictureFv();
extern "C" void drawSelf__10J2DPictureFff();
extern "C" void getTlutID__10J2DPictureFPC7ResTIMGUc();
extern "C" void func_802FF204();
extern "C" void func_802FF204(void* _this);
extern "C" s32 getTypeID__10J2DPictureCFv();
extern "C" void getVisibility__20J2DAnmVisibilityFullCFUsPUc();
extern "C" void PSMTXIdentity();
@@ -768,7 +768,7 @@ SECTION_RODATA static u8 const lit_2555[32] = {
0x0F, 0x08, 0x0A, 0x0F, 0x0F, 0x08, 0x0A, 0x0F, 0x0F, 0x08, 0x0E, 0x0F, 0x0F, 0x08, 0x0E, 0x00,
0x0F, 0x0A, 0x00, 0x0F, 0x02, 0x04, 0x08, 0x0F, 0x02, 0x04, 0x08, 0x0F, 0x02, 0x04, 0x00, 0x0F,
};
COMPILER_STRIP_GATE(803A1D50, &lit_2555);
COMPILER_STRIP_GATE(0x803A1D50, &lit_2555);
/* 80305688-80305928 2FFFC8 02A0+00 1/1 0/0 0/0 .text
* setStage__12J2DPictureExFP11J2DTevStageQ212J2DPictureEx10stage_enum */
@@ -1076,16 +1076,11 @@ asm void J2DPictureEx::setAnimation(J2DAnmTevRegKey* param_0) {
}
#pragma pop
/* 80306B74-80306B7C 3014B4 0008+00 1/0 0/0 0/0 .text
/* 80306B74-80306B7C -00001 0008+00 0/0 0/0 0/0 .text
* setAnimation__12J2DPictureExFP20J2DAnmVisibilityFull */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::setAnimation(J2DAnmVisibilityFull* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/setAnimation__12J2DPictureExFP20J2DAnmVisibilityFull.s"
void J2DPictureEx::setAnimation(J2DAnmVisibilityFull* param_0) {
*(u32*)(((u8*)this) + 404) /* this->field_0x194 */ = (u32)(param_0);
}
#pragma pop
/* 80306B7C-80306C70 3014BC 00F4+00 1/0 0/0 0/0 .text
* setAnimation__12J2DPictureExFP14J2DAnmVtxColor */
@@ -1283,7 +1278,7 @@ SECTION_RODATA static u8 const lit_2556[32] = {
0x07, 0x04, 0x05, 0x07, 0x05, 0x07, 0x07, 0x07, 0x07, 0x04, 0x06, 0x07, 0x07, 0x04, 0x06, 0x00,
0x07, 0x05, 0x00, 0x07, 0x01, 0x02, 0x04, 0x07, 0x07, 0x07, 0x07, 0x02, 0x01, 0x02, 0x00, 0x07,
};
COMPILER_STRIP_GATE(803A1D70, &lit_2556);
COMPILER_STRIP_GATE(0x803A1D70, &lit_2556);
#pragma pop
/* 803A1D90-803A1DB8 02E3F0 0028+00 0/0 0/0 0/0 .rodata @2557 */
@@ -1294,5 +1289,5 @@ SECTION_RODATA static u8 const lit_2557[40] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1D90, &lit_2557);
COMPILER_STRIP_GATE(0x803A1D90, &lit_2557);
#pragma pop
libs/JSystem/J2DGraph/J2DScreen.cpp
+22 -23
View File
@@ -52,36 +52,17 @@ struct JGeometry {
struct TBox2__template0 {};
};
struct J2DAnmTextureSRTKey {};
struct J2DAnmTexPattern {};
struct J2DAnmColor {};
struct J2DAnmTevRegKey {};
struct J2DMaterial {
/* 802EA1AC */ J2DMaterial();
/* 802EA2CC */ ~J2DMaterial();
/* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
/* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
/* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
/* 802EA89C */ void setAnimation(J2DAnmColor*);
/* 802EAC78 */ void animation();
};
struct J2DAnmVisibilityFull {};
struct J2DAnmVtxColor {};
struct J2DAnmTransform {};
struct J2DAnmBase {};
struct J2DGrafContext {};
struct J2DAnmTransform {};
struct J2DAnmVtxColor {};
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
/* 80053C00 */ void makeMatrix(f32, f32);
/* 802F7540 */ void makeMatrix(f32, f32, f32, f32);
/* 802F5F9C */ J2DPane(J2DPane*, JSURandomInputStream*, u8);
@@ -109,6 +90,24 @@ struct J2DPane {
/* 802F8478 */ void drawSelf(f32, f32);
};
struct J2DAnmTexPattern {};
struct J2DAnmTevRegKey {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
struct J2DMaterial {
/* 802EA1AC */ J2DMaterial();
/* 802EA2CC */ ~J2DMaterial();
/* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
/* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
/* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
/* 802EA89C */ void setAnimation(J2DAnmColor*);
/* 802EAC78 */ void animation();
};
struct J2DWindowEx {
/* 80300C94 */ J2DWindowEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
};
libs/JSystem/J2DGraph/J2DTevs.cpp
+12 -16
View File
@@ -102,7 +102,8 @@ extern "C" extern u32 j2dDefaultTevSwapModeTable;
extern "C" extern u32 j2dDefaultBlendInfo;
extern "C" extern u8 data_804561A4[4];
extern "C" extern u32 j2dDefaultColorChanInfo;
extern "C" extern u8 struct_804561AC[4];
extern "C" extern u16 data_804561AC;
extern "C" extern u16 j2dDefaultAlphaCmp;
//
// External References:
@@ -321,7 +322,7 @@ SECTION_RODATA extern u8 const j2dDefaultTexCoordInfo[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(803A1B80, &j2dDefaultTexCoordInfo);
COMPILER_STRIP_GATE(0x803A1B80, &j2dDefaultTexCoordInfo);
/* 803A1BA0-803A1BC4 02E200 0024+00 0/0 3/3 0/0 .rodata j2dDefaultTexMtxInfo */
SECTION_RODATA extern u8 const j2dDefaultTexMtxInfo[36] = {
@@ -329,27 +330,27 @@ SECTION_RODATA extern u8 const j2dDefaultTexMtxInfo[36] = {
0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1BA0, &j2dDefaultTexMtxInfo);
COMPILER_STRIP_GATE(0x803A1BA0, &j2dDefaultTexMtxInfo);
/* 803A1BC4-803A1BE0 02E224 001C+00 0/0 3/3 0/0 .rodata j2dDefaultIndTexMtxInfo */
SECTION_RODATA extern u8 const j2dDefaultIndTexMtxInfo[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(803A1BC4, &j2dDefaultIndTexMtxInfo);
COMPILER_STRIP_GATE(0x803A1BC4, &j2dDefaultIndTexMtxInfo);
/* 803A1BE0-803A1BF4 02E240 0014+00 0/0 1/1 0/0 .rodata j2dDefaultTevStageInfo */
SECTION_RODATA extern u8 const j2dDefaultTevStageInfo[20] = {
0x04, 0x0A, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
0x05, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1BE0, &j2dDefaultTevStageInfo);
COMPILER_STRIP_GATE(0x803A1BE0, &j2dDefaultTevStageInfo);
/* 803A1BF4-803A1C00 02E254 000C+00 0/0 7/7 0/0 .rodata j2dDefaultIndTevStageInfo */
SECTION_RODATA extern u8 const j2dDefaultIndTevStageInfo[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1BF4, &j2dDefaultIndTevStageInfo);
COMPILER_STRIP_GATE(0x803A1BF4, &j2dDefaultIndTevStageInfo);
/* 8045617C-80456180 00477C 0004+00 0/0 1/1 0/0 .sdata2 j2dDefaultColInfo */
SECTION_SDATA2 extern u32 j2dDefaultColInfo = 0xFFFFFFFF;
@@ -406,13 +407,8 @@ SECTION_SDATA2 extern u8 data_804561A4[4] = {
/* 804561A8-804561AC 0047A8 0004+00 0/0 3/3 0/0 .sdata2 j2dDefaultColorChanInfo */
SECTION_SDATA2 extern u32 j2dDefaultColorChanInfo = 0x00030000;
/* 804561AC-804561B0 -00001 0004+00 0/0 4/4 0/0 .sdata2 None */
SECTION_SDATA2 extern u8 struct_804561AC[4];
SECTION_SDATA2 u8 struct_804561AC[4] = {
/* 804561AC 0002+00 data_804561AC None */
0x1B,
0x00,
/* 804561AE 0002+00 data_804561AE j2dDefaultAlphaCmp */
0x00,
0xE7,
};
/* 804561AC-804561AE 0047AC 0002+00 0/0 1/1 0/0 .sdata2 None */
SECTION_SDATA2 extern u16 data_804561AC = 0x1B00;
/* 804561AE-804561B0 0047AE 0002+00 0/0 3/3 0/0 .sdata2 j2dDefaultAlphaCmp */
SECTION_SDATA2 extern u16 j2dDefaultAlphaCmp = 0x00E7;
libs/JSystem/J2DGraph/J2DTextBox.cpp
+21 -15
View File
@@ -55,22 +55,21 @@ struct J2DTextBoxHBinding {};
struct J2DAnmTexPattern {};
struct J2DAnmVtxColor {};
struct J2DAnmVisibilityFull {};
struct J2DAnmColor {};
struct J2DAnmTransform {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmTevRegKey {};
struct J2DAnmBase {};
struct J2DAnmColor {};
struct J2DAnmTevRegKey {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmTransform {};
struct J2DAnmVtxColor {};
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
/* 80053BC0 */ void calcMtx();
/* 80053C00 */ void makeMatrix(f32, f32);
/* 802F7540 */ void makeMatrix(f32, f32, f32, f32);
@@ -78,7 +77,6 @@ struct J2DPane {
/* 8025601C */ void setAnimation(J2DAnmVisibilityFull*);
/* 80256020 */ void setAnimation(J2DAnmTexPattern*);
/* 8018BF28 */ void setAnimation(J2DAnmTextureSRTKey*);
/* 802F7FC4 */ void setAnimation(J2DAnmTransform*);
/* 80126350 */ void setAnimation(J2DAnmTevRegKey*);
/* 80126354 */ void setAnimation(J2DAnmColor*);
/* 802F7EF4 */ void setAnimation(J2DAnmBase*);
@@ -424,6 +422,13 @@ asm void J2DTextBox::setFont(JUTFont* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 803A1C58-803A1C58 02E2B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803A1C58 = "%s";
#pragma pop
/* 803002E8-80300490 2FAC28 01A8+00 1/0 0/0 0/0 .text draw__10J2DTextBoxFff */
#pragma push
#pragma optimization_level 0
@@ -554,12 +559,13 @@ void J2DTextBox::rewriteAlpha() {
/* empty function */
}
/* 803A1C58-803A1C60 02E2B8 0004+04 1/1 0/0 0/0 .rodata @stringBase0 */
/* ############################################################################################## */
/* 803A1C5B-803A1C60 02E2BB 0001+04 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803A1C58 = "%s";
SECTION_DEAD static char const* const stringBase_803A1C5B = "";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803A1C5C = "\0\0\0";
#pragma pop
/* 803A1C58-803A1C58 02E2B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/J2DGraph/J2DTextBoxEx.cpp
+35 -38
View File
@@ -40,30 +40,20 @@ struct J2DTextBoxHBinding {};
struct J2DAnmTexPattern {};
struct J2DAnmVtxColor {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
struct J2DAnmTevRegKey {};
struct J2DMaterial {
/* 802EA38C */ void setGX();
/* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
/* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
/* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
/* 802EA89C */ void setAnimation(J2DAnmColor*);
};
struct J2DAnmVisibilityFull {
/* 8030C048 */ void getVisibility(u16, u8*) const;
};
struct J2DAnmTransform {};
struct J2DAnmBase {};
struct J2DAnmTevRegKey {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmVtxColor {};
struct J2DAnmTransform {};
struct J2DPane {
/* 80053BC0 */ void calcMtx();
/* 80053C00 */ void makeMatrix(f32, f32);
@@ -89,6 +79,16 @@ struct J2DPane {
struct J2DTevStage {};
struct J2DAnmColor {};
struct J2DMaterial {
/* 802EA38C */ void setGX();
/* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
/* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
/* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
/* 802EA89C */ void setAnimation(J2DAnmColor*);
};
struct J2DTextBoxEx {
struct stage_enum {};
@@ -359,6 +359,15 @@ asm void J2DTextBoxEx::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4])
}
#pragma pop
/* ############################################################################################## */
/* 803A1DF0-803A1DF0 02E450 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803A1DF0 = "%s";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803A1DF3 = "\0\0\0\0";
#pragma pop
/* 803078AC-80307AF0 3021EC 0244+00 1/0 0/0 0/0 .text draw__12J2DTextBoxExFff */
#pragma push
#pragma optimization_level 0
@@ -426,7 +435,7 @@ asm void J2DTextBoxEx::setTevStage(bool param_0) {
SECTION_RODATA static u8 const lit_1953[12] = {
0x0F, 0x08, 0x0A, 0x0F, 0x02, 0x04, 0x08, 0x0F, 0x0F, 0x0A, 0x00, 0x0F,
};
COMPILER_STRIP_GATE(803A1DB8, &lit_1953);
COMPILER_STRIP_GATE(0x803A1DB8, &lit_1953);
/* 803A1DC4-803A1DD0 02E424 000C+00 0/1 0/0 0/0 .rodata @1954 */
#pragma push
@@ -434,7 +443,7 @@ COMPILER_STRIP_GATE(803A1DB8, &lit_1953);
SECTION_RODATA static u8 const lit_1954[12] = {
0x07, 0x04, 0x05, 0x07, 0x01, 0x02, 0x04, 0x07, 0x07, 0x05, 0x00, 0x07,
};
COMPILER_STRIP_GATE(803A1DC4, &lit_1954);
COMPILER_STRIP_GATE(0x803A1DC4, &lit_1954);
#pragma pop
/* 803A1DD0-803A1DE0 02E430 000F+01 0/1 0/0 0/0 .rodata @1955 */
@@ -459,7 +468,7 @@ SECTION_RODATA static u8 const lit_1955[15 + 1 /* padding */] = {
/* padding */
0x00,
};
COMPILER_STRIP_GATE(803A1DD0, &lit_1955);
COMPILER_STRIP_GATE(0x803A1DD0, &lit_1955);
#pragma pop
/* 803A1DE0-803A1DF0 02E440 000F+01 0/1 0/0 0/0 .rodata @1956 */
@@ -484,7 +493,7 @@ SECTION_RODATA static u8 const lit_1956[15 + 1 /* padding */] = {
/* padding */
0x00,
};
COMPILER_STRIP_GATE(803A1DE0, &lit_1956);
COMPILER_STRIP_GATE(0x803A1DE0, &lit_1956);
#pragma pop
/* 80307F94-8030823C 3028D4 02A8+00 1/1 0/0 0/0 .text
@@ -658,16 +667,11 @@ asm void J2DTextBoxEx::setAnimation(J2DAnmTevRegKey* param_0) {
}
#pragma pop
/* 80308964-8030896C 3032A4 0008+00 1/0 0/0 0/0 .text
/* 80308964-8030896C -00001 0008+00 0/0 0/0 0/0 .text
* setAnimation__12J2DTextBoxExFP20J2DAnmVisibilityFull */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTextBoxEx::setAnimation(J2DAnmVisibilityFull* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP20J2DAnmVisibilityFull.s"
void J2DTextBoxEx::setAnimation(J2DAnmVisibilityFull* param_0) {
*(u32*)(((u8*)this) + 324) /* this->field_0x144 */ = (u32)(param_0);
}
#pragma pop
/* 8030896C-803089EC 3032AC 0080+00 1/0 0/0 0/0 .text
* animationPane__12J2DTextBoxExFPC15J2DAnmTransform */
@@ -718,11 +722,4 @@ asm void J2DTextBoxEx::setAnimation(J2DAnmBase* param_0) {
}
#pragma pop
/* 803A1DF0-803A1DF8 02E450 0003+05 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803A1DF0 = "%s";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803A1DF3 = "\0\0\0\0";
#pragma pop
/* 803A1DF0-803A1DF0 02E450 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/J2DGraph/J2DWindow.cpp
+14 -16
View File
@@ -59,22 +59,21 @@ struct JGeometry {
struct J2DAnmTexPattern {};
struct J2DAnmVtxColor {};
struct J2DAnmVisibilityFull {};
struct J2DAnmColor {};
struct J2DAnmTransform {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmTevRegKey {};
struct J2DAnmBase {};
struct J2DAnmColor {};
struct J2DAnmTevRegKey {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmTransform {};
struct J2DAnmVtxColor {};
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
/* 80053BC0 */ void calcMtx();
/* 80053C00 */ void makeMatrix(f32, f32);
/* 802F7540 */ void makeMatrix(f32, f32, f32, f32);
@@ -82,7 +81,6 @@ struct J2DPane {
/* 8025601C */ void setAnimation(J2DAnmVisibilityFull*);
/* 80256020 */ void setAnimation(J2DAnmTexPattern*);
/* 8018BF28 */ void setAnimation(J2DAnmTextureSRTKey*);
/* 802F7FC4 */ void setAnimation(J2DAnmTransform*);
/* 80126350 */ void setAnimation(J2DAnmTevRegKey*);
/* 80126354 */ void setAnimation(J2DAnmColor*);
/* 802F7EF4 */ void setAnimation(J2DAnmBase*);
@@ -361,13 +359,13 @@ asm J2DWindow::J2DWindow(J2DPane* param_0, JSURandomInputStream* param_1, JKRArc
SECTION_RODATA static u8 const lit_1831[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1C10, &lit_1831);
COMPILER_STRIP_GATE(0x803A1C10, &lit_1831);
/* 803A1C20-803A1C30 02E280 0010+00 1/1 0/0 0/0 .rodata @1849 */
SECTION_RODATA static u8 const lit_1849[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1C20, &lit_1849);
COMPILER_STRIP_GATE(0x803A1C20, &lit_1849);
/* 80456240-80456248 004840 0008+00 7/7 0/0 0/0 .sdata2 @1971 */
SECTION_SDATA2 static f64 lit_1971 = 4503601774854144.0 /* cast s32 to float */;
@@ -578,7 +576,7 @@ asm void J2DWindow::setTevMode(JUTTexture* param_0, JUtility::TColor param_1,
SECTION_RODATA static u8 const lit_3028[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1C30, &lit_3028);
COMPILER_STRIP_GATE(0x803A1C30, &lit_3028);
/* 802FBE60-802FBEDC 2F67A0 007C+00 1/0 0/0 0/0 .text getFrameTexture__9J2DWindowCFUcUc
*/
@@ -620,7 +618,7 @@ SECTION_RODATA static u8 const lit_3037[20 + 4 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(803A1C40, &lit_3037);
COMPILER_STRIP_GATE(0x803A1C40, &lit_3037);
/* 802FBEDC-802FBF98 2F681C 00BC+00 1/0 0/0 0/0 .text isUsed__9J2DWindowFPC7ResTIMG */
#pragma push
libs/JSystem/J2DGraph/J2DWindowEx.cpp
+45 -50
View File
@@ -43,42 +43,24 @@ struct JGeometry {
struct J2DAnmTexPattern {};
struct J2DAnmVtxColor {
/* 8030363C */ void getColor(u8, u16, _GXColor*) const;
};
struct J2DWindow {
struct TMaterial {};
/* 802F9A7C */ J2DWindow();
/* 802FA880 */ ~J2DWindow();
/* 802FB000 */ void resize(f32, f32);
/* 802FB1D8 */ void drawSelf(f32, f32);
/* 802FBF98 */ s32 getTypeID() const;
};
struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
struct J2DAnmTevRegKey {};
struct J2DMaterial {
/* 802EA38C */ void setGX();
/* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
/* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
/* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
/* 802EA89C */ void setAnimation(J2DAnmColor*);
};
struct J2DAnmVisibilityFull {
/* 8030C048 */ void getVisibility(u16, u8*) const;
};
struct J2DAnmTransform {};
struct J2DAnmColor {};
struct J2DAnmBase {};
struct J2DAnmTevRegKey {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmVtxColor {
/* 8030363C */ void getColor(u8, u16, _GXColor*) const;
};
struct J2DAnmTransform {};
struct J2DPane {
/* 80053BC0 */ void calcMtx();
/* 80053C00 */ void makeMatrix(f32, f32);
@@ -107,6 +89,24 @@ struct J2DPane {
struct J2DTevStage {};
struct J2DMaterial {
/* 802EA38C */ void setGX();
/* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
/* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
/* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
/* 802EA89C */ void setAnimation(J2DAnmColor*);
};
struct J2DWindow {
struct TMaterial {};
/* 802F9A7C */ J2DWindow();
/* 802FA880 */ ~J2DWindow();
/* 802FB000 */ void resize(f32, f32);
/* 802FB1D8 */ void drawSelf(f32, f32);
/* 802FBF98 */ s32 getTypeID() const;
};
struct J2DWindowEx {
struct stage_enum {};
@@ -280,7 +280,7 @@ extern "C" void _restgpr_29();
SECTION_RODATA static u8 const lit_1508[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1C60, &lit_1508);
COMPILER_STRIP_GATE(0x803A1C60, &lit_1508);
/* 803CD3E8-803CD4B8 02A508 00CC+04 2/2 0/0 0/0 .data __vt__11J2DWindowEx */
SECTION_DATA extern void* __vt__11J2DWindowEx[51 + 1 /* padding */] = {
@@ -686,16 +686,11 @@ asm void J2DWindowEx::isNeedSetAnm(u8 param_0) {
}
#pragma pop
/* 80303274-8030327C 2FDBB4 0008+00 1/0 0/0 0/0 .text
/* 80303274-8030327C -00001 0008+00 0/0 0/0 0/0 .text
* setAnimation__11J2DWindowExFP20J2DAnmVisibilityFull */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DWindowEx::setAnimation(J2DAnmVisibilityFull* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP20J2DAnmVisibilityFull.s"
void J2DWindowEx::setAnimation(J2DAnmVisibilityFull* param_0) {
*(u32*)(((u8*)this) + 372) /* this->field_0x174 */ = (u32)(param_0);
}
#pragma pop
/* 8030327C-80303370 2FDBBC 00F4+00 1/0 0/0 0/0 .text
* setAnimation__11J2DWindowExFP14J2DAnmVtxColor */
@@ -715,7 +710,7 @@ asm void J2DWindowEx::setAnimation(J2DAnmVtxColor* param_0) {
SECTION_RODATA static u8 const lit_1557[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1C70, &lit_1557);
COMPILER_STRIP_GATE(0x803A1C70, &lit_1557);
#pragma pop
/* 803A1C80-803A1C90 02E2E0 0010+00 0/0 0/0 0/0 .rodata @1566 */
@@ -724,7 +719,7 @@ COMPILER_STRIP_GATE(803A1C70, &lit_1557);
SECTION_RODATA static u8 const lit_1566[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1C80, &lit_1566);
COMPILER_STRIP_GATE(0x803A1C80, &lit_1566);
#pragma pop
/* 803A1C90-803A1CA0 02E2F0 0010+00 0/0 0/0 0/0 .rodata @1575 */
@@ -733,7 +728,7 @@ COMPILER_STRIP_GATE(803A1C80, &lit_1566);
SECTION_RODATA static u8 const lit_1575[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1C90, &lit_1575);
COMPILER_STRIP_GATE(0x803A1C90, &lit_1575);
#pragma pop
/* 803A1CA0-803A1CB0 02E300 0010+00 0/0 0/0 0/0 .rodata @1581 */
@@ -742,7 +737,7 @@ COMPILER_STRIP_GATE(803A1C90, &lit_1575);
SECTION_RODATA static u8 const lit_1581[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1CA0, &lit_1581);
COMPILER_STRIP_GATE(0x803A1CA0, &lit_1581);
#pragma pop
/* 803A1CB0-803A1CC0 02E310 0010+00 0/0 0/0 0/0 .rodata @1587 */
@@ -751,7 +746,7 @@ COMPILER_STRIP_GATE(803A1CA0, &lit_1581);
SECTION_RODATA static u8 const lit_1587[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1CB0, &lit_1587);
COMPILER_STRIP_GATE(0x803A1CB0, &lit_1587);
#pragma pop
/* 803A1CC0-803A1CD0 02E320 0010+00 0/0 0/0 0/0 .rodata @1596 */
@@ -760,7 +755,7 @@ COMPILER_STRIP_GATE(803A1CB0, &lit_1587);
SECTION_RODATA static u8 const lit_1596[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1CC0, &lit_1596);
COMPILER_STRIP_GATE(0x803A1CC0, &lit_1596);
#pragma pop
/* 803A1CD0-803A1CE0 02E330 0010+00 0/0 0/0 0/0 .rodata @1605 */
@@ -769,7 +764,7 @@ COMPILER_STRIP_GATE(803A1CC0, &lit_1596);
SECTION_RODATA static u8 const lit_1605[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1CD0, &lit_1605);
COMPILER_STRIP_GATE(0x803A1CD0, &lit_1605);
#pragma pop
/* 803A1CE0-803A1CF0 02E340 0010+00 0/0 0/0 0/0 .rodata @1612 */
@@ -778,7 +773,7 @@ COMPILER_STRIP_GATE(803A1CD0, &lit_1605);
SECTION_RODATA static u8 const lit_1612[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1CE0, &lit_1612);
COMPILER_STRIP_GATE(0x803A1CE0, &lit_1612);
#pragma pop
/* 803A1CF0-803A1D08 02E350 0018+00 0/0 0/0 0/0 .rodata @2530 */
@@ -788,7 +783,7 @@ SECTION_RODATA static u8 const lit_2530[24] = {
0x0F, 0x08, 0x0A, 0x0F, 0x0F, 0x08, 0x0A, 0x0F, 0x0F, 0x0A, 0x00, 0x0F,
0x02, 0x04, 0x08, 0x0F, 0x02, 0x04, 0x08, 0x0F, 0x0F, 0x0F, 0x0F, 0x0A,
};
COMPILER_STRIP_GATE(803A1CF0, &lit_2530);
COMPILER_STRIP_GATE(0x803A1CF0, &lit_2530);
#pragma pop
/* 803A1D08-803A1D20 02E368 0018+00 0/0 0/0 0/0 .rodata @2531 */
@@ -798,7 +793,7 @@ SECTION_RODATA static u8 const lit_2531[24] = {
0x07, 0x04, 0x05, 0x07, 0x05, 0x07, 0x07, 0x07, 0x07, 0x05, 0x00, 0x07,
0x01, 0x02, 0x04, 0x07, 0x07, 0x07, 0x07, 0x02, 0x07, 0x07, 0x07, 0x05,
};
COMPILER_STRIP_GATE(803A1D08, &lit_2531);
COMPILER_STRIP_GATE(0x803A1D08, &lit_2531);
#pragma pop
/* 803A1D20-803A1D40 02E380 001E+02 0/0 0/0 0/0 .rodata @2532 */
@@ -839,14 +834,14 @@ SECTION_RODATA static u8 const lit_2532[30 + 2 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(803A1D20, &lit_2532);
COMPILER_STRIP_GATE(0x803A1D20, &lit_2532);
#pragma pop
/* 803A1D40-803A1D50 02E3A0 0010+00 1/1 0/0 0/0 .rodata @3089 */
SECTION_RODATA static u8 const lit_3089[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A1D40, &lit_3089);
COMPILER_STRIP_GATE(0x803A1D40, &lit_3089);
/* 80303370-80303510 2FDCB0 01A0+00 1/0 0/0 0/0 .text
* animationPane__11J2DWindowExFPC15J2DAnmTransform */
libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp
+6 -4
View File
@@ -183,8 +183,8 @@ extern "C" void getTevColorReg__15J3DAnmTevRegKeyCFUsP11_GXColorS10();
extern "C" void getTevKonstReg__15J3DAnmTevRegKeyCFUsP8_GXColor();
extern "C" void searchUpdateMaterialID__15J3DAnmTevRegKeyFP16J3DMaterialTable();
extern "C" void searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData();
extern "C" void func_8032B8A0(f32, J3DAnmKeyTableBase*, s16*);
extern "C" void func_8032BAD4(f32, J3DAnmKeyTableBase*, f32*);
extern "C" void func_8032B8A0(void* _this, f32, J3DAnmKeyTableBase*, s16*);
extern "C" void func_8032BAD4(void* _this, f32, J3DAnmKeyTableBase*, f32*);
extern "C" void __dt__14J3DAnmVtxColorFv();
extern "C" void __dt__11J3DAnmColorFv();
extern "C" void __dt__16J3DAnmTexPatternFv();
@@ -753,7 +753,8 @@ asm void J3DAnmTevRegKey::searchUpdateMaterialID(J3DModelData* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8032B8A0(f32 param_0, J3DAnmKeyTableBase* param_1, s16* param_2) {
extern "C" asm void func_8032B8A0(void* _this, f32 param_0, J3DAnmKeyTableBase* param_1,
s16* param_2) {
nofralloc
#include "asm/JSystem/J3DGraphAnimator/J3DAnimation/func_8032B8A0.s"
}
@@ -764,7 +765,8 @@ extern "C" asm void func_8032B8A0(f32 param_0, J3DAnmKeyTableBase* param_1, s16*
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8032BAD4(f32 param_0, J3DAnmKeyTableBase* param_1, f32* param_2) {
extern "C" asm void func_8032BAD4(void* _this, f32 param_0, J3DAnmKeyTableBase* param_1,
f32* param_2) {
nofralloc
#include "asm/JSystem/J3DGraphAnimator/J3DAnimation/func_8032BAD4.s"
}
libs/JSystem/J3DGraphAnimator/J3DCluster.cpp
+4 -4
View File
@@ -19,6 +19,10 @@ struct J3DVertexBuffer {};
struct J3DModel {};
struct J3DCluster {};
struct J3DClusterKey {};
struct J3DAnmCluster {};
struct J3DDeformData {
@@ -29,10 +33,6 @@ struct J3DDeformData {
/* 8032E364 */ void setAnm(J3DAnmCluster*);
};
struct J3DCluster {};
struct J3DClusterKey {};
struct J3DDeformer {
/* 8032E39C */ J3DDeformer(J3DDeformData*);
/* 8032EAB4 */ void deform(J3DVertexBuffer*, u16, f32*);
libs/JSystem/J3DGraphAnimator/J3DJoint.cpp
+4 -4
View File
@@ -108,7 +108,7 @@ extern "C" u8 entryNum__13J3DDrawBuffer[4 + 4 /* padding */];
SECTION_RODATA static u8 const lit_882[12] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A2068, &lit_882);
COMPILER_STRIP_GATE(0x803A2068, &lit_882);
/* 8032EC28-8032ECAC 329568 0084+00 0/0 1/1 0/0 .text
* init__25J3DMtxCalcJ3DSysInitBasicFRC3VecRA3_A4_Cf */
@@ -126,7 +126,7 @@ asm void J3DMtxCalcJ3DSysInitBasic::init(Vec const& param_0, f32 const (&param_1
SECTION_RODATA static u8 const lit_893[12] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A2074, &lit_893);
COMPILER_STRIP_GATE(0x803A2074, &lit_893);
/* 8032ECAC-8032ED30 3295EC 0084+00 0/0 2/2 2/2 .text
* init__24J3DMtxCalcJ3DSysInitMayaFRC3VecRA3_A4_Cf */
@@ -198,13 +198,13 @@ asm void J3DJoint::appendChild(J3DJoint* param_0) {
SECTION_RODATA static u8 const lit_1257[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A2080, &lit_1257);
COMPILER_STRIP_GATE(0x803A2080, &lit_1257);
/* 803A208C-803A2098 02E6EC 000C+00 1/1 0/0 0/0 .rodata @1259 */
SECTION_RODATA static u8 const lit_1259[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803A208C, &lit_1259);
COMPILER_STRIP_GATE(0x803A208C, &lit_1259);
/* 804564A4-804564A8 004AA4 0004+00 1/1 0/0 0/0 .sdata2 @1220 */
SECTION_SDATA2 static u8 lit_1220[4] = {
libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp
+2 -2
View File
@@ -25,10 +25,10 @@ struct J3DTevKColorAnm {};
struct J3DTevColorAnm {};
struct J3DMatColorAnm {};
struct J3DMaterial {};
struct J3DMatColorAnm {};
struct J3DMaterialAnm {
/* 800A4820 */ ~J3DMaterialAnm();
/* 8032C320 */ void initialize();
libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp
+2 -2
View File
@@ -25,12 +25,12 @@ struct J3DTevColorAnm {};
struct J3DAnmTextureSRTKey {};
struct J3DAnmTexPattern {};
struct J3DAnmTevRegKey {};
struct J3DAnmColor {};
struct J3DAnmTexPattern {};
struct J3DMaterialTable {
/* 8032F5A8 */ void clear();
/* 8032F5D0 */ J3DMaterialTable();
libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp
+13 -12
View File
@@ -228,7 +228,17 @@ asm void J3DSkinDeform::initSkinInfo(J3DModelData* param_0) {
SECTION_RODATA static u8 const lit_1142[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02,
};
COMPILER_STRIP_GATE(803A2008, &lit_1142);
COMPILER_STRIP_GATE(0x803A2008, &lit_1142);
/* 803A2028-803A2028 02E688 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803A2028 =
" Invlid Data : CPU Pipeline process GX_INDEX16 D"
"ata Only\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803A2062 = "\0\0\0\0\0";
#pragma pop
/* 80439218-80439A20 065F38 0800+08 1/1 0/0 0/0 .bss sWorkArea_MtxReg__13J3DSkinDeform
*/
@@ -250,7 +260,7 @@ asm void J3DSkinDeform::initMtxIndexArray(J3DModelData* param_0) {
SECTION_RODATA static u8 const lit_1270[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02,
};
COMPILER_STRIP_GATE(803A2018, &lit_1270);
COMPILER_STRIP_GATE(0x803A2018, &lit_1270);
/* 8032D378-8032D5C4 327CB8 024C+00 0/0 1/1 0/0 .text
* changeFastSkinDL__13J3DSkinDeformFP12J3DModelData */
@@ -416,13 +426,4 @@ asm J3DSkinDeform::~J3DSkinDeform() {
}
#pragma pop
/* 803A2028-803A2068 02E688 003A+06 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803A2028 =
" Invlid Data : CPU Pipeline process GX_INDEX16 D"
"ata Only\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803A2062 = "\0\0\0\0\0";
#pragma pop
/* 803A2028-803A2028 02E688 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
+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
/* ############################################################################################## */
libs/JSystem/J3DGraphBase/J3DMatBlock.cpp
+88 -211
View File
@@ -452,12 +452,12 @@ struct J3DPEBlockOpa {
/* 80323334 */ ~J3DPEBlockOpa();
};
struct J3DAlphaComp {};
struct J3DBlend {};
struct J3DFog {};
struct J3DAlphaComp {};
struct J3DPEBlock {
/* 8000DBCC */ void patch();
/* 8000DF3C */ bool getZCompLoc() const;
@@ -2486,6 +2486,15 @@ asm void J3DColorBlockLightOn::reset(J3DColorBlock* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 803A1EA8-803A1EA8 02E508 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803A1EA8 = "Error : TexMtx[%d] is Null.\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803A1EC5 = "\0\0";
#pragma pop
/* 80320084-803201A0 31A9C4 011C+00 1/0 0/0 0/0 .text
* reset__21J3DTexGenBlockPatchedFP14J3DTexGenBlock */
#pragma push
@@ -2878,15 +2887,10 @@ asm void J3DPEBlockFull::getZMode() {
}
#pragma pop
/* 80321A28-80321A30 31C368 0008+00 1/0 0/0 0/0 .text setZCompLoc__14J3DPEBlockFullFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DPEBlockFull::setZCompLoc(u8 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__14J3DPEBlockFullFUc.s"
/* 80321A28-80321A30 -00001 0008+00 0/0 0/0 0/0 .text setZCompLoc__14J3DPEBlockFullFUc */
void J3DPEBlockFull::setZCompLoc(u8 param_0) {
*(u8*)(((u8*)this) + 58) /* this->field_0x3a */ = (u8)(param_0);
}
#pragma pop
/* 80321A30-80321A3C 31C370 000C+00 1/0 0/0 0/0 .text setZCompLoc__14J3DPEBlockFullFPCUc
*/
@@ -2909,15 +2913,10 @@ asm void J3DPEBlockFull::getZCompLoc() const {
}
#pragma pop
/* 80321A44-80321A4C 31C384 0008+00 1/0 0/0 0/0 .text setDither__14J3DPEBlockFullFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DPEBlockFull::setDither(u8 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__14J3DPEBlockFullFUc.s"
/* 80321A44-80321A4C -00001 0008+00 0/0 0/0 0/0 .text setDither__14J3DPEBlockFullFUc */
void J3DPEBlockFull::setDither(u8 param_0) {
*(u8*)(((u8*)this) + 59) /* this->field_0x3b */ = (u8)(param_0);
}
#pragma pop
/* 80321A4C-80321A58 31C38C 000C+00 1/0 0/0 0/0 .text setDither__14J3DPEBlockFullFPCUc */
#pragma push
@@ -2950,16 +2949,11 @@ asm void J3DPEBlockFull::getFogOffset() const {
}
#pragma pop
/* 80321A68-80321A70 31C3A8 0008+00 1/0 0/0 0/0 .text setFogOffset__14J3DPEBlockFullFUl
/* 80321A68-80321A70 -00001 0008+00 0/0 0/0 0/0 .text setFogOffset__14J3DPEBlockFullFUl
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DPEBlockFull::setFogOffset(u32 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setFogOffset__14J3DPEBlockFullFUl.s"
void J3DPEBlockFull::setFogOffset(u32 param_0) {
*(u32*)(((u8*)this) + 60) /* this->field_0x3c */ = (u32)(param_0);
}
#pragma pop
/* ############################################################################################## */
/* 803CDFF0-803CE06C 02B110 007C+00 1/1 1/1 0/0 .data __vt__14J3DPEBlockFull */
@@ -3120,16 +3114,11 @@ asm void J3DPEBlockFogOff::getZMode() {
}
#pragma pop
/* 80321B8C-80321B94 31C4CC 0008+00 1/0 0/0 0/0 .text setZCompLoc__16J3DPEBlockFogOffFUc
/* 80321B8C-80321B94 -00001 0008+00 0/0 0/0 0/0 .text setZCompLoc__16J3DPEBlockFogOffFUc
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DPEBlockFogOff::setZCompLoc(u8 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__16J3DPEBlockFogOffFUc.s"
void J3DPEBlockFogOff::setZCompLoc(u8 param_0) {
*(u8*)(((u8*)this) + 14) /* this->field_0xe */ = (u8)(param_0);
}
#pragma pop
/* 80321B94-80321BA0 31C4D4 000C+00 1/0 0/0 0/0 .text setZCompLoc__16J3DPEBlockFogOffFPCUc */
#pragma push
@@ -3152,15 +3141,10 @@ asm void J3DPEBlockFogOff::getZCompLoc() const {
}
#pragma pop
/* 80321BA8-80321BB0 31C4E8 0008+00 1/0 0/0 0/0 .text setDither__16J3DPEBlockFogOffFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DPEBlockFogOff::setDither(u8 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__16J3DPEBlockFogOffFUc.s"
/* 80321BA8-80321BB0 -00001 0008+00 0/0 0/0 0/0 .text setDither__16J3DPEBlockFogOffFUc */
void J3DPEBlockFogOff::setDither(u8 param_0) {
*(u8*)(((u8*)this) + 15) /* this->field_0xf */ = (u8)(param_0);
}
#pragma pop
/* 80321BB0-80321BBC 31C4F0 000C+00 1/0 0/0 0/0 .text setDither__16J3DPEBlockFogOffFPCUc
*/
@@ -3437,16 +3421,11 @@ asm void J3DTevBlock16::getTevKAlphaSel(u32 param_0) {
}
#pragma pop
/* 80321DE8-80321DF0 31C728 0008+00 1/0 0/0 0/0 .text setTevStageNum__13J3DTevBlock16FUc
/* 80321DE8-80321DF0 -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__13J3DTevBlock16FUc
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DTevBlock16::setTevStageNum(u8 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__13J3DTevBlock16FUc.s"
void J3DTevBlock16::setTevStageNum(u8 param_0) {
*(u8*)(((u8*)this) + 88) /* this->field_0x58 */ = (u8)(param_0);
}
#pragma pop
/* 80321DF0-80321DFC 31C730 000C+00 1/0 0/0 0/0 .text setTevStageNum__13J3DTevBlock16FPCUc */
#pragma push
@@ -3610,16 +3589,11 @@ asm void J3DTevBlock16::getTevRegOffset() const {
}
#pragma pop
/* 80321F7C-80321F84 31C8BC 0008+00 1/0 0/0 0/0 .text setTevRegOffset__13J3DTevBlock16FUl
/* 80321F7C-80321F84 -00001 0008+00 0/0 0/0 0/0 .text setTevRegOffset__13J3DTevBlock16FUl
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DTevBlock16::setTevRegOffset(u32 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__13J3DTevBlock16FUl.s"
void J3DTevBlock16::setTevRegOffset(u32 param_0) {
*(u32*)(((u8*)this) + 368) /* this->field_0x170 */ = (u32)(param_0);
}
#pragma pop
/* ############################################################################################## */
/* 803CE0E8-803CE1C4 02B208 00DC+00 1/1 1/1 0/0 .data __vt__13J3DTevBlock16 */
@@ -4287,15 +4261,10 @@ asm J3DTevBlock16::~J3DTevBlock16() {
}
#pragma pop
/* 80321FE0-80321FE8 31C920 0008+00 6/0 1/0 0/0 .text setTexNoOffset__11J3DTevBlockFUl */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DTevBlock::setTexNoOffset(u32 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTexNoOffset__11J3DTevBlockFUl.s"
/* 80321FE0-80321FE8 -00001 0008+00 0/0 0/0 0/0 .text setTexNoOffset__11J3DTevBlockFUl */
void J3DTevBlock::setTexNoOffset(u32 param_0) {
*(u32*)(((u8*)this) + 4) /* this->field_0x4 */ = (u32)(param_0);
}
#pragma pop
/* 80321FE8-80321FEC 31C928 0004+00 1/0 0/0 0/0 .text ptrToIndex__12J3DTevBlock4Fv */
void J3DTevBlock4::ptrToIndex() {
@@ -4510,16 +4479,11 @@ asm void J3DTevBlock4::getTevKAlphaSel(u32 param_0) {
}
#pragma pop
/* 803221B4-803221BC 31CAF4 0008+00 1/0 0/0 0/0 .text setTevStageNum__12J3DTevBlock4FUc
/* 803221B4-803221BC -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__12J3DTevBlock4FUc
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DTevBlock4::setTevStageNum(u8 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__12J3DTevBlock4FUc.s"
void J3DTevBlock4::setTevStageNum(u8 param_0) {
*(u8*)(((u8*)this) + 32) /* this->field_0x20 */ = (u8)(param_0);
}
#pragma pop
/* 803221BC-803221C8 31CAFC 000C+00 1/0 0/0 0/0 .text setTevStageNum__12J3DTevBlock4FPCUc
*/
@@ -4684,16 +4648,11 @@ asm void J3DTevBlock4::getTevRegOffset() const {
}
#pragma pop
/* 80322348-80322350 31CC88 0008+00 1/0 0/0 0/0 .text setTevRegOffset__12J3DTevBlock4FUl
/* 80322348-80322350 -00001 0008+00 0/0 0/0 0/0 .text setTevRegOffset__12J3DTevBlock4FUl
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DTevBlock4::setTevRegOffset(u32 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__12J3DTevBlock4FUl.s"
void J3DTevBlock4::setTevRegOffset(u32 param_0) {
*(u32*)(((u8*)this) + 144) /* this->field_0x90 */ = (u32)(param_0);
}
#pragma pop
/* 80322350-803223AC 31CC90 005C+00 1/0 0/0 0/0 .text __dt__12J3DTevBlock4Fv */
#pragma push
@@ -4918,16 +4877,11 @@ asm void J3DTevBlock2::getTevKAlphaSel(u32 param_0) {
}
#pragma pop
/* 80322578-80322580 31CEB8 0008+00 1/0 0/0 0/0 .text setTevStageNum__12J3DTevBlock2FUc
/* 80322578-80322580 -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__12J3DTevBlock2FUc
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DTevBlock2::setTevStageNum(u8 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__12J3DTevBlock2FUc.s"
void J3DTevBlock2::setTevStageNum(u8 param_0) {
*(u8*)(((u8*)this) + 52) /* this->field_0x34 */ = (u8)(param_0);
}
#pragma pop
/* 80322580-8032258C 31CEC0 000C+00 1/0 0/0 0/0 .text setTevStageNum__12J3DTevBlock2FPCUc
*/
@@ -5092,16 +5046,11 @@ asm void J3DTevBlock2::getTevRegOffset() const {
}
#pragma pop
/* 8032270C-80322714 31D04C 0008+00 1/0 0/0 0/0 .text setTevRegOffset__12J3DTevBlock2FUl
/* 8032270C-80322714 -00001 0008+00 0/0 0/0 0/0 .text setTevRegOffset__12J3DTevBlock2FUl
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DTevBlock2::setTevRegOffset(u32 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__12J3DTevBlock2FUl.s"
void J3DTevBlock2::setTevRegOffset(u32 param_0) {
*(u32*)(((u8*)this) + 104) /* this->field_0x68 */ = (u32)(param_0);
}
#pragma pop
/* 80322714-80322770 31D054 005C+00 1/0 0/0 0/0 .text __dt__12J3DTevBlock2Fv */
#pragma push
@@ -5370,15 +5319,10 @@ asm void J3DTevBlockPatched::getType() {
}
#pragma pop
/* 803229A4-803229AC 31D2E4 0008+00 1/0 0/0 0/0 .text setTevStageNum__18J3DTevBlockPatchedFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DTevBlockPatched::setTevStageNum(u8 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__18J3DTevBlockPatchedFUc.s"
/* 803229A4-803229AC -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__18J3DTevBlockPatchedFUc */
void J3DTevBlockPatched::setTevStageNum(u8 param_0) {
*(u8*)(((u8*)this) + 208) /* this->field_0xd0 */ = (u8)(param_0);
}
#pragma pop
/* 803229AC-803229B8 31D2EC 000C+00 1/0 0/0 0/0 .text setTevStageNum__18J3DTevBlockPatchedFPCUc */
#pragma push
@@ -5644,15 +5588,10 @@ asm void J3DTevBlockPatched::getTevRegOffset() const {
}
#pragma pop
/* 80322C08-80322C10 31D548 0008+00 1/0 0/0 0/0 .text setTevRegOffset__18J3DTevBlockPatchedFUl */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DTevBlockPatched::setTevRegOffset(u32 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__18J3DTevBlockPatchedFUl.s"
/* 80322C08-80322C10 -00001 0008+00 0/0 0/0 0/0 .text setTevRegOffset__18J3DTevBlockPatchedFUl */
void J3DTevBlockPatched::setTevRegOffset(u32 param_0) {
*(u32*)(((u8*)this) + 212) /* this->field_0xd4 */ = (u32)(param_0);
}
#pragma pop
/* 80322C10-80322C6C 31D550 005C+00 1/0 0/0 0/0 .text __dt__18J3DTevBlockPatchedFv */
#pragma push
@@ -5716,15 +5655,10 @@ asm J3DTexGenBlockBasic::~J3DTexGenBlockBasic() {
}
#pragma pop
/* 80322D34-80322D3C 31D674 0008+00 3/0 0/0 0/0 .text setTexGenNum__21J3DTexGenBlockPatchedFUl */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DTexGenBlockPatched::setTexGenNum(u32 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTexGenNum__21J3DTexGenBlockPatchedFUl.s"
/* 80322D34-80322D3C -00001 0008+00 0/0 0/0 0/0 .text setTexGenNum__21J3DTexGenBlockPatchedFUl */
void J3DTexGenBlockPatched::setTexGenNum(u32 param_0) {
*(u32*)(((u8*)this) + 4) /* this->field_0x4 */ = (u32)(param_0);
}
#pragma pop
/* 80322D3C-80322D48 31D67C 000C+00 3/0 0/0 0/0 .text setTexGenNum__21J3DTexGenBlockPatchedFPCUl
*/
@@ -5800,16 +5734,11 @@ asm void J3DTexGenBlockPatched::getTexMtxOffset() const {
}
#pragma pop
/* 80322DA0-80322DA8 31D6E0 0008+00 3/0 0/0 0/0 .text setTexMtxOffset__21J3DTexGenBlockPatchedFUl
/* 80322DA0-80322DA8 -00001 0008+00 0/0 0/0 0/0 .text setTexMtxOffset__21J3DTexGenBlockPatchedFUl
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DTexGenBlockPatched::setTexMtxOffset(u32 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTexMtxOffset__21J3DTexGenBlockPatchedFUl.s"
void J3DTexGenBlockPatched::setTexMtxOffset(u32 param_0) {
*(u32*)(((u8*)this) + 88) /* this->field_0x58 */ = (u32)(param_0);
}
#pragma pop
/* 80322DA8-80322DB4 31D6E8 000C+00 1/0 0/0 0/0 .text getType__15J3DTexGenBlock4Fv */
#pragma push
@@ -5965,16 +5894,11 @@ asm void J3DColorBlockLightOn::setColorChanNum(u8 const* param_0) {
}
#pragma pop
/* 80322F70-80322F78 31D8B0 0008+00 1/0 0/0 0/0 .text setColorChanNum__20J3DColorBlockLightOnFUc
/* 80322F70-80322F78 -00001 0008+00 0/0 0/0 0/0 .text setColorChanNum__20J3DColorBlockLightOnFUc
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DColorBlockLightOn::setColorChanNum(u8 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__20J3DColorBlockLightOnFUc.s"
void J3DColorBlockLightOn::setColorChanNum(u8 param_0) {
*(u8*)(((u8*)this) + 20) /* this->field_0x14 */ = (u8)(param_0);
}
#pragma pop
/* 80322F78-80322F80 31D8B8 0008+00 1/0 0/0 0/0 .text getColorChanNum__20J3DColorBlockLightOnCFv
*/
@@ -6041,15 +5965,10 @@ asm void J3DColorBlockLightOn::getLight(u32 param_0) {
}
#pragma pop
/* 80322FDC-80322FE4 31D91C 0008+00 1/0 0/0 0/0 .text setCullMode__20J3DColorBlockLightOnFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DColorBlockLightOn::setCullMode(u8 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__20J3DColorBlockLightOnFUc.s"
/* 80322FDC-80322FE4 -00001 0008+00 0/0 0/0 0/0 .text setCullMode__20J3DColorBlockLightOnFUc */
void J3DColorBlockLightOn::setCullMode(u8 param_0) {
*(u8*)(((u8*)this) + 64) /* this->field_0x40 */ = (u8)(param_0);
}
#pragma pop
/* 80322FE4-80322FF0 31D924 000C+00 1/0 0/0 0/0 .text setCullMode__20J3DColorBlockLightOnFPCUc */
#pragma push
@@ -6093,27 +6012,17 @@ asm void J3DColorBlockLightOn::getColorChanOffset() const {
}
#pragma pop
/* 80323008-80323010 31D948 0008+00 1/0 0/0 0/0 .text setMatColorOffset__20J3DColorBlockLightOnFUl
/* 80323008-80323010 -00001 0008+00 0/0 0/0 0/0 .text setMatColorOffset__20J3DColorBlockLightOnFUl
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DColorBlockLightOn::setMatColorOffset(u32 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColorOffset__20J3DColorBlockLightOnFUl.s"
void J3DColorBlockLightOn::setMatColorOffset(u32 param_0) {
*(u32*)(((u8*)this) + 68) /* this->field_0x44 */ = (u32)(param_0);
}
#pragma pop
/* 80323010-80323018 31D950 0008+00 1/0 0/0 0/0 .text
/* 80323010-80323018 -00001 0008+00 0/0 0/0 0/0 .text
* setColorChanOffset__20J3DColorBlockLightOnFUl */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DColorBlockLightOn::setColorChanOffset(u32 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanOffset__20J3DColorBlockLightOnFUl.s"
void J3DColorBlockLightOn::setColorChanOffset(u32 param_0) {
*(u32*)(((u8*)this) + 72) /* this->field_0x48 */ = (u32)(param_0);
}
#pragma pop
/* 80323018-80323074 31D958 005C+00 1/0 0/0 0/0 .text __dt__20J3DColorBlockLightOnFv */
#pragma push
@@ -6264,16 +6173,11 @@ asm void J3DColorBlockLightOff::setColorChanNum(u8 const* param_0) {
}
#pragma pop
/* 803231D0-803231D8 31DB10 0008+00 2/0 0/0 0/0 .text setColorChanNum__21J3DColorBlockLightOffFUc
/* 803231D0-803231D8 -00001 0008+00 0/0 0/0 0/0 .text setColorChanNum__21J3DColorBlockLightOffFUc
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DColorBlockLightOff::setColorChanNum(u8 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__21J3DColorBlockLightOffFUc.s"
void J3DColorBlockLightOff::setColorChanNum(u8 param_0) {
*(u8*)(((u8*)this) + 12) /* this->field_0xc */ = (u8)(param_0);
}
#pragma pop
/* 803231D8-803231E0 31DB18 0008+00 2/0 0/0 0/0 .text getColorChanNum__21J3DColorBlockLightOffCFv
*/
@@ -6318,15 +6222,10 @@ asm void J3DColorBlockLightOff::getColorChan(u32 param_0) {
}
#pragma pop
/* 8032321C-80323224 31DB5C 0008+00 2/0 0/0 0/0 .text setCullMode__21J3DColorBlockLightOffFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DColorBlockLightOff::setCullMode(u8 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__21J3DColorBlockLightOffFUc.s"
/* 8032321C-80323224 -00001 0008+00 0/0 0/0 0/0 .text setCullMode__21J3DColorBlockLightOffFUc */
void J3DColorBlockLightOff::setCullMode(u8 param_0) {
*(u8*)(((u8*)this) + 22) /* this->field_0x16 */ = (u8)(param_0);
}
#pragma pop
/* 80323224-80323230 31DB64 000C+00 2/0 0/0 0/0 .text setCullMode__21J3DColorBlockLightOffFPCUc */
#pragma push
@@ -6370,27 +6269,17 @@ asm void J3DColorBlockLightOff::getColorChanOffset() const {
}
#pragma pop
/* 80323248-80323250 31DB88 0008+00 2/0 0/0 0/0 .text
/* 80323248-80323250 -00001 0008+00 0/0 0/0 0/0 .text
* setMatColorOffset__21J3DColorBlockLightOffFUl */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DColorBlockLightOff::setMatColorOffset(u32 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColorOffset__21J3DColorBlockLightOffFUl.s"
void J3DColorBlockLightOff::setMatColorOffset(u32 param_0) {
*(u32*)(((u8*)this) + 24) /* this->field_0x18 */ = (u32)(param_0);
}
#pragma pop
/* 80323250-80323258 31DB90 0008+00 2/0 0/0 0/0 .text
/* 80323250-80323258 -00001 0008+00 0/0 0/0 0/0 .text
* setColorChanOffset__21J3DColorBlockLightOffFUl */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DColorBlockLightOff::setColorChanOffset(u32 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanOffset__21J3DColorBlockLightOffFUl.s"
void J3DColorBlockLightOff::setColorChanOffset(u32 param_0) {
*(u32*)(((u8*)this) + 28) /* this->field_0x1c */ = (u32)(param_0);
}
#pragma pop
/* 80323258-80323264 31DB98 000C+00 1/0 0/0 0/0 .text getType__13J3DPEBlockXluFv */
#pragma push
@@ -6462,15 +6351,10 @@ asm void J3DIndBlockFull::getType() {
}
#pragma pop
/* 8032339C-803233A4 31DCDC 0008+00 1/0 0/0 0/0 .text setIndTexStageNum__15J3DIndBlockFullFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DIndBlockFull::setIndTexStageNum(u8 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexStageNum__15J3DIndBlockFullFUc.s"
/* 8032339C-803233A4 -00001 0008+00 0/0 0/0 0/0 .text setIndTexStageNum__15J3DIndBlockFullFUc */
void J3DIndBlockFull::setIndTexStageNum(u8 param_0) {
*(u8*)(((u8*)this) + 4) /* this->field_0x4 */ = (u8)(param_0);
}
#pragma pop
/* 803233A4-803233AC 31DCE4 0008+00 1/0 0/0 0/0 .text getIndTexStageNum__15J3DIndBlockFullCFv */
#pragma push
@@ -6656,14 +6540,7 @@ asm void __sinit_J3DMatBlock_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8032356C = (void*)__sinit_J3DMatBlock_cpp;
REGISTER_CTORS(0x8032356C, __sinit_J3DMatBlock_cpp);
#pragma pop
/* 803A1EA8-803A1EC8 02E508 001D+03 3/3 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803A1EA8 = "Error : TexMtx[%d] is Null.\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803A1EC5 = "\0\0";
#pragma pop
/* 803A1EA8-803A1EA8 02E508 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/J3DGraphBase/J3DMaterial.cpp
+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 */];
//
libs/JSystem/J3DGraphBase/J3DShape.cpp
+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
libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp
+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
libs/JSystem/J3DGraphBase/J3DSys.cpp
+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
/* ############################################################################################## */
libs/JSystem/J3DGraphBase/J3DTevs.cpp
+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 */] = {
libs/JSystem/J3DGraphBase/J3DTransform.cpp
+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
libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
+44 -37
View File
@@ -79,15 +79,15 @@ struct J3DAnmLoader {
/* 80339800 */ ~J3DAnmLoader();
};
struct J3DAnmColorKeyData {};
struct J3DAnmClusterKeyData {};
struct J3DAnmClusterKey {};
struct J3DAnmColorKey {
/* 8032AB00 */ J3DAnmColorKey();
};
struct J3DAnmClusterKey {};
struct J3DAnmColorKeyData {};
struct J3DAnmClusterKeyData {};
struct J3DAnmKeyLoader_v15 {
/* 803384E0 */ J3DAnmKeyLoader_v15();
@@ -108,15 +108,15 @@ struct J3DAnmKeyLoader_v15 {
/* 80339634 */ void setAnmVtxColor(J3DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*);
};
struct J3DAnmColorFullData {};
struct J3DAnmClusterFullData {};
struct J3DAnmClusterFull {};
struct J3DAnmColorFull {
/* 8032A93C */ J3DAnmColorFull();
};
struct J3DAnmClusterFullData {};
struct J3DAnmClusterFull {};
struct J3DAnmColorFullData {};
struct J3DAnmFullLoader_v15 {
/* 80338468 */ J3DAnmFullLoader_v15();
@@ -186,8 +186,8 @@ setAnmVtxColor__19J3DAnmKeyLoader_v15FP17J3DAnmVtxColorKeyPC21J3DAnmVtxColorKeyD
extern "C" void __dt__20J3DAnmVisibilityFullFv();
extern "C" s32 getKind__20J3DAnmVisibilityFullCFv();
extern "C" void __dt__12J3DAnmLoaderFv();
extern "C" void func_80339848(void const*, void const*);
extern "C" void func_80339860(void const*, void const*);
extern "C" void func_80339848(void* _this, void const*, void const*);
extern "C" void func_80339860(void* _this, void const*, void const*);
extern "C" extern char const* const J3DAnmLoader__stringBase0;
//
@@ -198,21 +198,21 @@ extern "C" void OSReport();
extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
extern "C" void setResource__10JUTNameTabFPC7ResNTAB();
extern "C" void func_802F4260(void const*, void const*);
extern "C" void func_802F42C0(void const*, void const*);
extern "C" void func_8030A458(void const*, void const*);
extern "C" void func_8030A470(void const*, void const*);
extern "C" void func_8030A488(void const*, void const*);
extern "C" void func_8030A4A0(void const*, void const*);
extern "C" void func_8030A4B8(void const*, void const*);
extern "C" void func_8030A4D0(void const*, void const*);
extern "C" void func_8030A4E8(void const*, void const*);
extern "C" void func_8030A500(void const*, void const*);
extern "C" void func_8030A518(void const*, void const*);
extern "C" void func_8030A530(void const*, void const*);
extern "C" void func_8030A548(void const*, void const*);
extern "C" void func_8030A560(void const*, void const*);
extern "C" void func_8030A578(void const*, void const*);
extern "C" void func_802F4260(void* _this, void const*, void const*);
extern "C" void func_802F42C0(void* _this, void const*, void const*);
extern "C" void func_8030A458(void* _this, void const*, void const*);
extern "C" void func_8030A470(void* _this, void const*, void const*);
extern "C" void func_8030A488(void* _this, void const*, void const*);
extern "C" void func_8030A4A0(void* _this, void const*, void const*);
extern "C" void func_8030A4B8(void* _this, void const*, void const*);
extern "C" void func_8030A4D0(void* _this, void const*, void const*);
extern "C" void func_8030A4E8(void* _this, void const*, void const*);
extern "C" void func_8030A500(void* _this, void const*, void const*);
extern "C" void func_8030A518(void* _this, void const*, void const*);
extern "C" void func_8030A530(void* _this, void const*, void const*);
extern "C" void func_8030A548(void* _this, void const*, void const*);
extern "C" void func_8030A560(void* _this, void const*, void const*);
extern "C" void func_8030A578(void* _this, void const*, void const*);
extern "C" void __ct__15J3DAnmTransformFsPfPsPf();
extern "C" void __ct__19J3DAnmTextureSRTKeyFv();
extern "C" void __ct__18J3DAnmVtxColorFullFv();
@@ -240,6 +240,13 @@ extern "C" extern void* __vt__19J3DAnmTransformFull[5 + 1 /* padding */];
//
/* ############################################################################################## */
/* 803A2130-803A2130 02E790 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803A2130 =
"J3DAnmLoader: this is not a J3D Binary.\n";
#pragma pop
/* 803CF238-803CF24C 02C358 0014+00 2/2 0/0 0/0 .data __vt__19J3DAnmKeyLoader_v15 */
SECTION_DATA extern void* __vt__19J3DAnmKeyLoader_v15[5] = {
(void*)NULL /* RTTI */,
@@ -342,6 +349,15 @@ asm J3DAnmKeyLoader_v15::~J3DAnmKeyLoader_v15() {
}
#pragma pop
/* ############################################################################################## */
/* 803A2130-803A2130 02E790 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803A2159 = "Unknown data block\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803A216D = "\0\0";
#pragma pop
/* 80338558-803386A0 332E98 0148+00 2/1 0/0 0/0 .text load__20J3DAnmFullLoader_v15FPCv */
#pragma push
#pragma optimization_level 0
@@ -691,7 +707,7 @@ asm J3DAnmLoader::~J3DAnmLoader() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80339848(void const* param_0, void const* param_1) {
extern "C" asm void func_80339848(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DAnmLoader/func_80339848.s"
}
@@ -702,19 +718,10 @@ extern "C" asm void func_80339848(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80339860(void const* param_0, void const* param_1) {
extern "C" asm void func_80339860(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DAnmLoader/func_80339860.s"
}
#pragma pop
/* 803A2130-803A2170 02E790 003D+03 6/6 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803A2130 =
"J3DAnmLoader: this is not a J3D Binary.\n";
SECTION_DEAD static char const* const stringBase_803A2159 = "Unknown data block\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803A216D = "\0\0";
#pragma pop
/* 803A2130-803A2130 02E790 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
+19 -17
View File
@@ -52,9 +52,9 @@ extern "C" void __dt__20J3DClusterLoader_v15Fv();
extern "C" void load__20J3DClusterLoader_v15FPCv();
extern "C" void readCluster__20J3DClusterLoader_v15FPC15J3DClusterBlock();
extern "C" void __dt__16J3DClusterLoaderFv();
extern "C" void func_80334644(void const*, void const*);
extern "C" void func_8033465C(void const*, void const*);
extern "C" void func_80334674(void const*, void const*);
extern "C" void func_80334644(void* _this, void const*, void const*);
extern "C" void func_8033465C(void* _this, void const*, void const*);
extern "C" void func_80334674(void* _this, void const*, void const*);
extern "C" extern char const* const J3DClusterLoader__stringBase0;
//
@@ -68,9 +68,9 @@ extern "C" void* __nwa__FUl();
extern "C" void* __nwa__FUli();
extern "C" void __dl__FPv();
extern "C" void __ct__10JUTNameTabFPC7ResNTAB();
extern "C" void func_802F42C0(void const*, void const*);
extern "C" void func_8030A530(void const*, void const*);
extern "C" void func_8030A560(void const*, void const*);
extern "C" void func_802F42C0(void* _this, void const*, void const*);
extern "C" void func_8030A530(void* _this, void const*, void const*);
extern "C" void func_8030A560(void* _this, void const*, void const*);
extern "C" void __ct__13J3DDeformDataFv();
extern "C" void __ct__11J3DDeformerFP13J3DDeformData();
extern "C" void DCStoreRange();
@@ -130,6 +130,15 @@ asm J3DClusterLoader_v15::~J3DClusterLoader_v15() {
}
#pragma pop
/* ############################################################################################## */
/* 803A2098-803A2098 02E6F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803A2098 = "Unknown data block\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803A20AC = "\0\0\0";
#pragma pop
/* 80334244-803342F8 32EB84 00B4+00 2/1 0/0 0/0 .text load__20J3DClusterLoader_v15FPCv */
#pragma push
#pragma optimization_level 0
@@ -166,7 +175,7 @@ asm J3DClusterLoader::~J3DClusterLoader() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80334644(void const* param_0, void const* param_1) {
extern "C" asm void func_80334644(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DClusterLoader/func_80334644.s"
}
@@ -177,7 +186,7 @@ extern "C" asm void func_80334644(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8033465C(void const* param_0, void const* param_1) {
extern "C" asm void func_8033465C(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DClusterLoader/func_8033465C.s"
}
@@ -188,17 +197,10 @@ extern "C" asm void func_8033465C(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80334674(void const* param_0, void const* param_1) {
extern "C" asm void func_80334674(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DClusterLoader/func_80334674.s"
}
#pragma pop
/* 803A2098-803A20B0 02E6F8 0014+04 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803A2098 = "Unknown data block\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803A20AC = "\0\0\0";
#pragma pop
/* 803A2098-803A2098 02E6F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp
+3 -3
View File
@@ -28,7 +28,7 @@ struct J3DJoint {
extern "C" void __ct__15J3DJointFactoryFRC13J3DJointBlock();
extern "C" void create__15J3DJointFactoryFi();
extern "C" void func_80337338(void const*, u32);
extern "C" void func_80337338(void* _this, void const*, u32);
//
// External References:
@@ -36,7 +36,7 @@ extern "C" void func_80337338(void const*, u32);
extern "C" void* __nw__FUl();
extern "C" void __ct__8J3DJointFv();
extern "C" void func_8033677C(void const*, u32);
extern "C" void func_8033677C(void* _this, void const*, u32);
//
// Declarations:
@@ -67,7 +67,7 @@ asm void J3DJointFactory::create(int param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80337338(void const* param_0, u32 param_1) {
extern "C" asm void func_80337338(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DJointFactory/func_80337338.s"
}
libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
+51 -52
View File
@@ -37,12 +37,12 @@ struct J3DTexGenBlockNull {
/* 80332AD0 */ ~J3DTexGenBlockNull();
};
struct J3DNBTScale {};
struct J3DTexCoord {
/* 8000E464 */ J3DTexCoord();
};
struct J3DNBTScale {};
struct J3DTexGenBlock {
/* 8000DFD8 */ bool getTexMtx(u32);
/* 8000DFE0 */ bool getTexCoord(u32);
@@ -83,14 +83,14 @@ struct J3DGXColorS10 {
/* 8000E460 */ J3DGXColorS10();
};
struct J3DGXColor {
/* 8000E538 */ J3DGXColor();
};
struct J3DIndTevStage {
/* 8000E14C */ J3DIndTevStage();
};
struct J3DGXColor {
/* 8000E538 */ J3DGXColor();
};
struct J3DTevBlock {
/* 8000DBC8 */ void patchTexNoAndTexCoordScale();
/* 8000DBD4 */ void patch();
@@ -133,7 +133,6 @@ struct J3DTevBlock {
/* 80321940 */ void diffTevStage();
/* 80321944 */ void diffTexCoordScale();
/* 80321948 */ void diffTexNo();
/* 80321FE0 */ void setTexNoOffset(u32);
/* 80322958 */ void setTevSwapModeInfo(u32, J3DTevSwapModeInfo);
/* 8032295C */ void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*);
/* 80322964 */ bool getTevRegOffset() const;
@@ -162,12 +161,12 @@ struct J3DPEBlockNull {
/* 803329B0 */ ~J3DPEBlockNull();
};
struct J3DBlend {};
struct J3DFog {};
struct J3DAlphaComp {};
struct J3DBlend {};
struct J3DPEBlock {
/* 8000DBCC */ void patch();
/* 8000DF3C */ bool getZCompLoc() const;
@@ -391,25 +390,25 @@ extern "C" void __dt__18J3DTexGenBlockNullFv();
extern "C" void getType__17J3DColorBlockNullFv();
extern "C" void __dt__17J3DColorBlockNullFv();
extern "C" void __dt__11J3DMaterialFv();
extern "C" void func_80332BDC(void const*, void const*);
extern "C" void func_80332BF4(void const*, void const*);
extern "C" void func_80332C0C(void const*, void const*);
extern "C" void func_80332C24(void const*, void const*);
extern "C" void func_80332C3C(void const*, void const*);
extern "C" void func_80332C54(void const*, void const*);
extern "C" void func_80332C6C(void const*, void const*);
extern "C" void func_80332C84(void const*, void const*);
extern "C" void func_80332C9C(void const*, void const*);
extern "C" void func_80332CB4(void const*, void const*);
extern "C" void func_80332CCC(void const*, void const*);
extern "C" void func_80332CE4(void const*, void const*);
extern "C" void func_80332CFC(void const*, void const*);
extern "C" void func_80332D14(void const*, void const*);
extern "C" void func_80332D2C(void const*, void const*);
extern "C" void func_80332D44(void const*, void const*);
extern "C" void func_80332D5C(void const*, void const*);
extern "C" void func_80332D74(void const*, void const*);
extern "C" void func_80332D8C(void const*, void const*);
extern "C" void func_80332BDC(void* _this, void const*, void const*);
extern "C" void func_80332BF4(void* _this, void const*, void const*);
extern "C" void func_80332C0C(void* _this, void const*, void const*);
extern "C" void func_80332C24(void* _this, void const*, void const*);
extern "C" void func_80332C3C(void* _this, void const*, void const*);
extern "C" void func_80332C54(void* _this, void const*, void const*);
extern "C" void func_80332C6C(void* _this, void const*, void const*);
extern "C" void func_80332C84(void* _this, void const*, void const*);
extern "C" void func_80332C9C(void* _this, void const*, void const*);
extern "C" void func_80332CB4(void* _this, void const*, void const*);
extern "C" void func_80332CCC(void* _this, void const*, void const*);
extern "C" void func_80332CE4(void* _this, void const*, void const*);
extern "C" void func_80332CFC(void* _this, void const*, void const*);
extern "C" void func_80332D14(void* _this, void const*, void const*);
extern "C" void func_80332D2C(void* _this, void const*, void const*);
extern "C" void func_80332D44(void* _this, void const*, void const*);
extern "C" void func_80332D5C(void* _this, void const*, void const*);
extern "C" void func_80332D74(void* _this, void const*, void const*);
extern "C" void func_80332D8C(void* _this, void const*, void const*);
//
// External References:
@@ -475,11 +474,11 @@ extern "C" void setLight__13J3DColorBlockFUlP11J3DLightObj();
extern "C" void setAmbColor__13J3DColorBlockFUlPC10J3DGXColor();
extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
extern "C" void func_802F41E8(void const*, void const*);
extern "C" void func_802F4260(void const*, void const*);
extern "C" void func_802F4278(void const*, void const*);
extern "C" void func_802F4290(void const*, void const*);
extern "C" void func_802F42C0(void const*, void const*);
extern "C" void func_802F41E8(void* _this, void const*, void const*);
extern "C" void func_802F4260(void* _this, void const*, void const*);
extern "C" void func_802F4278(void* _this, void const*, void const*);
extern "C" void func_802F4290(void* _this, void const*, void const*);
extern "C" void func_802F42C0(void* _this, void const*, void const*);
extern "C" void setSingleDisplayList__17J3DDisplayListObjFPvUl();
extern "C" void createColorBlock__11J3DMaterialFUl();
extern "C" void createTexGenBlock__11J3DMaterialFUl();
@@ -1412,7 +1411,7 @@ asm J3DMaterial::~J3DMaterial() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80332BDC(void const* param_0, void const* param_1) {
extern "C" asm void func_80332BDC(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332BDC.s"
}
@@ -1423,7 +1422,7 @@ extern "C" asm void func_80332BDC(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80332BF4(void const* param_0, void const* param_1) {
extern "C" asm void func_80332BF4(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332BF4.s"
}
@@ -1434,7 +1433,7 @@ extern "C" asm void func_80332BF4(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80332C0C(void const* param_0, void const* param_1) {
extern "C" asm void func_80332C0C(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C0C.s"
}
@@ -1445,7 +1444,7 @@ extern "C" asm void func_80332C0C(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80332C24(void const* param_0, void const* param_1) {
extern "C" asm void func_80332C24(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C24.s"
}
@@ -1456,7 +1455,7 @@ extern "C" asm void func_80332C24(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80332C3C(void const* param_0, void const* param_1) {
extern "C" asm void func_80332C3C(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C3C.s"
}
@@ -1467,7 +1466,7 @@ extern "C" asm void func_80332C3C(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80332C54(void const* param_0, void const* param_1) {
extern "C" asm void func_80332C54(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C54.s"
}
@@ -1478,7 +1477,7 @@ extern "C" asm void func_80332C54(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80332C6C(void const* param_0, void const* param_1) {
extern "C" asm void func_80332C6C(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C6C.s"
}
@@ -1489,7 +1488,7 @@ extern "C" asm void func_80332C6C(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80332C84(void const* param_0, void const* param_1) {
extern "C" asm void func_80332C84(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C84.s"
}
@@ -1500,7 +1499,7 @@ extern "C" asm void func_80332C84(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80332C9C(void const* param_0, void const* param_1) {
extern "C" asm void func_80332C9C(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C9C.s"
}
@@ -1511,7 +1510,7 @@ extern "C" asm void func_80332C9C(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80332CB4(void const* param_0, void const* param_1) {
extern "C" asm void func_80332CB4(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332CB4.s"
}
@@ -1522,7 +1521,7 @@ extern "C" asm void func_80332CB4(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80332CCC(void const* param_0, void const* param_1) {
extern "C" asm void func_80332CCC(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332CCC.s"
}
@@ -1533,7 +1532,7 @@ extern "C" asm void func_80332CCC(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80332CE4(void const* param_0, void const* param_1) {
extern "C" asm void func_80332CE4(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332CE4.s"
}
@@ -1544,7 +1543,7 @@ extern "C" asm void func_80332CE4(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80332CFC(void const* param_0, void const* param_1) {
extern "C" asm void func_80332CFC(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332CFC.s"
}
@@ -1555,7 +1554,7 @@ extern "C" asm void func_80332CFC(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80332D14(void const* param_0, void const* param_1) {
extern "C" asm void func_80332D14(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332D14.s"
}
@@ -1566,7 +1565,7 @@ extern "C" asm void func_80332D14(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80332D2C(void const* param_0, void const* param_1) {
extern "C" asm void func_80332D2C(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332D2C.s"
}
@@ -1577,7 +1576,7 @@ extern "C" asm void func_80332D2C(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80332D44(void const* param_0, void const* param_1) {
extern "C" asm void func_80332D44(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332D44.s"
}
@@ -1588,7 +1587,7 @@ extern "C" asm void func_80332D44(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80332D5C(void const* param_0, void const* param_1) {
extern "C" asm void func_80332D5C(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332D5C.s"
}
@@ -1599,7 +1598,7 @@ extern "C" asm void func_80332D5C(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80332D74(void const* param_0, void const* param_1) {
extern "C" asm void func_80332D74(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332D74.s"
}
@@ -1610,7 +1609,7 @@ extern "C" asm void func_80332D74(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80332D8C(void const* param_0, void const* param_1) {
extern "C" asm void func_80332D8C(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332D8C.s"
}
libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp
+22 -22
View File
@@ -22,6 +22,8 @@ struct J3DTevStage {
/* 8003AACC */ J3DTevStage(J3DTevStageInfo const&);
};
struct J3DMaterialBlock_v21 {};
struct J3DMaterial {
/* 803157A0 */ void createColorBlock(u32);
/* 803159A0 */ void createTexGenBlock(u32);
@@ -31,8 +33,6 @@ struct J3DMaterial {
/* 80316240 */ void initialize();
};
struct J3DMaterialBlock_v21 {};
struct J3DMaterialFactory_v21 {
/* 80332DA4 */ J3DMaterialFactory_v21(J3DMaterialBlock_v21 const&);
/* 80332F84 */ void countUniqueMaterials();
@@ -96,7 +96,7 @@ extern "C" void newZMode__22J3DMaterialFactory_v21CFi();
extern "C" void newZCompLoc__22J3DMaterialFactory_v21CFi();
extern "C" void newDither__22J3DMaterialFactory_v21CFi();
extern "C" void newNBTScale__22J3DMaterialFactory_v21CFi();
extern "C" void func_80334118(void const*, void const*);
extern "C" void func_80334118(void* _this, void const*, void const*);
//
// External References:
@@ -105,11 +105,11 @@ extern "C" void func_80334118(void const*, void const*);
extern "C" void __ct__11J3DTevStageFv();
extern "C" void __ct__11J3DTevStageFRC15J3DTevStageInfo();
extern "C" void* __nw__FUl();
extern "C" void func_802F41E8(void const*, void const*);
extern "C" void func_802F4260(void const*, void const*);
extern "C" void func_802F4278(void const*, void const*);
extern "C" void func_802F4290(void const*, void const*);
extern "C" void func_802F42C0(void const*, void const*);
extern "C" void func_802F41E8(void* _this, void const*, void const*);
extern "C" void func_802F4260(void* _this, void const*, void const*);
extern "C" void func_802F4278(void* _this, void const*, void const*);
extern "C" void func_802F4290(void* _this, void const*, void const*);
extern "C" void func_802F42C0(void* _this, void const*, void const*);
extern "C" void createColorBlock__11J3DMaterialFUl();
extern "C" void createTexGenBlock__11J3DMaterialFUl();
extern "C" void createTevBlock__11J3DMaterialFi();
@@ -118,19 +118,19 @@ extern "C" void createPEBlock__11J3DMaterialFUlUl();
extern "C" void initialize__11J3DMaterialFv();
extern "C" void __as__13J3DTexMtxInfoFRC13J3DTexMtxInfo();
extern "C" void __as__10J3DFogInfoFRC10J3DFogInfo();
extern "C" void func_80332C24(void const*, void const*);
extern "C" void func_80332C3C(void const*, void const*);
extern "C" void func_80332C54(void const*, void const*);
extern "C" void func_80332C6C(void const*, void const*);
extern "C" void func_80332C84(void const*, void const*);
extern "C" void func_80332C9C(void const*, void const*);
extern "C" void func_80332CB4(void const*, void const*);
extern "C" void func_80332CCC(void const*, void const*);
extern "C" void func_80332CE4(void const*, void const*);
extern "C" void func_80332CFC(void const*, void const*);
extern "C" void func_80332D14(void const*, void const*);
extern "C" void func_80332D2C(void const*, void const*);
extern "C" void func_80332D5C(void const*, void const*);
extern "C" void func_80332C24(void* _this, void const*, void const*);
extern "C" void func_80332C3C(void* _this, void const*, void const*);
extern "C" void func_80332C54(void* _this, void const*, void const*);
extern "C" void func_80332C6C(void* _this, void const*, void const*);
extern "C" void func_80332C84(void* _this, void const*, void const*);
extern "C" void func_80332C9C(void* _this, void const*, void const*);
extern "C" void func_80332CB4(void* _this, void const*, void const*);
extern "C" void func_80332CCC(void* _this, void const*, void const*);
extern "C" void func_80332CE4(void* _this, void const*, void const*);
extern "C" void func_80332CFC(void* _this, void const*, void const*);
extern "C" void func_80332D14(void* _this, void const*, void const*);
extern "C" void func_80332D2C(void* _this, void const*, void const*);
extern "C" void func_80332D5C(void* _this, void const*, void const*);
extern "C" void _savegpr_19();
extern "C" void _savegpr_29();
extern "C" void _restgpr_19();
@@ -438,7 +438,7 @@ asm void J3DMaterialFactory_v21::newNBTScale(int param_0) const {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80334118(void const* param_0, void const* param_1) {
extern "C" asm void func_80334118(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory_v21/func_80334118.s"
}
libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp
+55 -47
View File
@@ -67,16 +67,16 @@ template <typename A0, typename B0>
struct J3DMtxCalcNoAnm {};
/* J3DMtxCalcNoAnm<J3DMtxCalcCalcTransformSoftimage, J3DMtxCalcJ3DSysInitSoftimage> */
struct J3DMtxCalcNoAnm__template1 {
/* 803364B8 */ void func_803364B8();
/* 80336524 */ void func_80336524(Vec const&, f32 const (&)[3][4]);
/* 8033656C */ void func_8033656C();
/* 803364B8 */ void func_803364B8(void* _this);
/* 80336524 */ void func_80336524(void* _this, Vec const&, f32 const (&)[3][4]);
/* 8033656C */ void func_8033656C(void* _this);
};
/* J3DMtxCalcNoAnm<J3DMtxCalcCalcTransformBasic, J3DMtxCalcJ3DSysInitBasic> */
struct J3DMtxCalcNoAnm__template2 {
/* 80336594 */ void func_80336594();
/* 80336600 */ void func_80336600(Vec const&, f32 const (&)[3][4]);
/* 80336628 */ void func_80336628();
/* 80336594 */ void func_80336594(void* _this);
/* 80336600 */ void func_80336600(void* _this, Vec const&, f32 const (&)[3][4]);
/* 80336628 */ void func_80336628(void* _this);
};
struct J3DMtxCalcJ3DSysInitBasic {
@@ -126,15 +126,15 @@ struct J3DModelLoaderDataBase {
/* 803346BC */ void load(void const*, u32);
};
struct J3DModelInfoBlock {};
struct J3DDrawBlock {};
struct J3DMaterialDLBlock {};
struct J3DJointBlock {};
struct J3DDrawBlock {};
struct J3DEnvelopeBlock {};
struct J3DMaterialDLBlock {};
struct J3DModelInfoBlock {};
struct J3DModelLoader {
/* 8033468C */ J3DModelLoader();
@@ -249,21 +249,21 @@ extern "C" void readMaterialTable_v21__14J3DModelLoaderFPC20J3DMaterialBlock_v21
extern "C" void readMaterialTable__14J3DModelLoaderFPC16J3DMaterialBlockUl();
extern "C" bool calcSizeMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl();
extern "C" bool calcSizeMaterialTable__14J3DModelLoaderFPC16J3DMaterialBlockUl();
extern "C" void func_803364B8();
extern "C" void func_80336524(Vec const&, f32 const (&)[3][4]);
extern "C" void func_8033656C();
extern "C" void func_80336594();
extern "C" void func_80336600(Vec const&, f32 const (&)[3][4]);
extern "C" void func_80336628();
extern "C" void func_803364B8(void* _this);
extern "C" void func_80336524(void* _this, Vec const&, f32 const (&)[3][4]);
extern "C" void func_8033656C(void* _this);
extern "C" void func_80336594(void* _this);
extern "C" void func_80336600(void* _this, Vec const&, f32 const (&)[3][4]);
extern "C" void func_80336628(void* _this);
extern "C" void __ct__11J3DMaterialFv();
extern "C" void __dt__10J3DTextureFv();
extern "C" void func_803366EC(void const*, void const*);
extern "C" void func_80336704(void const*, void const*);
extern "C" void func_8033671C(void const*, void const*);
extern "C" void func_80336734(void const*, void const*);
extern "C" void func_8033674C(void const*, void const*);
extern "C" void func_80336764(void const*, u32);
extern "C" void func_8033677C(void const*, u32);
extern "C" void func_803366EC(void* _this, void const*, void const*);
extern "C" void func_80336704(void* _this, void const*, void const*);
extern "C" void func_8033671C(void* _this, void const*, void const*);
extern "C" void func_80336734(void* _this, void const*, void const*);
extern "C" void func_8033674C(void* _this, void const*, void const*);
extern "C" void func_80336764(void* _this, void const*, u32);
extern "C" void func_8033677C(void* _this, void const*, u32);
extern "C" extern char const* const J3DModelLoader__stringBase0;
//
@@ -283,10 +283,10 @@ extern "C" void* __nwa__FUl();
extern "C" void* __nwa__FUli();
extern "C" void __dl__FPv();
extern "C" void __ct__10JUTNameTabFPC7ResNTAB();
extern "C" void func_802F4260(void const*, void const*);
extern "C" void func_802F42C0(void const*, void const*);
extern "C" void func_8030A530(void const*, void const*);
extern "C" void func_8030A560(void const*, void const*);
extern "C" void func_802F4260(void* _this, void const*, void const*);
extern "C" void func_802F42C0(void* _this, void const*, void const*);
extern "C" void func_8030A530(void* _this, void const*, void const*);
extern "C" void func_8030A560(void* _this, void const*, void const*);
extern "C" void initialize__11J3DMaterialFv();
extern "C" void initShapeNodes__13J3DShapeTableFP14J3DDrawMtxDataP13J3DVertexData();
extern "C" void sortVcdVatCmd__13J3DShapeTableFv();
@@ -470,6 +470,13 @@ asm void J3DModelLoaderDataBase::load(void const* param_0, u32 param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 803A20B0-803A20B0 02E710 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803A20B0 = "Unknown data block\n";
#pragma pop
/* 803347E0-80334ABC 32F120 02DC+00 4/1 0/0 0/0 .text load__14J3DModelLoaderFPCvUl */
#pragma push
#pragma optimization_level 0
@@ -501,6 +508,13 @@ asm void J3DModelLoader::loadBinaryDisplayList(void const* param_0, u32 param_1)
}
#pragma pop
/* ############################################################################################## */
/* 803A20B0-803A20B0 02E710 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803A20C4 = "WRONG SHAPE MATRIX TYPE (__FILE__)\n";
#pragma pop
/* 80334EE0-80335048 32F820 0168+00 3/0 0/0 0/0 .text setupBBoardInfo__14J3DModelLoaderFv
*/
#pragma push
@@ -759,7 +773,7 @@ bool J3DModelLoader::calcSizeMaterialTable(J3DMaterialBlock const* param_0, u32
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_803364B8() {
extern "C" asm void func_803364B8(void* _this) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_803364B8.s"
}
@@ -771,7 +785,7 @@ extern "C" asm void func_803364B8() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80336524(Vec const& param_0, f32 const (&param_1)[3][4]) {
extern "C" asm void func_80336524(void* _this, Vec const& param_0, f32 const (&param_1)[3][4]) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336524.s"
}
@@ -782,7 +796,7 @@ extern "C" asm void func_80336524(Vec const& param_0, f32 const (&param_1)[3][4]
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8033656C() {
extern "C" asm void func_8033656C(void* _this) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_8033656C.s"
}
@@ -793,7 +807,7 @@ extern "C" asm void func_8033656C() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80336594() {
extern "C" asm void func_80336594(void* _this) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336594.s"
}
@@ -805,7 +819,7 @@ extern "C" asm void func_80336594() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80336600(Vec const& param_0, f32 const (&param_1)[3][4]) {
extern "C" asm void func_80336600(void* _this, Vec const& param_0, f32 const (&param_1)[3][4]) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336600.s"
}
@@ -816,7 +830,7 @@ extern "C" asm void func_80336600(Vec const& param_0, f32 const (&param_1)[3][4]
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80336628() {
extern "C" asm void func_80336628(void* _this) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336628.s"
}
@@ -846,7 +860,7 @@ asm J3DTexture::~J3DTexture() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_803366EC(void const* param_0, void const* param_1) {
extern "C" asm void func_803366EC(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_803366EC.s"
}
@@ -856,7 +870,7 @@ extern "C" asm void func_803366EC(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80336704(void const* param_0, void const* param_1) {
extern "C" asm void func_80336704(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336704.s"
}
@@ -867,7 +881,7 @@ extern "C" asm void func_80336704(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8033671C(void const* param_0, void const* param_1) {
extern "C" asm void func_8033671C(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_8033671C.s"
}
@@ -878,7 +892,7 @@ extern "C" asm void func_8033671C(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80336734(void const* param_0, void const* param_1) {
extern "C" asm void func_80336734(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336734.s"
}
@@ -889,7 +903,7 @@ extern "C" asm void func_80336734(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8033674C(void const* param_0, void const* param_1) {
extern "C" asm void func_8033674C(void* _this, void const* param_0, void const* param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_8033674C.s"
}
@@ -900,7 +914,7 @@ extern "C" asm void func_8033674C(void const* param_0, void const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80336764(void const* param_0, u32 param_1) {
extern "C" asm void func_80336764(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336764.s"
}
@@ -911,16 +925,10 @@ extern "C" asm void func_80336764(void const* param_0, u32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8033677C(void const* param_0, u32 param_1) {
extern "C" asm void func_8033677C(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_8033677C.s"
}
#pragma pop
/* 803A20B0-803A20E8 02E710 0038+00 4/4 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803A20B0 = "Unknown data block\n";
SECTION_DEAD static char const* const stringBase_803A20C4 = "WRONG SHAPE MATRIX TYPE (__FILE__)\n";
#pragma pop
/* 803A20B0-803A20B0 02E710 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
+15 -13
View File
@@ -28,15 +28,15 @@ struct J3DModelLoader_v26 {
/* 80336F60 */ void calcSizeMaterialTable(J3DMaterialBlock const*, u32);
};
struct J3DModelInfoBlock {};
struct J3DDrawBlock {};
struct J3DMaterialDLBlock {};
struct J3DJointBlock {};
struct J3DDrawBlock {};
struct J3DEnvelopeBlock {};
struct J3DMaterialDLBlock {};
struct J3DModelInfoBlock {};
struct J3DModelLoader {
/* 80336794 */ void countMaterialNum(void const*);
@@ -96,7 +96,7 @@ extern "C" void __ct__18J3DMaterialFactoryFRC18J3DMaterialDLBlock();
extern "C" void countUniqueMaterials__18J3DMaterialFactoryFv();
extern "C" void
calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl();
extern "C" void func_8033674C(void const*, void const*);
extern "C" void func_8033674C(void* _this, void const*, void const*);
extern "C" void __ct__15J3DShapeFactoryFRC13J3DShapeBlock();
extern "C" void calcSize__15J3DShapeFactoryFiUl();
extern "C" void calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl();
@@ -123,6 +123,15 @@ asm void J3DModelLoader::countMaterialNum(void const* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 803A20E8-803A20E8 02E748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803A20E8 = "Unknown data block\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803A20FC = "\0\0\0";
#pragma pop
/* 803367D4-803369A0 331114 01CC+00 0/0 3/0 0/0 .text calcLoadSize__14J3DModelLoaderFPCvUl */
#pragma push
#pragma optimization_level 0
@@ -276,11 +285,4 @@ asm void J3DModelLoader::calcSizeMaterialDL(J3DMaterialDLBlock const* param_0, u
}
#pragma pop
/* 803A20E8-803A2100 02E748 0014+04 3/3 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803A20E8 = "Unknown data block\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803A20FC = "\0\0\0";
#pragma pop
/* 803A20E8-803A20E8 02E748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
+21 -19
View File
@@ -46,10 +46,10 @@ extern "C" void allocVcdVatCmdBuffer__15J3DShapeFactoryFUl();
extern "C" void calcSize__15J3DShapeFactoryFiUl();
extern "C" void calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl();
extern "C" void calcSizeShapeMtx__15J3DShapeFactoryCFUlii();
extern "C" void func_80337AE0(void const*, u32);
extern "C" void func_80337AF8(void const*, u32);
extern "C" void func_80337B10(void const*, u32);
extern "C" void func_80337B28(void const*, u32);
extern "C" void func_80337AE0(void* _this, void const*, u32);
extern "C" void func_80337AF8(void* _this, void const*, u32);
extern "C" void func_80337B10(void* _this, void const*, u32);
extern "C" void func_80337B28(void* _this, void const*, u32);
extern "C" extern char const* const J3DShapeFactory__stringBase0;
//
@@ -62,8 +62,8 @@ extern "C" void* __nwa__FUl();
extern "C" void* __nwa__FUli();
extern "C" void __ct__12J3DShapeDrawFPCUcUl();
extern "C" void initialize__8J3DShapeFv();
extern "C" void func_80336764(void const*, u32);
extern "C" void func_8033677C(void const*, u32);
extern "C" void func_80336764(void* _this, void const*, u32);
extern "C" void func_8033677C(void* _this, void const*, u32);
extern "C" void _savegpr_26();
extern "C" void _savegpr_29();
extern "C" void _restgpr_26();
@@ -101,6 +101,16 @@ asm void J3DShapeFactory::create(int param_0, u32 param_1, _GXVtxDescList* param
}
#pragma pop
/* ############################################################################################## */
/* 803A2100-803A2100 02E760 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803A2100 =
"WRONG SHAPE MATRIX TYPE (J3DModelInit.cpp)\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803A212C = "\0\0\0";
#pragma pop
/* 803375BC-8033784C 331EFC 0290+00 1/1 0/0 0/0 .text newShapeMtx__15J3DShapeFactoryCFUlii */
#pragma push
#pragma optimization_level 0
@@ -169,7 +179,7 @@ asm void J3DShapeFactory::calcSizeShapeMtx(u32 param_0, int param_1, int param_2
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80337AE0(void const* param_0, u32 param_1) {
extern "C" asm void func_80337AE0(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/func_80337AE0.s"
}
@@ -180,7 +190,7 @@ extern "C" asm void func_80337AE0(void const* param_0, u32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80337AF8(void const* param_0, u32 param_1) {
extern "C" asm void func_80337AF8(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/func_80337AF8.s"
}
@@ -191,7 +201,7 @@ extern "C" asm void func_80337AF8(void const* param_0, u32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80337B10(void const* param_0, u32 param_1) {
extern "C" asm void func_80337B10(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/func_80337B10.s"
}
@@ -202,18 +212,10 @@ extern "C" asm void func_80337B10(void const* param_0, u32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80337B28(void const* param_0, u32 param_1) {
extern "C" asm void func_80337B28(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/func_80337B28.s"
}
#pragma pop
/* 803A2100-803A2130 02E760 002C+04 2/2 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803A2100 =
"WRONG SHAPE MATRIX TYPE (J3DModelInit.cpp)\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803A212C = "\0\0\0";
#pragma pop
/* 803A2100-803A2100 02E760 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/J3DU/J3DUClipper.cpp
+24 -7
View File
@@ -67,7 +67,7 @@ asm void J3DUClipper::init() {
SECTION_RODATA static u8 const lit_898[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039A948, &lit_898);
COMPILER_STRIP_GATE(0x8039A948, &lit_898);
/* 8039A954-8039A960 026FB4 000C+00 0/1 0/0 0/0 .rodata @899 */
#pragma push
@@ -75,7 +75,7 @@ COMPILER_STRIP_GATE(8039A948, &lit_898);
SECTION_RODATA static u8 const lit_899[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039A954, &lit_899);
COMPILER_STRIP_GATE(0x8039A954, &lit_899);
#pragma pop
/* 8039A960-8039A96C 026FC0 000C+00 0/1 0/0 0/0 .rodata @900 */
@@ -84,7 +84,7 @@ COMPILER_STRIP_GATE(8039A954, &lit_899);
SECTION_RODATA static u8 const lit_900[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039A960, &lit_900);
COMPILER_STRIP_GATE(0x8039A960, &lit_900);
#pragma pop
/* 8039A96C-8039A978 026FCC 000C+00 0/1 0/0 0/0 .rodata @901 */
@@ -93,7 +93,7 @@ COMPILER_STRIP_GATE(8039A960, &lit_900);
SECTION_RODATA static u8 const lit_901[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039A96C, &lit_901);
COMPILER_STRIP_GATE(0x8039A96C, &lit_901);
#pragma pop
/* 8039A978-8039A984 026FD8 000C+00 0/1 0/0 0/0 .rodata @902 */
@@ -102,7 +102,7 @@ COMPILER_STRIP_GATE(8039A96C, &lit_901);
SECTION_RODATA static u8 const lit_902[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039A978, &lit_902);
COMPILER_STRIP_GATE(0x8039A978, &lit_902);
#pragma pop
/* 80455280-80455284 003880 0004+00 1/1 0/0 0/0 .sdata2 @913 */
@@ -149,14 +149,31 @@ asm void J3DUClipper::clip(f32 const (*param_0)[4], Vec* param_1, Vec* param_2)
}
#pragma pop
/* 8039A984-8039A9F0 026FE4 0065+07 0/0 0/0 0/0 .rodata @stringBase0 */
/* ############################################################################################## */
/* 8039A984-8039A99D 026FE4 0019+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039A984 = " J3DUClipper::mFovy = %f";
#pragma pop
/* 8039A99D-8039A9B8 026FFD 001B+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039A99D = " J3DUClipper::mAspect = %f";
#pragma pop
/* 8039A9B8-8039A9D1 027018 0019+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039A9B8 = " J3DUClipper::mNear = %f";
#pragma pop
/* 8039A9D1-8039A9F0 027031 0018+07 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039A9D1 = " J3DUClipper::mFar = %f";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039A9E9 = "\0\0\0\0\0\0";
#pragma pop
/* 8039A984-8039A984 026FE4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JAudio2/JAISeMgr.cpp
+18 -21
View File
@@ -40,7 +40,7 @@ template <typename A0>
struct JASMemPool {};
/* JASMemPool<JAISe> */
struct JASMemPool__template0 {
/* 8029FC34 */ void func_8029FC34();
/* 8029FC34 */ void func_8029FC34(void* _this);
};
struct JASGenericMemPool {
@@ -77,10 +77,10 @@ struct JAISeqDataRegion {};
struct JAISeqDataMgr {};
struct JAIAudience {};
struct JAISeCategoryArrangement {};
struct JAIAudience {};
struct JAISeMgr {
/* 802A0074 */ JAISeMgr(bool);
/* 802A0168 */ void isUsingSeqData(JAISeqDataRegion const&);
@@ -131,7 +131,7 @@ extern "C" void isUsingSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion();
extern "C" void releaseSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion();
extern "C" void JAISeMgr_calc___16JAISeCategoryMgrFv();
extern "C" void JAISeMgr_freeDeadSe___16JAISeCategoryMgrFv();
extern "C" void func_8029FC34();
extern "C" void func_8029FC34(void* _this);
extern "C" void JAISeMgr_acceptsNewSe___16JAISeCategoryMgrCFUl();
extern "C" void sortByPriority___16JAISeCategoryMgrFv();
extern "C" void stop__16JAISeCategoryMgrFUl();
@@ -260,7 +260,7 @@ asm void JAISeCategoryMgr::JAISeMgr_freeDeadSe_() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8029FC34() {
extern "C" asm void func_8029FC34(void* _this) {
nofralloc
#include "asm/JSystem/JAudio2/JAISeMgr/func_8029FC34.s"
}
@@ -443,15 +443,10 @@ asm void JAISeMgr::initParams() {
}
#pragma pop
/* 802A03D8-802A03E0 29AD18 0008+00 0/0 1/1 0/0 .text setAudience__8JAISeMgrFP11JAIAudience */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JAISeMgr::setAudience(JAIAudience* param_0) {
nofralloc
#include "asm/JSystem/JAudio2/JAISeMgr/setAudience__8JAISeMgrFP11JAIAudience.s"
/* 802A03D8-802A03E0 -00001 0008+00 0/0 0/0 0/0 .text setAudience__8JAISeMgrFP11JAIAudience */
void JAISeMgr::setAudience(JAIAudience* param_0) {
*(u32*)(((u8*)this) + 8) /* this->field_0x8 */ = (u32)(param_0);
}
#pragma pop
/* 802A03E0-802A0434 29AD20 0054+00 0/0 1/1 0/0 .text setSeqDataMgr__8JAISeMgrFP13JAISeqDataMgr */
#pragma push
@@ -503,6 +498,15 @@ asm void JAISeMgr::mixOut() {
}
#pragma pop
/* ############################################################################################## */
/* 8039B8F8-8039B8F8 027F58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039B8F8 = "cannot new Se %08x.";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039B90C = "\0\0\0";
#pragma pop
/* 802A0768-802A08D0 29B0A8 0168+00 0/0 1/1 0/0 .text
* startSound__8JAISeMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f> */
#pragma push
@@ -555,11 +559,4 @@ asm JAISeCategoryMgr::JAISeCategoryMgr() {
}
#pragma pop
/* 8039B8F8-8039B910 027F58 0014+04 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039B8F8 = "cannot new Se %08x.";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039B90C = "\0\0\0";
#pragma pop
/* 8039B8F8-8039B8F8 027F58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JAudio2/JAISeq.cpp
+5 -5
View File
@@ -42,14 +42,14 @@ template <typename A0>
struct JASMemPool_MultiThreaded {};
/* JASMemPool_MultiThreaded<JASTrack> */
struct JASMemPool_MultiThreaded__template0 {
/* 802932E0 */ void func_802932E0();
/* 802932E0 */ void func_802932E0(void* _this);
};
template <typename A0>
struct JASMemPool {};
/* JASMemPool<JAISoundChild> */
struct JASMemPool__template1 {
/* 802A1268 */ void func_802A1268();
/* 802A1268 */ void func_802A1268(void* _this);
};
struct JASGenericMemPool {
@@ -130,7 +130,7 @@ extern "C" void prepare_getSeqData___6JAISeqFv();
extern "C" void prepare___6JAISeqFRC14JASSoundParams16JAISoundActivity();
extern "C" void JAISeqMgr_calc___6JAISeqFv();
extern "C" void die___6JAISeqFv();
extern "C" void func_802A1268();
extern "C" void func_802A1268(void* _this);
extern "C" void JAISound_tryDie___6JAISeqFv();
extern "C" void mixOut___6JAISeqFRC14JASSoundParams16JAISoundActivity();
extern "C" void JAISeqMgr_mixOut___6JAISeqFRC14JASSoundParams16JAISoundActivity();
@@ -161,7 +161,7 @@ extern "C" void connectChild__8JASTrackFUlP8JASTrack();
extern "C" void mute__8JASTrackFb();
extern "C" void pause__8JASTrackFb();
extern "C" void setTempoRate__8JASTrackFf();
extern "C" void func_802932E0();
extern "C" void func_802932E0(void* _this);
extern "C" void mixOutAll__14JAISoundParamsFRC14JASSoundParamsP14JASSoundParamsf();
extern "C" void __ct__8JAISoundFv();
extern "C" void func_802A2328();
@@ -368,7 +368,7 @@ asm void JAISeq::die_() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802A1268() {
extern "C" asm void func_802A1268(void* _this) {
nofralloc
#include "asm/JSystem/JAudio2/JAISeq/func_802A1268.s"
}
libs/JSystem/JAudio2/JAISeqMgr.cpp
+3 -3
View File
@@ -39,7 +39,7 @@ template <typename A0>
struct JASMemPool {};
/* JASMemPool<JAISeq> */
struct JASMemPool__template2 {
/* 802A1AF4 */ void func_802A1AF4();
/* 802A1AF4 */ void func_802A1AF4(void* _this);
};
struct JASGenericMemPool {
@@ -107,7 +107,7 @@ extern "C" void isUsingSeqData__9JAISeqMgrFRC16JAISeqDataRegion();
extern "C" void releaseSeqData__9JAISeqMgrFRC16JAISeqDataRegion();
extern "C" void __ct__9JAISeqMgrFb();
extern "C" void freeDeadSeq___9JAISeqMgrFv();
extern "C" void func_802A1AF4();
extern "C" void func_802A1AF4(void* _this);
extern "C" void func_802A1B48();
extern "C" void calc__9JAISeqMgrFv();
extern "C" void stop__9JAISeqMgrFv();
@@ -241,7 +241,7 @@ asm void JAISeqMgr::freeDeadSeq_() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802A1AF4() {
extern "C" asm void func_802A1AF4(void* _this) {
nofralloc
#include "asm/JSystem/JAudio2/JAISeqMgr/func_802A1AF4.s"
}
libs/JSystem/JAudio2/JAISound.cpp
+12 -10
View File
@@ -289,6 +289,17 @@ asm void JAISound::die_JAISound_() {
}
#pragma pop
/* ############################################################################################## */
/* 8039B910-8039B910 027F70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039B910 =
"It cost %d steps to prepare Sound(ID:%08x, Addre"
"ss%08x).\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039B94A = "\0\0\0\0\0";
#pragma pop
/* 802A266C-802A26B8 29CFAC 004C+00 0/0 3/3 0/0 .text increasePrepareCount_JAISound___8JAISoundFv
*/
#pragma push
@@ -328,13 +339,4 @@ asm void JAISound::initTrack_JAISound_(JASTrack* param_0) {
}
#pragma pop
/* 8039B910-8039B950 027F70 003A+06 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039B910 =
"It cost %d steps to prepare Sound(ID:%08x, Addre"
"ss%08x).\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039B94A = "\0\0\0\0\0";
#pragma pop
/* 8039B910-8039B910 027F70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JAudio2/JAIStream.cpp
+5 -5
View File
@@ -28,7 +28,7 @@ template <typename A0>
struct JASMemPool {};
/* JASMemPool<JAISoundChild> */
struct JASMemPool__template1 {
/* 802A1268 */ void func_802A1268();
/* 802A1268 */ void func_802A1268(void* _this);
};
struct JASGenericMemPool {
@@ -49,16 +49,16 @@ struct JASAramStream {
struct JAIStreamMgr {};
struct JAISoundActivity {};
template <typename A0>
struct JAISoundStrategyMgr {};
/* JAISoundStrategyMgr<JAIStream> */
struct JAISoundStrategyMgr__template2 {};
struct JAISoundID {};
struct JAIAudience {};
struct JAISoundActivity {};
struct JAISoundID {};
struct JAIStream {
/* 802A3104 */ JAIStream(JAIStreamMgr*, JAISoundStrategyMgr<JAIStream>*);
@@ -135,7 +135,7 @@ extern "C" void start__13JASAramStreamFv();
extern "C" void stop__13JASAramStreamFUs();
extern "C" void pause__13JASAramStreamFb();
extern "C" void cancel__13JASAramStreamFv();
extern "C" void func_802A1268();
extern "C" void func_802A1268(void* _this);
extern "C" void mixOutAll__14JAISoundParamsFRC14JASSoundParamsP14JASSoundParamsf();
extern "C" void __ct__8JAISoundFv();
extern "C" void func_802A2328();
libs/JSystem/JAudio2/JAIStreamMgr.cpp
+5 -5
View File
@@ -34,7 +34,7 @@ template <typename A0>
struct JASMemPool {};
/* JASMemPool<JAIStream> */
struct JASMemPool__template3 {
/* 802A3E68 */ void func_802A3E68();
/* 802A3E68 */ void func_802A3E68(void* _this);
};
struct JASGenericMemPool {
@@ -60,6 +60,8 @@ struct JAIStreamMgr {
/* 802A4174 */ void newStream_();
};
struct JAISoundActivity {};
template <typename A0>
struct JAISoundStrategyMgr {};
/* JAISoundStrategyMgr<JAIStream> */
@@ -67,8 +69,6 @@ struct JAISoundStrategyMgr__template2 {};
struct JAIAudience {};
struct JAISoundActivity {};
struct JAIStream {
/* 802A3104 */ JAIStream(JAIStreamMgr*, JAISoundStrategyMgr<JAIStream>*);
/* 802A319C */ void JAIStreamMgr_startID_(JAISoundID, s32, JGeometry::TVec3<f32> const*,
@@ -90,7 +90,7 @@ struct JAISound {
extern "C" void __ct__12JAIStreamMgrFb();
extern "C" void func_802A3C3C();
extern "C" void freeDeadStream___12JAIStreamMgrFv();
extern "C" void func_802A3E68();
extern "C" void func_802A3E68(void* _this);
extern "C" void calc__12JAIStreamMgrFv();
extern "C" void stop__12JAIStreamMgrFv();
extern "C" void stop__12JAIStreamMgrFUl();
@@ -197,7 +197,7 @@ asm void JAIStreamMgr::freeDeadStream_() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802A3E68() {
extern "C" asm void func_802A3E68(void* _this) {
nofralloc
#include "asm/JSystem/JAudio2/JAIStreamMgr/func_802A3E68.s"
}
libs/JSystem/JAudio2/JASAiCtrl.cpp
+46 -21
View File
@@ -92,7 +92,7 @@ struct JASCalc {
template <typename A1, typename B1>
void clamp(/* ... */);
/* 8028F69C */ /* JASCalc::clamp<s16, s32> */
void func_8028F69C(s32);
void func_8028F69C(void* _this, s32);
};
struct JASAudioThread {
@@ -144,7 +144,7 @@ extern "C" u8 sSubFrameCounter__9JASDriver[4];
extern "C" void imixcopy__7JASCalcFPCsPCsPsUl();
extern "C" void bzero__7JASCalcFPvUl();
extern "C" void func_8028F69C(s32);
extern "C" void func_8028F69C(void* _this, s32);
extern "C" void start__8JASProbeFlPCc();
extern "C" void stop__8JASProbeFl();
extern "C" void JASReport__FPCce();
@@ -224,7 +224,7 @@ u8 JASDriver::sOutputRate[4];
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDriver::initAI(void (*)(void)) {
asm void JASDriver::initAI(void (*param_0)(void)) {
nofralloc
#include "asm/JSystem/JAudio2/JASAiCtrl/initAI__9JASDriverFPFv_v.s"
}
@@ -287,7 +287,7 @@ SECTION_RODATA void* const JASDriver::sMixFuncs[4] = {
(void*)mixExtraTrack__9JASDriverFPsUlPFl_Ps,
(void*)mixInterleaveTrack__9JASDriverFPsUlPFl_Ps,
};
COMPILER_STRIP_GATE(8039B2E0, &JASDriver::sMixFuncs);
COMPILER_STRIP_GATE(0x8039B2E0, &JASDriver::sMixFuncs);
/* 804512C4-804512C8 0007C4 0004+00 2/1 0/0 0/0 .sbss sSubFrameCounter__9JASDriver */
u8 JASDriver::sSubFrameCounter[4];
@@ -309,6 +309,13 @@ asm void JASDriver::updateDac() {
#pragma pop
/* ############################################################################################## */
/* 8039B2F0-8039B2F0 027950 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039B2F0 = "SFR-UPDATE";
SECTION_DEAD static char const* const stringBase_8039B2FB = "kill DSP channel";
#pragma pop
/* 803C78B8-803C78E0 0249D8 0028+00 1/1 0/0 0/0 .data history$267 */
SECTION_DATA static u8 history[40] = {
0x00, 0x0F, 0x42, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -355,6 +362,13 @@ asm void JASDriver::readDspBuffer(s16* param_0, u32 param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 8039B2F0-8039B2F0 027950 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039B30C = "DSP-MAIN";
#pragma pop
/* 8029C900-8029C9DC 297240 00DC+00 1/1 1/1 0/0 .text finishDSPFrame__9JASDriverFv */
#pragma push
#pragma optimization_level 0
@@ -370,7 +384,7 @@ asm void JASDriver::finishDSPFrame() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDriver::registerMixCallback(s16* (*)(s32), JASMixMode param_1) {
asm void JASDriver::registerMixCallback(s16* (*param_0)(s32), JASMixMode param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASAiCtrl/registerMixCallback__9JASDriverFPFl_Ps10JASMixMode.s"
}
@@ -411,32 +425,54 @@ asm void JASDriver::getFrameSamples() {
}
#pragma pop
/* ############################################################################################## */
/* 8039B2F0-8039B2F0 027950 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039B315 = "MONO-MIX";
#pragma pop
/* 8029CA10-8029CAC0 297350 00B0+00 1/0 0/0 0/0 .text mixMonoTrack__9JASDriverFPsUlPFl_Ps
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDriver::mixMonoTrack(s16* param_0, u32 param_1, s16* (*)(s32)) {
asm void JASDriver::mixMonoTrack(s16* param_0, u32 param_1, s16* (*param_2)(s32)) {
nofralloc
#include "asm/JSystem/JAudio2/JASAiCtrl/mixMonoTrack__9JASDriverFPsUlPFl_Ps.s"
}
#pragma pop
/* ############################################################################################## */
/* 8039B2F0-8039B2F0 027950 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039B31E = "MONO(W)-MIX";
#pragma pop
/* 8029CAC0-8029CB70 297400 00B0+00 1/0 0/0 0/0 .text mixMonoTrackWide__9JASDriverFPsUlPFl_Ps */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDriver::mixMonoTrackWide(s16* param_0, u32 param_1, s16* (*)(s32)) {
asm void JASDriver::mixMonoTrackWide(s16* param_0, u32 param_1, s16* (*param_2)(s32)) {
nofralloc
#include "asm/JSystem/JAudio2/JASAiCtrl/mixMonoTrackWide__9JASDriverFPsUlPFl_Ps.s"
}
#pragma pop
/* ############################################################################################## */
/* 8039B2F0-8039B2F0 027950 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039B32A = "DSPMIX";
SECTION_DEAD static char const* const stringBase_8039B331 = "MIXING";
#pragma pop
/* 8029CB70-8029CC50 2974B0 00E0+00 1/0 0/0 0/0 .text mixExtraTrack__9JASDriverFPsUlPFl_Ps */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDriver::mixExtraTrack(s16* param_0, u32 param_1, s16* (*)(s32)) {
asm void JASDriver::mixExtraTrack(s16* param_0, u32 param_1, s16* (*param_2)(s32)) {
nofralloc
#include "asm/JSystem/JAudio2/JASAiCtrl/mixExtraTrack__9JASDriverFPsUlPFl_Ps.s"
}
@@ -446,7 +482,7 @@ asm void JASDriver::mixExtraTrack(s16* param_0, u32 param_1, s16* (*)(s32)) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDriver::mixInterleaveTrack(s16* param_0, u32 param_1, s16* (*)(s32)) {
asm void JASDriver::mixInterleaveTrack(s16* param_0, u32 param_1, s16* (*param_2)(s32)) {
nofralloc
#include "asm/JSystem/JAudio2/JASAiCtrl/mixInterleaveTrack__9JASDriverFPsUlPFl_Ps.s"
}
@@ -457,15 +493,4 @@ u32 JASDriver::getSubFrameCounter() {
return *(u32*)(&JASDriver::sSubFrameCounter);
}
/* 8039B2F0-8039B338 027950 0048+00 5/5 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039B2F0 = "SFR-UPDATE";
SECTION_DEAD static char const* const stringBase_8039B2FB = "kill DSP channel";
SECTION_DEAD static char const* const stringBase_8039B30C = "DSP-MAIN";
SECTION_DEAD static char const* const stringBase_8039B315 = "MONO-MIX";
SECTION_DEAD static char const* const stringBase_8039B31E = "MONO(W)-MIX";
SECTION_DEAD static char const* const stringBase_8039B32A = "DSPMIX";
SECTION_DEAD static char const* const stringBase_8039B331 = "MIXING";
#pragma pop
/* 8039B2F0-8039B2F0 027950 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JAudio2/JASAramStream.cpp
+6 -6
View File
@@ -32,7 +32,7 @@ template <typename A0>
struct JASMemPool_MultiThreaded {};
/* JASMemPool_MultiThreaded<JASChannel> */
struct JASMemPool_MultiThreaded__template2 {
/* 802978DC */ void func_802978DC();
/* 802978DC */ void func_802978DC(void* _this);
};
struct JASGenericMemPool {
@@ -117,7 +117,7 @@ extern "C" void updateChannel__13JASAramStreamFUlP10JASChannelPQ26JASDsp8TChanne
extern "C" void channelProc__13JASAramStreamFv();
extern "C" void channelStart__13JASAramStreamFv();
extern "C" void channelStop__13JASAramStreamFUs();
extern "C" void func_802978DC();
extern "C" void func_802978DC(void* _this);
extern "C" u8 sLoadThread__13JASAramStream[4];
extern "C" u8 sReadBuffer__13JASAramStream[4];
extern "C" u8 sBlockSize__13JASAramStream[4];
@@ -229,7 +229,7 @@ asm JASAramStream::JASAramStream() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASAramStream::init(u32 param_0, u32 param_1, void (*)(u32, JASAramStream*, void*),
asm void JASAramStream::init(u32 param_0, u32 param_1, void (*param_2)(u32, JASAramStream*, void*),
void* param_3) {
nofralloc
#include "asm/JSystem/JAudio2/JASAramStream/init__13JASAramStreamFUlUlPFUlP13JASAramStreamPv_vPv.s"
@@ -456,7 +456,7 @@ asm void JASAramStream::channelProc() {
SECTION_RODATA static u8 const OSC_RELEASE_TABLE[12] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039B168, &OSC_RELEASE_TABLE);
COMPILER_STRIP_GATE(0x8039B168, &OSC_RELEASE_TABLE);
/* 8039B174-8039B190 -00001 0018+04 1/1 0/0 0/0 .rodata OSC_ENV */
SECTION_RODATA static void* const OSC_ENV[6 + 1 /* padding */] = {
@@ -469,7 +469,7 @@ SECTION_RODATA static void* const OSC_ENV[6 + 1 /* padding */] = {
/* padding */
NULL,
};
COMPILER_STRIP_GATE(8039B174, &OSC_ENV);
COMPILER_STRIP_GATE(0x8039B174, &OSC_ENV);
/* 80431B28-80431B34 05E848 000C+00 1/1 0/0 0/0 .bss @792 */
static u8 lit_792[12];
@@ -517,7 +517,7 @@ asm void JASAramStream::channelStop(u16 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802978DC() {
extern "C" asm void func_802978DC(void* _this) {
nofralloc
#include "asm/JSystem/JAudio2/JASAramStream/func_802978DC.s"
}
libs/JSystem/JAudio2/JASAudioThread.cpp
+18 -11
View File
@@ -30,7 +30,7 @@ template <typename A0>
struct JASMemPool_MultiThreaded {};
/* JASMemPool_MultiThreaded<JASChannel> */
struct JASMemPool_MultiThreaded__template2 {
/* 802978DC */ void func_802978DC();
/* 802978DC */ void func_802978DC(void* _this);
};
struct JASGenericMemPool {
@@ -92,7 +92,7 @@ extern "C" void __ct__17JASGenericMemPoolFv();
extern "C" void newMemPool__17JASGenericMemPoolFUli();
extern "C" void start__8JASProbeFlPCc();
extern "C" void stop__8JASProbeFl();
extern "C" void func_802978DC();
extern "C" void func_802978DC(void* _this);
extern "C" void initAI__9JASDriverFPFv_v();
extern "C" void startDMA__9JASDriverFv();
extern "C" void stopDMA__9JASDriverFv();
@@ -171,6 +171,12 @@ asm void JASAudioThread::stop() {
#pragma pop
/* ############################################################################################## */
/* 8039B338-8039B338 027998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039B338 = "SFR_DSP";
#pragma pop
/* 80431C68-80431C78 05E988 000C+04 1/1 0/0 0/0 .bss @205 */
static u8 lit_205[12 + 4 /* padding */];
@@ -187,6 +193,15 @@ asm void JASAudioThread::run() {
}
#pragma pop
/* ############################################################################################## */
/* 8039B338-8039B338 027998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039B340 = "UPDATE-DAC";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039B34B = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
#pragma pop
/* 8029CF68-8029CFBC 2978A8 0054+00 1/1 0/0 0/0 .text DMACallback__14JASAudioThreadFv */
#pragma push
#pragma optimization_level 0
@@ -217,12 +232,4 @@ asm JASAudioThread::~JASAudioThread() {
}
#pragma pop
/* 8039B338-8039B360 027998 0013+15 2/2 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039B338 = "SFR_DSP";
SECTION_DEAD static char const* const stringBase_8039B340 = "UPDATE-DAC";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039B34B = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
#pragma pop
/* 8039B338-8039B338 027998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JAudio2/JASBNKParser.cpp
+17 -18
View File
@@ -25,7 +25,7 @@ template <typename A0>
struct JASMemPool_MultiThreaded {};
/* JASMemPool_MultiThreaded<JASChannel> */
struct JASMemPool_MultiThreaded__template2 {
/* 802978DC */ void func_802978DC();
/* 802978DC */ void func_802978DC(void* _this);
};
struct JASInst {};
@@ -37,7 +37,6 @@ struct JASGenericMemPool {
struct JASDrumSet {
struct TPerc {
/* 802984C4 */ TPerc();
/* 802984E4 */ void setRelease(u32);
};
/* 802982EC */ JASDrumSet();
@@ -98,13 +97,13 @@ extern "C" void createBasicBank__Q212JASBNKParser4Ver0FPCvP7JKRHeap();
extern "C" void
findOscPtr__Q212JASBNKParser4Ver0FP12JASBasicBankPCQ312JASBNKParser4Ver07THeaderPCQ312JASBNKParser4Ver04TOsc();
extern "C" void getOscTableEndPtr__Q212JASBNKParser4Ver0FPCQ213JASOscillator5Point();
extern "C" void func_80299FA0(void const*, u32);
extern "C" void func_80299FB8(void const*, u32);
extern "C" void func_80299FD0(void const*, u32);
extern "C" void func_80299FE8(void const*, u32);
extern "C" void func_8029A000(void const*, u32);
extern "C" void func_8029A018(void const*, u32);
extern "C" void func_8029A030(void const*, u32);
extern "C" void func_80299FA0(void* _this, void const*, u32);
extern "C" void func_80299FB8(void* _this, void const*, u32);
extern "C" void func_80299FD0(void* _this, void const*, u32);
extern "C" void func_80299FE8(void* _this, void const*, u32);
extern "C" void func_8029A000(void* _this, void const*, u32);
extern "C" void func_8029A018(void* _this, void const*, u32);
extern "C" void func_8029A030(void* _this, void const*, u32);
extern "C" void __sinit_JASBNKParser_cpp();
extern "C" u8 sUsedHeapSize__12JASBNKParser[4];
@@ -114,7 +113,7 @@ extern "C" u8 sUsedHeapSize__12JASBNKParser[4];
extern "C" void bcopy__7JASCalcFPCvPvUl();
extern "C" void __ct__17JASGenericMemPoolFv();
extern "C" void func_802978DC();
extern "C" void func_802978DC(void* _this);
extern "C" void __ct__12JASBasicBankFv();
extern "C" void newInstTable__12JASBasicBankFUcP7JKRHeap();
extern "C" void setInst__12JASBasicBankFiP7JASInst();
@@ -267,7 +266,7 @@ asm void JASBNKParser::Ver0::getOscTableEndPtr(JASOscillator::Point const* param
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80299FA0(void const* param_0, u32 param_1) {
extern "C" asm void func_80299FA0(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASBNKParser/func_80299FA0.s"
}
@@ -278,7 +277,7 @@ extern "C" asm void func_80299FA0(void const* param_0, u32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80299FB8(void const* param_0, u32 param_1) {
extern "C" asm void func_80299FB8(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASBNKParser/func_80299FB8.s"
}
@@ -289,7 +288,7 @@ extern "C" asm void func_80299FB8(void const* param_0, u32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80299FD0(void const* param_0, u32 param_1) {
extern "C" asm void func_80299FD0(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASBNKParser/func_80299FD0.s"
}
@@ -300,7 +299,7 @@ extern "C" asm void func_80299FD0(void const* param_0, u32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80299FE8(void const* param_0, u32 param_1) {
extern "C" asm void func_80299FE8(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASBNKParser/func_80299FE8.s"
}
@@ -311,7 +310,7 @@ extern "C" asm void func_80299FE8(void const* param_0, u32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8029A000(void const* param_0, u32 param_1) {
extern "C" asm void func_8029A000(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASBNKParser/func_8029A000.s"
}
@@ -322,7 +321,7 @@ extern "C" asm void func_8029A000(void const* param_0, u32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8029A018(void const* param_0, u32 param_1) {
extern "C" asm void func_8029A018(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASBNKParser/func_8029A018.s"
}
@@ -333,7 +332,7 @@ extern "C" asm void func_8029A018(void const* param_0, u32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8029A030(void const* param_0, u32 param_1) {
extern "C" asm void func_8029A030(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASBNKParser/func_8029A030.s"
}
@@ -362,5 +361,5 @@ asm void __sinit_JASBNKParser_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8029A048 = (void*)__sinit_JASBNKParser_cpp;
REGISTER_CTORS(0x8029A048, __sinit_JASBNKParser_cpp);
#pragma pop
libs/JSystem/JAudio2/JASBank.cpp
+8 -6
View File
@@ -19,7 +19,7 @@ template <typename A0>
struct JASMemPool_MultiThreaded {};
/* JASMemPool_MultiThreaded<JASChannel> */
struct JASMemPool_MultiThreaded__template2 {
/* 802978DC */ void func_802978DC();
/* 802978DC */ void func_802978DC(void* _this);
};
struct JASGenericMemPool {
@@ -61,7 +61,7 @@ extern "C" void noteOnOsc__7JASBankFiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelP
extern "C" void __ct__17JASGenericMemPoolFv();
extern "C" void alloc__17JASGenericMemPoolFUl();
extern "C" void func_802978DC();
extern "C" void func_802978DC(void* _this);
extern "C" void __ct__10JASChannelFPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv();
extern "C" void play__10JASChannelFv();
extern "C" void setOscInit__10JASChannelFUlPCQ213JASOscillator4Data();
@@ -104,7 +104,8 @@ SECTION_SDATA2 static f32 lit_250 = 0.5f;
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASBank::noteOn(JASBank const* param_0, int param_1, u8 param_2, u8 param_3, u16 param_4,
void (*)(u32, JASChannel*, JASDsp::TChannel*, void*), void* param_6) {
void (*param_5)(u32, JASChannel*, JASDsp::TChannel*, void*),
void* param_6) {
nofralloc
#include "asm/JSystem/JAudio2/JASBank/noteOn__7JASBankFPC7JASBankiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv.s"
}
@@ -115,7 +116,7 @@ asm void JASBank::noteOn(JASBank const* param_0, int param_1, u8 param_2, u8 par
SECTION_RODATA static u8 const OSC_RELEASE_TABLE[12] = {
0x00, 0x01, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039B190, &OSC_RELEASE_TABLE);
COMPILER_STRIP_GATE(0x8039B190, &OSC_RELEASE_TABLE);
/* 8039B19C-8039B1B8 -00001 0018+04 1/1 0/0 0/0 .rodata OSC_ENV$261 */
SECTION_RODATA static void* const OSC_ENV[6 + 1 /* padding */] = {
@@ -128,7 +129,7 @@ SECTION_RODATA static void* const OSC_ENV[6 + 1 /* padding */] = {
/* padding */
NULL,
};
COMPILER_STRIP_GATE(8039B19C, &OSC_ENV);
COMPILER_STRIP_GATE(0x8039B19C, &OSC_ENV);
/* 8045563C-80455640 003C3C 0004+00 1/1 0/0 0/0 .sdata2 @290 */
SECTION_SDATA2 static f32 lit_290 = 16736.015625f;
@@ -139,7 +140,8 @@ SECTION_SDATA2 static f32 lit_290 = 16736.015625f;
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASBank::noteOnOsc(int param_0, u8 param_1, u8 param_2, u16 param_3,
void (*)(u32, JASChannel*, JASDsp::TChannel*, void*), void* param_5) {
void (*param_4)(u32, JASChannel*, JASDsp::TChannel*, void*),
void* param_5) {
nofralloc
#include "asm/JSystem/JAudio2/JASBank/noteOnOsc__7JASBankFiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv.s"
}
libs/JSystem/JAudio2/JASCalc.cpp
+5 -5
View File
@@ -21,7 +21,7 @@ struct JASCalc {
template <typename A1, typename B1>
void clamp(/* ... */);
/* 8028F69C */ /* JASCalc::clamp<s16, s32> */
void func_8028F69C(s32);
void func_8028F69C(void* _this, s32);
static u8 const CUTOFF_TO_IIR_TABLE[1024];
};
@@ -36,7 +36,7 @@ extern "C" void bcopy__7JASCalcFPCvPvUl();
extern "C" void bzerofast__7JASCalcFPvUl();
extern "C" void bzero__7JASCalcFPvUl();
extern "C" void pow2__7JASCalcFf();
extern "C" void func_8028F69C(s32);
extern "C" void func_8028F69C(void* _this, s32);
extern "C" u8 const CUTOFF_TO_IIR_TABLE__7JASCalc[1024];
//
@@ -168,14 +168,14 @@ SECTION_RODATA u8 const JASCalc::CUTOFF_TO_IIR_TABLE[1024] = {
0x7A, 0xBD, 0x00, 0x7A, 0x03, 0x49, 0x01, 0x6C, 0x7C, 0x7A, 0x00, 0x52, 0x02, 0x33, 0x00, 0xF4,
0x7E, 0x3B, 0x00, 0x29, 0x01, 0x1B, 0x00, 0x7A, 0x7F, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039ABB8, &JASCalc::CUTOFF_TO_IIR_TABLE);
COMPILER_STRIP_GATE(0x8039ABB8, &JASCalc::CUTOFF_TO_IIR_TABLE);
/* 8039AFB8-8039AFD0 027618 0018+00 1/1 0/0 0/0 .rodata __two_to_x$982 */
SECTION_RODATA static f32 const __two_to_x[6] = {
0.6931471824645996f, 0.240226611495018f, 0.055502913892269135f,
0.009625022299587727f, 0.0013131053419783711f, 0.0001830080582294613f,
};
COMPILER_STRIP_GATE(8039AFB8, &__two_to_x);
COMPILER_STRIP_GATE(0x8039AFB8, &__two_to_x);
/* 80455558-80455560 003B58 0004+04 1/1 0/0 0/0 .sdata2 @847 */
SECTION_SDATA2 static f32 lit_847[1 + 1 /* padding */] = {
@@ -229,7 +229,7 @@ asm void JASCalc::pow2(f32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8028F69C(s32 param_0) {
extern "C" asm void func_8028F69C(void* _this, s32 param_0) {
nofralloc
#include "asm/JSystem/JAudio2/JASCalc/func_8028F69C.s"
}
libs/JSystem/JAudio2/JASCallback.cpp
+2 -2
View File
@@ -47,7 +47,7 @@ extern "C" void _restgpr_29();
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASCallbackMgr::regist(s32 (*)(void*), void* param_1) {
asm void JASCallbackMgr::regist(s32 (*param_0)(void*), void* param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASCallback/regist__14JASCallbackMgrFPFPv_lPv.s"
}
@@ -58,7 +58,7 @@ asm void JASCallbackMgr::regist(s32 (*)(void*), void* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASCallbackMgr::reject(s32 (*)(void*), void* param_1) {
asm void JASCallbackMgr::reject(s32 (*param_0)(void*), void* param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASCallback/reject__14JASCallbackMgrFPFPv_lPv.s"
}
libs/JSystem/JAudio2/JASChannel.cpp
+4 -3
View File
@@ -36,7 +36,7 @@ template <typename A0>
struct JASMemPool_MultiThreaded {};
/* JASMemPool_MultiThreaded<JASChannel> */
struct JASMemPool_MultiThreaded__template2 {
/* 802978DC */ void func_802978DC();
/* 802978DC */ void func_802978DC(void* _this);
};
struct JASLfo {
@@ -152,7 +152,7 @@ extern "C" u8 sBankDisposeListSize__10JASChannel[4 + 4 /* padding */];
extern "C" void pow2__7JASCalcFf();
extern "C" void __ct__17JASGenericMemPoolFv();
extern "C" void free__17JASGenericMemPoolFPvUl();
extern "C" void func_802978DC();
extern "C" void func_802978DC(void* _this);
extern "C" void __ct__6JASLfoFv();
extern "C" void getValue__6JASLfoCFv();
extern "C" void incCounter__6JASLfoFf();
@@ -226,7 +226,8 @@ SECTION_SDATA2 static f32 lit_546[1 + 1 /* padding */] = {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm JASChannel::JASChannel(void (*)(u32, JASChannel*, JASDsp::TChannel*, void*), void* param_1) {
asm JASChannel::JASChannel(void (*param_0)(u32, JASChannel*, JASDsp::TChannel*, void*),
void* param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASChannel/__ct__10JASChannelFPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv.s"
}
libs/JSystem/JAudio2/JASCmdStack.cpp
+1 -1
View File
@@ -122,7 +122,7 @@ asm void __sinit_JASCmdStack_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8029116C = (void*)__sinit_JASCmdStack_cpp;
REGISTER_CTORS(0x8029116C, __sinit_JASCmdStack_cpp);
#pragma pop
/* 802911D0-80291228 28BB10 0058+00 1/1 0/0 0/0 .text __dt__Q210JASPortCmd9TPortHeadFv */
libs/JSystem/JAudio2/JASDSPChannel.cpp
+3 -2
View File
@@ -149,7 +149,8 @@ asm void JASDSPChannel::initAll() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDSPChannel::alloc(u8 param_0, s32 (*)(u32, JASDsp::TChannel*, void*), void* param_2) {
asm void JASDSPChannel::alloc(u8 param_0, s32 (*param_1)(u32, JASDsp::TChannel*, void*),
void* param_2) {
nofralloc
#include "asm/JSystem/JAudio2/JASDSPChannel/alloc__13JASDSPChannelFUcPFUlPQ26JASDsp8TChannelPv_lPv.s"
}
@@ -160,7 +161,7 @@ asm void JASDSPChannel::alloc(u8 param_0, s32 (*)(u32, JASDsp::TChannel*, void*)
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDSPChannel::allocForce(u8 param_0, s32 (*)(u32, JASDsp::TChannel*, void*),
asm void JASDSPChannel::allocForce(u8 param_0, s32 (*param_1)(u32, JASDsp::TChannel*, void*),
void* param_2) {
nofralloc
#include "asm/JSystem/JAudio2/JASDSPChannel/allocForce__13JASDSPChannelFUcPFUlPQ26JASDsp8TChannelPv_lPv.s"
libs/JSystem/JAudio2/JASDSPInterface.cpp
+7 -12
View File
@@ -163,7 +163,7 @@ static u8 struct_804512F4[4];
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDsp::boot(void (*)(void*)) {
asm void JASDsp::boot(void (*param_0)(void*)) {
nofralloc
#include "asm/JSystem/JAudio2/JASDSPInterface/boot__6JASDspFPFPv_v.s"
}
@@ -271,7 +271,7 @@ SECTION_RODATA u8 const JASDsp::DSPADPCM_FILTER[64] = {
0x10, 0x68, 0xF7, 0x38, 0x12, 0xC0, 0xF7, 0x04, 0x14, 0x00, 0xF4, 0x00, 0x08, 0x00, 0xF8, 0x00,
0x04, 0x00, 0xFC, 0x00, 0xFC, 0x00, 0x04, 0x00, 0xFC, 0x00, 0x00, 0x00, 0xF8, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039B360, &JASDsp::DSPADPCM_FILTER);
COMPILER_STRIP_GATE(0x8039B360, &JASDsp::DSPADPCM_FILTER);
/* 8039B3A0-8039B8A0 -00001 0500+00 1/1 0/0 0/0 .rodata DSPRES_FILTER__6JASDsp */
SECTION_RODATA void* const JASDsp::DSPRES_FILTER[320] = {
@@ -596,7 +596,7 @@ SECTION_RODATA void* const JASDsp::DSPRES_FILTER[320] = {
(void*)0x7FD87FE9,
(void*)0x7FF57FFD,
};
COMPILER_STRIP_GATE(8039B3A0, &JASDsp::DSPRES_FILTER);
COMPILER_STRIP_GATE(0x8039B3A0, &JASDsp::DSPRES_FILTER);
/* 8029DAC8-8029DB78 298408 00B0+00 0/0 1/1 0/0 .text initBuffer__6JASDspFv */
#pragma push
@@ -891,16 +891,11 @@ asm void JASDsp::TChannel::setFIR8FilterParam(s16* param_0) {
}
#pragma pop
/* 8029E094-8029E09C 2989D4 0008+00 0/0 1/1 0/0 .text setDistFilter__Q26JASDsp8TChannelFs
/* 8029E094-8029E09C -00001 0008+00 0/0 0/0 0/0 .text setDistFilter__Q26JASDsp8TChannelFs
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDsp::TChannel::setDistFilter(s16 param_0) {
nofralloc
#include "asm/JSystem/JAudio2/JASDSPInterface/setDistFilter__Q26JASDsp8TChannelFs.s"
void JASDsp::TChannel::setDistFilter(s16 param_0) {
*(u16*)(((u8*)this) + 336) /* this->field_0x150 */ = (u16)(param_0);
}
#pragma pop
/* ############################################################################################## */
/* 8039B8A0-8039B8B8 027F00 0018+00 1/1 0/0 0/0 .rodata connect_table$463 */
@@ -908,7 +903,7 @@ SECTION_RODATA static u8 const connect_table[24] = {
0x00, 0x00, 0x0D, 0x00, 0x0D, 0x60, 0x0D, 0xC0, 0x0E, 0x20, 0x0E, 0x80,
0x0E, 0xE0, 0x0C, 0xA0, 0x0F, 0x40, 0x0F, 0xA0, 0x0B, 0x00, 0x09, 0xA0,
};
COMPILER_STRIP_GATE(8039B8A0, &connect_table);
COMPILER_STRIP_GATE(0x8039B8A0, &connect_table);
/* 8029E09C-8029E0BC 2989DC 0020+00 0/0 1/1 0/0 .text setBusConnect__Q26JASDsp8TChannelFUcUc */
#pragma push
libs/JSystem/JAudio2/JASDriverIF.cpp
+4 -4
View File
@@ -169,7 +169,7 @@ u8 JASDriver::sUpdateDacCallback[256 + 8 /* padding */];
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDriver::rejectCallback(s32 (*)(void*), void* param_1) {
asm void JASDriver::rejectCallback(s32 (*param_0)(void*), void* param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASDriverIF/rejectCallback__9JASDriverFPFPv_lPv.s"
}
@@ -180,7 +180,7 @@ asm void JASDriver::rejectCallback(s32 (*)(void*), void* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDriver::registerDspSyncCallback(s32 (*)(void*), void* param_1) {
asm void JASDriver::registerDspSyncCallback(s32 (*param_0)(void*), void* param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASDriverIF/registerDspSyncCallback__9JASDriverFPFPv_lPv.s"
}
@@ -191,7 +191,7 @@ asm void JASDriver::registerDspSyncCallback(s32 (*)(void*), void* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDriver::registerSubFrameCallback(s32 (*)(void*), void* param_1) {
asm void JASDriver::registerSubFrameCallback(s32 (*param_0)(void*), void* param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASDriverIF/registerSubFrameCallback__9JASDriverFPFPv_lPv.s"
}
@@ -239,7 +239,7 @@ asm void __sinit_JASDriverIF_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8029E320 = (void*)__sinit_JASDriverIF_cpp;
REGISTER_CTORS(0x8029E320, __sinit_JASDriverIF_cpp);
#pragma pop
/* 8029E3A0-8029E3B0 298CE0 0010+00 1/1 0/0 0/0 .text __ct__Q214JASCallbackMgr9TCallbackFv */
libs/JSystem/JAudio2/JASDrumSet.cpp
+3 -8
View File
@@ -161,16 +161,11 @@ asm JASDrumSet::TPerc::TPerc() {
}
#pragma pop
/* 802984E4-802984EC 292E24 0008+00 0/0 2/2 0/0 .text setRelease__Q210JASDrumSet5TPercFUl
/* 802984E4-802984EC -00001 0008+00 0/0 0/0 0/0 .text setRelease__Q210JASDrumSet5TPercFUl
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDrumSet::TPerc::setRelease(u32 param_0) {
nofralloc
#include "asm/JSystem/JAudio2/JASDrumSet/setRelease__Q210JASDrumSet5TPercFUl.s"
void JASDrumSet::TPerc::setRelease(u32 param_0) {
*(u16*)(((u8*)this) + 12) /* this->field_0xc */ = (u16)(param_0);
}
#pragma pop
/* 802984EC-802984F8 292E2C 000C+00 1/0 0/0 0/0 .text getType__10JASDrumSetCFv */
#pragma push
libs/JSystem/JAudio2/JASHeapCtrl.cpp
+1 -1
View File
@@ -353,7 +353,7 @@ asm void __sinit_JASHeapCtrl_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80290B14 = (void*)__sinit_JASHeapCtrl_cpp;
REGISTER_CTORS(0x80290B14, __sinit_JASHeapCtrl_cpp);
#pragma pop
/* 80290B54-80290BCC 28B494 0078+00 1/1 3/3 0/0 .text __dt__7JASHeapFv */
libs/JSystem/JAudio2/JASLfo.cpp
+1 -1
View File
@@ -128,5 +128,5 @@ asm void __sinit_JASLfo_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8029BE6C = (void*)__sinit_JASLfo_cpp;
REGISTER_CTORS(0x8029BE6C, __sinit_JASLfo_cpp);
#pragma pop
libs/JSystem/JAudio2/JASOscillator.cpp
+4 -4
View File
@@ -148,7 +148,7 @@ SECTION_RODATA u8 const JASOscillator::sCurveTableLinear[68] = {
0x00, 0x00, 0x3E, 0xA0, 0x00, 0x00, 0x3E, 0x80, 0x00, 0x00, 0x3E, 0x40, 0x00, 0x00,
0x3E, 0x00, 0x00, 0x00, 0x3D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039B1D0, &JASOscillator::sCurveTableLinear);
COMPILER_STRIP_GATE(0x8039B1D0, &JASOscillator::sCurveTableLinear);
/* 8039B214-8039B258 027874 0044+00 1/0 0/0 0/0 .rodata sCurveTableSampleCell__13JASOscillator */
SECTION_RODATA u8 const JASOscillator::sCurveTableSampleCell[68] = {
@@ -158,7 +158,7 @@ SECTION_RODATA u8 const JASOscillator::sCurveTableSampleCell[68] = {
0x81, 0xE4, 0x3D, 0x32, 0xC1, 0x6E, 0x3C, 0xFC, 0x81, 0xFC, 0x3C, 0xC2, 0x41, 0x8E,
0x3C, 0x7A, 0x02, 0x25, 0x3C, 0x16, 0x01, 0x29, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039B214, &JASOscillator::sCurveTableSampleCell);
COMPILER_STRIP_GATE(0x8039B214, &JASOscillator::sCurveTableSampleCell);
/* 8039B258-8039B29C 0278B8 0044+00 1/0 0/0 0/0 .rodata sCurveTableSqRoot__13JASOscillator
*/
@@ -169,7 +169,7 @@ SECTION_RODATA u8 const JASOscillator::sCurveTableSqRoot[68] = {
0x00, 0x00, 0x3D, 0xC7, 0xFF, 0xF9, 0x3D, 0x80, 0x00, 0x00, 0x3D, 0x0F, 0xFF, 0xF3,
0x3C, 0x80, 0x00, 0x00, 0x3B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039B258, &JASOscillator::sCurveTableSqRoot);
COMPILER_STRIP_GATE(0x8039B258, &JASOscillator::sCurveTableSqRoot);
/* 8039B29C-8039B2E0 0278FC 0044+00 1/0 0/0 0/0 .rodata sCurveTableSquare__13JASOscillator
*/
@@ -180,7 +180,7 @@ SECTION_RODATA u8 const JASOscillator::sCurveTableSquare[68] = {
0xC4, 0x69, 0x3F, 0x0F, 0x1B, 0xBD, 0x3F, 0x00, 0x00, 0x00, 0x3E, 0xDD, 0xB3, 0xE1,
0x3E, 0xB5, 0x04, 0xE6, 0x3E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039B29C, &JASOscillator::sCurveTableSquare);
COMPILER_STRIP_GATE(0x8039B29C, &JASOscillator::sCurveTableSquare);
/* 803C78A8-803C78B8 -00001 0010+00 1/1 0/0 0/0 .data table_list$151 */
SECTION_DATA static void* table_list[4] = {
libs/JSystem/JAudio2/JASResArcLoader.cpp
+1 -1
View File
@@ -93,7 +93,7 @@ asm void JASResArcLoader::loadResourceCallback(void* param_0) {
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASResArcLoader::loadResourceAsync(JKRArchive* param_0, u16 param_1, u8* param_2,
u32 param_3, void (*)(u32, u32), u32 param_5) {
u32 param_3, void (*param_4)(u32, u32), u32 param_5) {
nofralloc
#include "asm/JSystem/JAudio2/JASResArcLoader/loadResourceAsync__15JASResArcLoaderFP10JKRArchiveUsPUcUlPFUlUl_vUl.s"
}
libs/JSystem/JAudio2/JASSeqCtrl.cpp
+1 -1
View File
@@ -208,7 +208,7 @@ asm void __sinit_JASSeqCtrl_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80293C6C = (void*)__sinit_JASSeqCtrl_cpp;
REGISTER_CTORS(0x80293C6C, __sinit_JASSeqCtrl_cpp);
#pragma pop
/* 80293CAC-80293CF4 28E5EC 0048+00 1/1 1/0 0/0 .text __dt__12JASSeqParserFv */
libs/JSystem/JAudio2/JASSeqParser.cpp
+28 -32
View File
@@ -11,12 +11,6 @@
// Types:
//
struct JMath {
struct TRandom_fast_ {
/* 80339AE4 */ TRandom_fast_(u32);
};
};
struct JASTrackPort {
/* 8029360C */ void checkImport(u32) const;
/* 80293628 */ void checkExport(u32) const;
@@ -1980,6 +1974,31 @@ asm void JASSeqParser::cmdRegTblLoad(JASTrack* param_0, u32* param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 8039B018-8039B018 027678 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039B018 =
"--------------- JASTrack (%8x) dump ------------"
"----";
SECTION_DEAD static char const* const stringBase_8039B04D = " Base: 0x%08x Cur: 0x%08x(0x%06x)";
SECTION_DEAD static char const* const stringBase_8039B06F = "";
SECTION_DEAD static char const* const stringBase_8039B070 =
" REG_A: 0x%04x REG_B: 0x%04x REG_S: 0x%04x";
SECTION_DEAD static char const* const stringBase_8039B09B =
" REG_X: 0x%04x REG_Y: 0x%04x REG_F: 0x%04x";
SECTION_DEAD static char const* const stringBase_8039B0C6 =
" PORT 0-3: 0x%04x 0x%04x 0x%04x 0x%04x";
SECTION_DEAD static char const* const stringBase_8039B0ED =
" PORT 4-7: 0x%04x 0x%04x 0x%04x 0x%04x";
SECTION_DEAD static char const* const stringBase_8039B114 =
" PORT 8-B: 0x%04x 0x%04x 0x%04x 0x%04x";
SECTION_DEAD static char const* const stringBase_8039B13B =
" PORT C-F: 0x%04x 0x%04x 0x%04x 0x%04x";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039B162 = "\0\0\0\0\0";
#pragma pop
/* 80295088-8029526C 28F9C8 01E4+00 1/0 0/0 0/0 .text cmdDump__12JASSeqParserFP8JASTrackPUl */
#pragma push
#pragma optimization_level 0
@@ -2038,7 +2057,7 @@ asm void JASSeqParser::execNoteOff(JASTrack* param_0, u32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASSeqParser::execCommand(JASTrack* param_0, s32 (JASSeqParser::*)(JASTrack*, u32*),
asm void JASSeqParser::execCommand(JASTrack* param_0, s32 (JASSeqParser::*param_1)(JASTrack*, u32*),
u32 param_2, u32* param_3) {
nofralloc
#include "asm/JSystem/JAudio2/JASSeqParser/execCommand__12JASSeqParserFP8JASTrackM12JASSeqParserFPCvPvP8JASTrackPUl_lUlPUl.s"
@@ -2109,7 +2128,7 @@ asm void __sinit_JASSeqParser_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80295950 = (void*)__sinit_JASSeqParser_cpp;
REGISTER_CTORS(0x80295950, __sinit_JASSeqParser_cpp);
#pragma pop
/* ############################################################################################## */
@@ -2125,27 +2144,4 @@ SECTION_DATA extern void* __vt__12JASSeqParser[8] = {
(void*)execCommand__12JASSeqParserFP8JASTrackM12JASSeqParserFPCvPvP8JASTrackPUl_lUlPUl,
};
/* 8039B018-8039B168 027678 014A+06 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039B018 =
"--------------- JASTrack (%8x) dump ------------"
"----";
SECTION_DEAD static char const* const stringBase_8039B04D = " Base: 0x%08x Cur: 0x%08x(0x%06x)";
SECTION_DEAD static char const* const stringBase_8039B06F = "";
SECTION_DEAD static char const* const stringBase_8039B070 =
" REG_A: 0x%04x REG_B: 0x%04x REG_S: 0x%04x";
SECTION_DEAD static char const* const stringBase_8039B09B =
" REG_X: 0x%04x REG_Y: 0x%04x REG_F: 0x%04x";
SECTION_DEAD static char const* const stringBase_8039B0C6 =
" PORT 0-3: 0x%04x 0x%04x 0x%04x 0x%04x";
SECTION_DEAD static char const* const stringBase_8039B0ED =
" PORT 4-7: 0x%04x 0x%04x 0x%04x 0x%04x";
SECTION_DEAD static char const* const stringBase_8039B114 =
" PORT 8-B: 0x%04x 0x%04x 0x%04x 0x%04x";
SECTION_DEAD static char const* const stringBase_8039B13B =
" PORT C-F: 0x%04x 0x%04x 0x%04x 0x%04x";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039B162 = "\0\0\0\0\0";
#pragma pop
/* 8039B018-8039B018 027678 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JAudio2/JASTaskThread.cpp
+4 -4
View File
@@ -115,7 +115,7 @@ asm JASTaskThread::~JASTaskThread() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASTaskThread::allocCallStack(void (*)(void*), void const* param_1, u32 param_2) {
asm void JASTaskThread::allocCallStack(void (*param_0)(void*), void const* param_1, u32 param_2) {
nofralloc
#include "asm/JSystem/JAudio2/JASTaskThread/allocCallStack__13JASTaskThreadFPFPv_vPCvUl.s"
}
@@ -125,7 +125,7 @@ asm void JASTaskThread::allocCallStack(void (*)(void*), void const* param_1, u32
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASTaskThread::allocCallStack(void (*)(void*), void* param_1) {
asm void JASTaskThread::allocCallStack(void (*param_0)(void*), void* param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASTaskThread/allocCallStack__13JASTaskThreadFPFPv_vPv.s"
}
@@ -135,7 +135,7 @@ asm void JASTaskThread::allocCallStack(void (*)(void*), void* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASTaskThread::sendCmdMsg(void (*)(void*), void const* param_1, u32 param_2) {
asm void JASTaskThread::sendCmdMsg(void (*param_0)(void*), void const* param_1, u32 param_2) {
nofralloc
#include "asm/JSystem/JAudio2/JASTaskThread/sendCmdMsg__13JASTaskThreadFPFPv_vPCvUl.s"
}
@@ -145,7 +145,7 @@ asm void JASTaskThread::sendCmdMsg(void (*)(void*), void const* param_1, u32 par
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASTaskThread::sendCmdMsg(void (*)(void*), void* param_1) {
asm void JASTaskThread::sendCmdMsg(void (*param_0)(void*), void* param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASTaskThread/sendCmdMsg__13JASTaskThreadFPFPv_vPv.s"
}
libs/JSystem/JAudio2/JASTrack.cpp
+23 -24
View File
@@ -32,7 +32,15 @@ struct JASTrackPort {
/* 802935E8 */ void writeExport(u32, u16);
};
struct JASSoundParams {};
struct JASDsp {
struct TChannel {
/* 8029E00C */ void setFilterMode(u16);
/* 8029E044 */ void setIIRFilterParam(s16*);
/* 8029E06C */ void setFIR8FilterParam(s16*);
};
static u32 FILTER_MODE_IIR;
};
struct JASOscillator {
struct Point {};
@@ -48,16 +56,7 @@ struct JASChannel {
/* 8029BBFC */ void free();
};
struct JASDsp {
struct TChannel {
/* 8029E00C */ void setFilterMode(u16);
/* 8029E044 */ void setIIRFilterParam(s16*);
/* 8029E06C */ void setFIR8FilterParam(s16*);
/* 8029E094 */ void setDistFilter(s16);
};
static u32 FILTER_MODE_IIR;
};
struct JASSoundParams {};
struct JASTrack {
struct TChannelMgr {
@@ -158,12 +157,12 @@ template <typename A0>
struct JASMemPool_MultiThreaded {};
/* JASMemPool_MultiThreaded<JASTrack> */
struct JASMemPool_MultiThreaded__template0 {
/* 802932E0 */ void func_802932E0();
/* 802932E0 */ void func_802932E0(void* _this);
};
/* JASMemPool_MultiThreaded<JASTrack::TChannelMgr> */
struct JASMemPool_MultiThreaded__template1 {
/* 80293334 */ void func_80293334();
/* 80293334 */ void func_80293334(void* _this);
};
struct JASGenericMemPool {
@@ -186,7 +185,7 @@ template <typename A0>
struct JASBankTable {};
/* JASBankTable<256> */
struct JASBankTable__template0 {
/* 80293528 */ void func_80293528(u32) /* const */;
/* 80293528 */ void func_80293528(void* _this, u32) /* const */;
};
struct JASBank {
@@ -259,12 +258,12 @@ extern "C" void releaseAll__Q28JASTrack11TChannelMgrFv();
extern "C" void noteOff__Q28JASTrack11TChannelMgrFUlUs();
extern "C" void setPauseFlag__Q28JASTrack11TChannelMgrFb();
extern "C" void __ct__Q28JASTrack10MoveParam_Fv();
extern "C" void func_802932E0();
extern "C" void func_80293334();
extern "C" void func_802932E0(void* _this);
extern "C" void func_80293334(void* _this);
extern "C" void __sinit_JASTrack_cpp();
extern "C" void __dt__Q28JASTrack5TListFv();
extern "C" void __dt__19JASDefaultBankTableFv();
extern "C" void func_80293528(u32);
extern "C" void func_80293528(void* _this, u32);
extern "C" u8 const sAdsTable__8JASTrack[24];
extern "C" u8 const sEnvOsc__8JASTrack[24];
extern "C" u8 const sPitchEnvOsc__8JASTrack[24];
@@ -413,14 +412,14 @@ SECTION_RODATA u8 const JASTrack::sAdsTable[24] = {
0x00, 0x00, 0x00, 0x00, 0x7F, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x7F, 0xFF,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039AFD0, &JASTrack::sAdsTable);
COMPILER_STRIP_GATE(0x8039AFD0, &JASTrack::sAdsTable);
/* 8039AFE8-8039B000 027648 0018+00 1/2 0/0 0/0 .rodata sEnvOsc__8JASTrack */
SECTION_RODATA u8 const JASTrack::sEnvOsc[24] = {
0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039AFE8, &JASTrack::sEnvOsc);
COMPILER_STRIP_GATE(0x8039AFE8, &JASTrack::sEnvOsc);
/* 8039B000-8039B018 027660 0018+00 0/1 0/0 0/0 .rodata sPitchEnvOsc__8JASTrack */
#pragma push
@@ -429,7 +428,7 @@ SECTION_RODATA u8 const JASTrack::sPitchEnvOsc[24] = {
0x00, 0x00, 0x00, 0x01, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039B000, &JASTrack::sPitchEnvOsc);
COMPILER_STRIP_GATE(0x8039B000, &JASTrack::sPitchEnvOsc);
#pragma pop
/* 804555A4-804555A8 003BA4 0004+00 9/9 0/0 0/0 .sdata2 @679 */
@@ -1064,7 +1063,7 @@ asm JASTrack::MoveParam_::MoveParam_() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802932E0() {
extern "C" asm void func_802932E0(void* _this) {
nofralloc
#include "asm/JSystem/JAudio2/JASTrack/func_802932E0.s"
}
@@ -1075,7 +1074,7 @@ extern "C" asm void func_802932E0() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80293334() {
extern "C" asm void func_80293334(void* _this) {
nofralloc
#include "asm/JSystem/JAudio2/JASTrack/func_80293334.s"
}
@@ -1117,7 +1116,7 @@ asm void __sinit_JASTrack_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80293388 = (void*)__sinit_JASTrack_cpp;
REGISTER_CTORS(0x80293388, __sinit_JASTrack_cpp);
#pragma pop
/* 8029345C-802934B4 28DD9C 0058+00 1/1 0/0 0/0 .text __dt__Q28JASTrack5TListFv */
@@ -1144,7 +1143,7 @@ asm JASDefaultBankTable::~JASDefaultBankTable() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80293528(u32 param_0) /* const */ {
extern "C" asm void func_80293528(void* _this, u32 param_0) /* const */ {
nofralloc
#include "asm/JSystem/JAudio2/JASTrack/func_80293528.s"
}
libs/JSystem/JAudio2/JASVoiceBank.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ SECTION_RODATA u8 const JASVoiceBank::sOscData[24] = {
0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039B1B8, &JASVoiceBank::sOscData);
COMPILER_STRIP_GATE(0x8039B1B8, &JASVoiceBank::sOscData);
/* 80451268-80451270 000768 0004+04 1/1 0/0 0/0 .sbss sOscTable__12JASVoiceBank */
u8 JASVoiceBank::sOscTable[4 + 4 /* padding */];
libs/JSystem/JAudio2/JASWSParser.cpp
+14 -14
View File
@@ -58,13 +58,13 @@ extern "C" void getGroupCount__11JASWSParserFPCv();
extern "C" void createWaveBank__11JASWSParserFPCvP7JKRHeap();
extern "C" void createBasicWaveBank__11JASWSParserFPCvP7JKRHeap();
extern "C" void createSimpleWaveBank__11JASWSParserFPCvP7JKRHeap();
extern "C" void func_80299490(void const*, u32);
extern "C" void func_802994A8(void const*, u32);
extern "C" void func_802994C0(void const*, u32);
extern "C" void func_802994D8(void const*, u32);
extern "C" void func_802994F0(void const*, u32);
extern "C" void func_80299508(void const*, u32);
extern "C" void func_80299520(void const*, u32);
extern "C" void func_80299490(void* _this, void const*, u32);
extern "C" void func_802994A8(void* _this, void const*, u32);
extern "C" void func_802994C0(void* _this, void const*, u32);
extern "C" void func_802994D8(void* _this, void const*, u32);
extern "C" void func_802994F0(void* _this, void const*, u32);
extern "C" void func_80299508(void* _this, void const*, u32);
extern "C" void func_80299520(void* _this, void const*, u32);
extern "C" u8 sUsedHeapSize__11JASWSParser[4 + 4 /* padding */];
//
@@ -147,7 +147,7 @@ asm void JASWSParser::createSimpleWaveBank(void const* param_0, JKRHeap* param_1
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80299490(void const* param_0, u32 param_1) {
extern "C" asm void func_80299490(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASWSParser/func_80299490.s"
}
@@ -158,7 +158,7 @@ extern "C" asm void func_80299490(void const* param_0, u32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802994A8(void const* param_0, u32 param_1) {
extern "C" asm void func_802994A8(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASWSParser/func_802994A8.s"
}
@@ -169,7 +169,7 @@ extern "C" asm void func_802994A8(void const* param_0, u32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802994C0(void const* param_0, u32 param_1) {
extern "C" asm void func_802994C0(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASWSParser/func_802994C0.s"
}
@@ -180,7 +180,7 @@ extern "C" asm void func_802994C0(void const* param_0, u32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802994D8(void const* param_0, u32 param_1) {
extern "C" asm void func_802994D8(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASWSParser/func_802994D8.s"
}
@@ -191,7 +191,7 @@ extern "C" asm void func_802994D8(void const* param_0, u32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802994F0(void const* param_0, u32 param_1) {
extern "C" asm void func_802994F0(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASWSParser/func_802994F0.s"
}
@@ -202,7 +202,7 @@ extern "C" asm void func_802994F0(void const* param_0, u32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80299508(void const* param_0, u32 param_1) {
extern "C" asm void func_80299508(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASWSParser/func_80299508.s"
}
@@ -213,7 +213,7 @@ extern "C" asm void func_80299508(void const* param_0, u32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80299520(void const* param_0, u32 param_1) {
extern "C" asm void func_80299520(void* _this, void const* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JASWSParser/func_80299520.s"
}
libs/JSystem/JAudio2/JAUInitializer.cpp
+12 -12
View File
@@ -47,34 +47,34 @@ template <typename A0>
struct JASMemPool_MultiThreaded {};
/* JASMemPool_MultiThreaded<JASTrack> */
struct JASMemPool_MultiThreaded__template0 {
/* 802932E0 */ void func_802932E0();
/* 802932E0 */ void func_802932E0(void* _this);
};
/* JASMemPool_MultiThreaded<JASTrack::TChannelMgr> */
struct JASMemPool_MultiThreaded__template1 {
/* 80293334 */ void func_80293334();
/* 80293334 */ void func_80293334(void* _this);
};
template <typename A0>
struct JASMemPool {};
/* JASMemPool<JAISe> */
struct JASMemPool__template0 {
/* 8029FC34 */ void func_8029FC34();
/* 8029FC34 */ void func_8029FC34(void* _this);
};
/* JASMemPool<JAISoundChild> */
struct JASMemPool__template1 {
/* 802A1268 */ void func_802A1268();
/* 802A1268 */ void func_802A1268(void* _this);
};
/* JASMemPool<JAISeq> */
struct JASMemPool__template2 {
/* 802A1AF4 */ void func_802A1AF4();
/* 802A1AF4 */ void func_802A1AF4(void* _this);
};
/* JASMemPool<JAIStream> */
struct JASMemPool__template3 {
/* 802A3E68 */ void func_802A3E68();
/* 802A3E68 */ void func_802A3E68(void* _this);
};
struct JASKernel {
@@ -123,17 +123,17 @@ extern "C" void __ct__17JASGenericMemPoolFv();
extern "C" void newMemPool__17JASGenericMemPoolFUli();
extern "C" void setupRootHeap__9JASKernelFP12JKRSolidHeapUl();
extern "C" void setupAramHeap__9JASKernelFUlUl();
extern "C" void func_802932E0();
extern "C" void func_80293334();
extern "C" void func_802932E0(void* _this);
extern "C" void func_80293334(void* _this);
extern "C" void initSystem__13JASAramStreamFUlUl();
extern "C" void setCurrentDir__16JASWaveArcLoaderFPCc();
extern "C" void create__14JASAudioThreadFl();
extern "C" void setDSPLevel__9JASDriverFf();
extern "C" void setOutputMode__9JASDriverFUl();
extern "C" void func_8029FC34();
extern "C" void func_802A1268();
extern "C" void func_802A1AF4();
extern "C" void func_802A3E68();
extern "C" void func_8029FC34(void* _this);
extern "C" void func_802A1268(void* _this);
extern "C" void func_802A1AF4(void* _this);
extern "C" void func_802A3E68(void* _this);
extern "C" void getFreeSize__7JKRHeapFv();
extern "C" void enter__15JKRThreadSwitchFP9JKRThreadi();
extern "C" void OSDisableInterrupts();
libs/JSystem/JAudio2/JAUSectionHeap.cpp
+32 -25
View File
@@ -16,10 +16,10 @@ template <typename A1>
struct __bitset_base {};
/* __bitset_base<8> */
struct __bitset_base__template0 {
/* 802A65D4 */ void func_802A65D4(u32, bool);
/* 802A6614 */ void func_802A6614(u32);
/* 802A6634 */ void func_802A6634(u32) /* const */;
/* 802A665C */ void func_802A665C();
/* 802A65D4 */ void func_802A65D4(void* _this, u32, bool);
/* 802A6614 */ void func_802A6614(void* _this, u32);
/* 802A6634 */ void func_802A6634(void* _this, u32) /* const */;
/* 802A665C */ void func_802A665C(void* _this);
};
}; // namespace std
@@ -84,12 +84,12 @@ struct JAUSeqCollection {
/* 802A66AC */ void init(void const*);
};
struct JAISeqDataUser {};
struct JAISeqData {};
struct JAISoundID {};
struct JAISeqDataUser {};
struct JAUSectionHeap {
struct TSectionHeapData {
/* 802A5DF4 */ TSectionHeapData();
@@ -136,7 +136,6 @@ struct JAUSection {
struct JAUDynamicSeqDataBlocks {
/* 802A6A58 */ JAUDynamicSeqDataBlocks();
/* 802A6AA0 */ void setSeqDataArchive(JKRArchive*);
/* 802A6AA8 */ void getSeqData(JAISoundID, JAISeqDataUser*, JAISeqData*, bool);
/* 802A6B8C */ void appendDynamicSeqDataBlock(JAUSeqDataBlock*);
/* 802A6C18 */ void loadDynamicSeq(JAISoundID, bool, JAISeqDataUser*);
@@ -217,10 +216,10 @@ extern "C" void __dt__14JAUSectionHeapFv();
extern "C" static void func_802A6440();
extern "C" void __dt__10JAUSectionFv();
extern "C" void func_802A6574();
extern "C" void func_802A65D4(u32, bool);
extern "C" void func_802A6614(u32);
extern "C" void func_802A6634(u32);
extern "C" void func_802A665C();
extern "C" void func_802A65D4(void* _this, u32, bool);
extern "C" void func_802A6614(void* _this, u32);
extern "C" void func_802A6634(void* _this, u32);
extern "C" void func_802A665C(void* _this);
extern "C" static void func_802A6680();
extern "C" static void func_802A6688();
extern "C" static void func_802A6690();
@@ -313,6 +312,13 @@ asm JAUSection::TSectionData::TSectionData() {
}
#pragma pop
/* ############################################################################################## */
/* 8039B950-8039B950 027FB0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039B950 = "index out of range of bitset::reset";
#pragma pop
/* 802A4F68-802A4FE4 29F8A8 007C+00 1/1 0/0 0/0 .text
* resetRegisteredBankTables__Q210JAUSection12TSectionDataFv */
#pragma push
@@ -502,6 +508,16 @@ asm void JAUSection::newCopy(void const* param_0, u32 param_1, s32 param_2) {
}
#pragma pop
/* ############################################################################################## */
/* 8039B950-8039B950 027FB0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039B974 = "index out of range of bitset::test";
SECTION_DEAD static char const* const stringBase_8039B997 = "index out of range of bitset::set";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039B9B9 = "\0\0\0\0\0\0";
#pragma pop
/* 802A5854-802A5948 2A0194 00F4+00 0/0 1/1 0/0 .text newWaveBank__10JAUSectionFUlPCv */
#pragma push
#pragma optimization_level 0
@@ -732,7 +748,7 @@ asm void func_802A6574() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802A65D4(u32 param_0, bool param_1) {
extern "C" asm void func_802A65D4(void* _this, u32 param_0, bool param_1) {
nofralloc
#include "asm/JSystem/JAudio2/JAUSectionHeap/func_802A65D4.s"
}
@@ -743,7 +759,7 @@ extern "C" asm void func_802A65D4(u32 param_0, bool param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802A6614(u32 param_0) {
extern "C" asm void func_802A6614(void* _this, u32 param_0) {
nofralloc
#include "asm/JSystem/JAudio2/JAUSectionHeap/func_802A6614.s"
}
@@ -754,7 +770,7 @@ extern "C" asm void func_802A6614(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802A6634(u32 param_0) /* const */ {
extern "C" asm void func_802A6634(void* _this, u32 param_0) /* const */ {
nofralloc
#include "asm/JSystem/JAudio2/JAUSectionHeap/func_802A6634.s"
}
@@ -778,7 +794,7 @@ SECTION_SDATA static u8 lit_2588[4 + 4 /* padding */] = {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802A665C() {
extern "C" asm void func_802A665C(void* _this) {
nofralloc
#include "asm/JSystem/JAudio2/JAUSectionHeap/func_802A665C.s"
}
@@ -826,13 +842,4 @@ static asm void func_802A6698() {
}
#pragma pop
/* 8039B950-8039B9C0 027FB0 0069+07 6/6 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039B950 = "index out of range of bitset::reset";
SECTION_DEAD static char const* const stringBase_8039B974 = "index out of range of bitset::test";
SECTION_DEAD static char const* const stringBase_8039B997 = "index out of range of bitset::set";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039B9B9 = "\0\0\0\0\0\0";
#pragma pop
/* 8039B950-8039B950 027FB0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JAudio2/JAUSeqCollection.cpp
+2 -2
View File
@@ -11,11 +11,11 @@
// Types:
//
struct JAISeqData {};
struct JAISeqDataUser {};
struct JAISoundID {};
struct JAISeqDataUser {};
struct JAISeqData {};
struct JAUSeqDataMgr_SeqCollection {
/* 802A677C */ JAUSeqDataMgr_SeqCollection();
libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp
+7 -12
View File
@@ -28,12 +28,12 @@ struct JSULink__template1 {};
struct JKRArchive {};
struct JAISoundID {};
struct JAUSeqDataBlock {
/* 802A68F4 */ JAUSeqDataBlock();
};
struct JAISoundID {};
struct JAUSeqDataBlocks {
/* 802A6928 */ void getSeqData(JAISoundID);
/* 802A6974 */ void seekFreeBlock(u32);
@@ -42,10 +42,10 @@ struct JAUSeqDataBlocks {
/* 802A6A18 */ void hasFailedBlock(JAISoundID);
};
struct JAISeqData {};
struct JAISeqDataUser {};
struct JAISeqData {};
struct JAUDynamicSeqDataBlocks {
/* 802A6A58 */ JAUDynamicSeqDataBlocks();
/* 802A6AA0 */ void setSeqDataArchive(JKRArchive*);
@@ -181,16 +181,11 @@ asm JAUDynamicSeqDataBlocks::JAUDynamicSeqDataBlocks() {
}
#pragma pop
/* 802A6AA0-802A6AA8 2A13E0 0008+00 0/0 2/2 0/0 .text
/* 802A6AA0-802A6AA8 -00001 0008+00 0/0 0/0 0/0 .text
* setSeqDataArchive__23JAUDynamicSeqDataBlocksFP10JKRArchive */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JAUDynamicSeqDataBlocks::setSeqDataArchive(JKRArchive* param_0) {
nofralloc
#include "asm/JSystem/JAudio2/JAUSeqDataBlockMgr/setSeqDataArchive__23JAUDynamicSeqDataBlocksFP10JKRArchive.s"
void JAUDynamicSeqDataBlocks::setSeqDataArchive(JKRArchive* param_0) {
*(u32*)(((u8*)this) + 36) /* this->field_0x24 */ = (u32)(param_0);
}
#pragma pop
/* 802A6AA8-802A6B8C 2A13E8 00E4+00 0/0 1/1 0/0 .text
* getSeqData__23JAUDynamicSeqDataBlocksF10JAISoundIDP14JAISeqDataUserP10JAISeqDatab */
libs/JSystem/JAudio2/dsptask.cpp
+3 -3
View File
@@ -569,7 +569,7 @@ static u8 AUDIO_YIELD_BUFFER[8192];
#pragma optimization_level 0
#pragma optimizewithasm off
#pragma function_align 32
asm void DspBoot(void (*)(void*)) {
asm void DspBoot(void (*param_0)(void*)) {
nofralloc
#include "asm/JSystem/JAudio2/dsptask/DspBoot__FPFPv_v.s"
}
@@ -580,7 +580,7 @@ asm void DspBoot(void (*)(void*)) {
#pragma optimization_level 0
#pragma optimizewithasm off
#pragma function_align 32
asm void DSPSendCommands2(u32* param_0, u32 param_1, void (*)(u16)) {
asm void DSPSendCommands2(u32* param_0, u32 param_1, void (*param_2)(u16)) {
nofralloc
#include "asm/JSystem/JAudio2/dsptask/DSPSendCommands2__FPUlUlPFUs_v.s"
}
@@ -613,7 +613,7 @@ static u8 taskwritep[4];
#pragma optimization_level 0
#pragma optimizewithasm off
#pragma function_align 32
static asm void DspStartWork(u32 param_0, void (*)(u16)) {
static asm void DspStartWork(u32 param_0, void (*param_1)(u16)) {
nofralloc
#include "asm/JSystem/JAudio2/dsptask/DspStartWork__FUlPFUs_v.s"
}
libs/JSystem/JAudio2/osdsp.cpp
+2 -2
View File
@@ -68,7 +68,7 @@ SECTION_RODATA static u8 const lit_81[26 + 2 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(8039B8B8, &lit_81);
COMPILER_STRIP_GATE(0x8039B8B8, &lit_81);
/* 8029EA00-8029EA84 299340 0084+00 0/0 1/1 0/0 .text DSPAddTask */
#pragma push
@@ -122,7 +122,7 @@ SECTION_RODATA static u8 const lit_88[31 + 5 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(8039B8D4, &lit_88);
COMPILER_STRIP_GATE(0x8039B8D4, &lit_88);
/* 8029EAA0-8029EB1C 2993E0 007C+00 0/0 1/1 0/0 .text DSPAddPriorTask__FP15STRUCT_DSP_TASK */
#pragma push
libs/JSystem/JFramework/JFWDisplay.cpp
+19 -17
View File
@@ -93,7 +93,7 @@ template <typename A0>
struct JSUList {};
/* JSUList<JFWAlarm> */
struct JSUList__template0 {
/* 80273724 */ void func_80273724();
/* 80273724 */ void func_80273724(void* _this);
};
struct JFWDisplay {
@@ -163,7 +163,7 @@ extern "C" static void JFWDrawDoneAlarm__Fv();
extern "C" static void JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext();
extern "C" static void diagnoseGpHang__Fv();
extern "C" void __sinit_JFWDisplay_cpp();
extern "C" void func_80273724();
extern "C" void func_80273724(void* _this);
extern "C" extern char const* const JFWDisplay__stringBase0;
extern "C" u8 sList__8JFWAlarm[12];
extern "C" u8 sManager__10JFWDisplay[4];
@@ -721,6 +721,20 @@ static asm void JFWGXAbortAlarmHandler(OSAlarm* param_0, OSContext* param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 8039A878-8039A878 026ED8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039A878 = "GP status %d%d%d%d%d%d --> ";
SECTION_DEAD static char const* const stringBase_8039A894 = "GP hang due to XF stall bug.\n";
SECTION_DEAD static char const* const stringBase_8039A8B2 =
"GP hang due to unterminated primitive.\n";
SECTION_DEAD static char const* const stringBase_8039A8DA = "GP hang due to illegal instruction.\n";
SECTION_DEAD static char const* const stringBase_8039A8FF =
"GP appears to be not hung (waiting for input).\n";
SECTION_DEAD static char const* const stringBase_8039A92F = "GP is in unknown state.\n";
#pragma pop
/* 802734FC-802736DC 26DE3C 01E0+00 1/1 0/0 0/0 .text diagnoseGpHang__Fv */
#pragma push
#pragma optimization_level 0
@@ -743,29 +757,17 @@ asm void __sinit_JFWDisplay_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_802736DC = (void*)__sinit_JFWDisplay_cpp;
REGISTER_CTORS(0x802736DC, __sinit_JFWDisplay_cpp);
#pragma pop
/* 80273724-80273778 26E064 0054+00 1/1 0/0 0/0 .text __dt__18JSUList<8JFWAlarm>Fv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80273724() {
extern "C" asm void func_80273724(void* _this) {
nofralloc
#include "asm/JSystem/JFramework/JFWDisplay/func_80273724.s"
}
#pragma pop
/* 8039A878-8039A948 026ED8 00D0+00 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039A878 = "GP status %d%d%d%d%d%d --> ";
SECTION_DEAD static char const* const stringBase_8039A894 = "GP hang due to XF stall bug.\n";
SECTION_DEAD static char const* const stringBase_8039A8B2 =
"GP hang due to unterminated primitive.\n";
SECTION_DEAD static char const* const stringBase_8039A8DA = "GP hang due to illegal instruction.\n";
SECTION_DEAD static char const* const stringBase_8039A8FF =
"GP appears to be not hung (waiting for input).\n";
SECTION_DEAD static char const* const stringBase_8039A92F = "GP is in unknown state.\n";
#pragma pop
/* 8039A878-8039A878 026ED8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JGadget/std-vector.cpp
+9 -9
View File
@@ -32,9 +32,9 @@ template <typename A1, typename B1>
struct TVector {};
/* TVector<void*, JGadget::TAllocator<void*>> */
struct TVector__template0 {
/* 802DD130 */ void func_802DD130(void**, void* const&);
/* 802DCE1C */ void func_802DCE1C(void**, u32, void* const&);
/* 802DCE8C */ void func_802DCE8C(void**, u32);
/* 802DD130 */ void func_802DD130(void* _this, void**, void* const&);
/* 802DCE1C */ void func_802DCE1C(void* _this, void**, u32, void* const&);
/* 802DCE8C */ void func_802DCE8C(void* _this, void**, u32);
};
}; // namespace JGadget
@@ -48,9 +48,9 @@ extern "C" void func_802DCCD0();
extern "C" void __dt__Q27JGadget20TVector_pointer_voidFv();
extern "C" void insert__Q27JGadget20TVector_pointer_voidFPPvRCPv();
extern "C" void erase__Q27JGadget20TVector_pointer_voidFPPvPPv();
extern "C" void func_802DCE1C(void**, u32, void* const&);
extern "C" void func_802DCE8C(void**, u32);
extern "C" void func_802DD130(void**, void* const&);
extern "C" void func_802DCE1C(void* _this, void**, u32, void* const&);
extern "C" void func_802DCE8C(void* _this, void**, u32);
extern "C" void func_802DD130(void* _this, void**, void* const&);
//
// External References:
@@ -125,7 +125,7 @@ asm void JGadget::TVector_pointer_void::erase(void** param_0, void** param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802DCE1C(void** param_0, u32 param_1, void* const& param_2) {
extern "C" asm void func_802DCE1C(void* _this, void** param_0, u32 param_1, void* const& param_2) {
nofralloc
#include "asm/JSystem/JGadget/std-vector/func_802DCE1C.s"
}
@@ -136,7 +136,7 @@ extern "C" asm void func_802DCE1C(void** param_0, u32 param_1, void* const& para
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802DCE8C(void** param_0, u32 param_1) {
extern "C" asm void func_802DCE8C(void* _this, void** param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/JGadget/std-vector/func_802DCE8C.s"
}
@@ -147,7 +147,7 @@ extern "C" asm void func_802DCE8C(void** param_0, u32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802DD130(void** param_0, void* const& param_1) {
extern "C" asm void func_802DD130(void* _this, void** param_0, void* const& param_1) {
nofralloc
#include "asm/JSystem/JGadget/std-vector/func_802DD130.s"
}
libs/JSystem/JKernel/JKRAram.cpp
+17 -9
View File
@@ -24,7 +24,7 @@ template <typename A0>
struct JSUList {};
/* JSUList<JKRAMCommand> */
struct JSUList__template5 {
/* 802D2DF0 */ void func_802D2DF0();
/* 802D2DF0 */ void func_802D2DF0(void* _this);
};
struct JKRThread {
@@ -103,7 +103,7 @@ extern "C" static void decompSZS_subroutine__FPUcPUc();
extern "C" static void firstSrcData__Fv();
extern "C" static void nextSrcData__FPUc();
extern "C" void __sinit_JKRAram_cpp();
extern "C" void func_802D2DF0();
extern "C" void func_802D2DF0(void* _this);
extern "C" extern char const* const JKRAram__stringBase0;
extern "C" u8 sMessageBuffer__7JKRAram[16];
extern "C" u8 sMessageQueue__7JKRAram[32];
@@ -231,6 +231,15 @@ asm void JKRAram::run() {
}
#pragma pop
/* ############################################################################################## */
/* 8039D078-8039D078 0296D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039D078 = "JKRAram.cpp";
SECTION_DEAD static char const* const stringBase_8039D084 = "%s";
SECTION_DEAD static char const* const stringBase_8039D087 = ":::address not 32Byte aligned.";
#pragma pop
/* 802D2248-802D22DC 2CCB88 0094+00 2/2 0/0 0/0 .text
* checkOkAddress__7JKRAramFPUcUlP12JKRAramBlockUl */
#pragma push
@@ -393,7 +402,7 @@ asm void __sinit_JKRAram_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_802D2DAC = (void*)__sinit_JKRAram_cpp;
REGISTER_CTORS(0x802D2DAC, __sinit_JKRAram_cpp);
#pragma pop
/* 802D2DF0-802D2E44 2CD730 0054+00 1/1 1/1 0/0 .text __dt__23JSUList<12JKRAMCommand>Fv
@@ -401,20 +410,19 @@ SECTION_CTORS void* const _ctors_802D2DAC = (void*)__sinit_JKRAram_cpp;
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802D2DF0() {
extern "C" asm void func_802D2DF0(void* _this) {
nofralloc
#include "asm/JSystem/JKernel/JKRAram/func_802D2DF0.s"
}
#pragma pop
/* 8039D078-8039D0B8 0296D8 003C+04 1/1 0/0 0/0 .rodata @stringBase0 */
/* ############################################################################################## */
/* 8039D0A6-8039D0B8 029706 000E+04 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039D078 = "JKRAram.cpp";
SECTION_DEAD static char const* const stringBase_8039D084 = "%s";
SECTION_DEAD static char const* const stringBase_8039D087 = ":::address not 32Byte aligned.";
SECTION_DEAD static char const* const stringBase_8039D0A6 = "bad aramSync\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039D0B4 = "\0\0\0";
#pragma pop
/* 8039D078-8039D078 0296D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JKernel/JKRAramArchive.cpp
+10 -8
View File
@@ -301,6 +301,15 @@ asm void JKRAramArchive::getAramAddress(char const* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 8039D188-8039D188 0297E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039D188 = "JKRAramArchive.cpp";
SECTION_DEAD static char const* const stringBase_8039D19B = "%s";
SECTION_DEAD static char const* const stringBase_8039D19E = "??? bad sequence\n";
#pragma pop
/* 802D7858-802D7914 2D2198 00BC+00 1/1 1/1 0/0 .text
* fetchResource_subroutine__14JKRAramArchiveFUlUlPUcUli */
#pragma push
@@ -345,11 +354,4 @@ asm JKRFile::~JKRFile() {
}
#pragma pop
/* 8039D188-8039D1B0 0297E8 0028+00 2/2 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039D188 = "JKRAramArchive.cpp";
SECTION_DEAD static char const* const stringBase_8039D19B = "%s";
SECTION_DEAD static char const* const stringBase_8039D19E = "??? bad sequence\n";
#pragma pop
/* 8039D188-8039D188 0297E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JKernel/JKRAramHeap.cpp
+4 -4
View File
@@ -23,7 +23,7 @@ template <typename A0>
struct JSUList {};
/* JSUList<JKRAramBlock> */
struct JSUList__template6 {
/* 802D32B0 */ void func_802D32B0();
/* 802D32B0 */ void func_802D32B0(void* _this);
};
struct JKRHeap {
@@ -69,7 +69,7 @@ extern "C" void getFreeSize__11JKRAramHeapFv();
extern "C" void getTotalFreeSize__11JKRAramHeapFv();
extern "C" void dump__11JKRAramHeapFv();
extern "C" void __sinit_JKRAramHeap_cpp();
extern "C" void func_802D32B0();
extern "C" void func_802D32B0(void* _this);
extern "C" u8 sAramList__11JKRAramHeap[12];
//
@@ -208,7 +208,7 @@ asm void __sinit_JKRAramHeap_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_802D326C = (void*)__sinit_JKRAramHeap_cpp;
REGISTER_CTORS(0x802D326C, __sinit_JKRAramHeap_cpp);
#pragma pop
/* 802D32B0-802D3304 2CDBF0 0054+00 1/1 0/0 0/0 .text __dt__23JSUList<12JKRAramBlock>Fv
@@ -216,7 +216,7 @@ SECTION_CTORS void* const _ctors_802D326C = (void*)__sinit_JKRAramHeap_cpp;
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802D32B0() {
extern "C" asm void func_802D32B0(void* _this) {
nofralloc
#include "asm/JSystem/JKernel/JKRAramHeap/func_802D32B0.s"
}
libs/JSystem/JKernel/JKRAramPiece.cpp
+18 -17
View File
@@ -30,7 +30,7 @@ template <typename A0>
struct JSUList {};
/* JSUList<JKRAMCommand> */
struct JSUList__template5 {
/* 802D2DF0 */ void func_802D2DF0();
/* 802D2DF0 */ void func_802D2DF0(void* _this);
};
struct JKRHeap {
@@ -95,7 +95,7 @@ extern "C" void OSReport();
extern "C" void free__7JKRHeapFPvP7JKRHeap();
extern "C" void* __nw__FUlP7JKRHeapi();
extern "C" void __dl__FPv();
extern "C" void func_802D2DF0();
extern "C" void func_802D2DF0(void* _this);
extern "C" void sendCommand__9JKRDecompFP16JKRDecompCommand();
extern "C" void __ct__10JSUPtrLinkFPv();
extern "C" void __dt__10JSUPtrLinkFv();
@@ -131,7 +131,7 @@ extern "C" u8 sSystemHeap__7JKRHeap[4];
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JKRAramPiece::prepareCommand(int param_0, u32 param_1, u32 param_2, u32 param_3,
JKRAramBlock* param_4, void (*)(u32)) {
JKRAramBlock* param_4, void (*param_5)(u32)) {
nofralloc
#include "asm/JSystem/JKernel/JKRAramPiece/prepareCommand__12JKRAramPieceFiUlUlUlP12JKRAramBlockPFUl_v.s"
}
@@ -149,6 +149,18 @@ asm void JKRAramPiece::sendCommand(JKRAMCommand* param_0) {
#pragma pop
/* ############################################################################################## */
/* 8039D0B8-8039D0B8 029718 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039D0B8 = "direction = %x\n";
SECTION_DEAD static char const* const stringBase_8039D0C8 = "source = %x\n";
SECTION_DEAD static char const* const stringBase_8039D0D5 = "destination = %x\n";
SECTION_DEAD static char const* const stringBase_8039D0E7 = "length = %x\n";
SECTION_DEAD static char const* const stringBase_8039D0F4 = "JKRAramPiece.cpp";
SECTION_DEAD static char const* const stringBase_8039D105 = "%s";
SECTION_DEAD static char const* const stringBase_8039D108 = "illegal address. abort.";
#pragma pop
/* 80434318-80434324 061038 000C+00 1/1 0/0 0/0 .bss @492 */
static u8 lit_492[12];
@@ -164,7 +176,7 @@ u8 JKRAramPiece::mMutex[24];
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JKRAramPiece::orderAsync(int param_0, u32 param_1, u32 param_2, u32 param_3,
JKRAramBlock* param_4, void (*)(u32)) {
JKRAramBlock* param_4, void (*param_5)(u32)) {
nofralloc
#include "asm/JSystem/JKernel/JKRAramPiece/orderAsync__12JKRAramPieceFiUlUlUlP12JKRAramBlockPFUl_v.s"
}
@@ -244,18 +256,7 @@ asm void __sinit_JKRAramPiece_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_802D3B04 = (void*)__sinit_JKRAramPiece_cpp;
REGISTER_CTORS(0x802D3B04, __sinit_JKRAramPiece_cpp);
#pragma pop
/* 8039D0B8-8039D120 029718 0068+00 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039D0B8 = "direction = %x\n";
SECTION_DEAD static char const* const stringBase_8039D0C8 = "source = %x\n";
SECTION_DEAD static char const* const stringBase_8039D0D5 = "destination = %x\n";
SECTION_DEAD static char const* const stringBase_8039D0E7 = "length = %x\n";
SECTION_DEAD static char const* const stringBase_8039D0F4 = "JKRAramPiece.cpp";
SECTION_DEAD static char const* const stringBase_8039D105 = "%s";
SECTION_DEAD static char const* const stringBase_8039D108 = "illegal address. abort.";
#pragma pop
/* 8039D0B8-8039D0B8 029718 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JKernel/JKRAramStream.cpp
+12 -10
View File
@@ -194,6 +194,17 @@ bool JKRAramStream::readFromAram() {
return true;
}
/* ############################################################################################## */
/* 8039D120-8039D120 029780 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039D120 = "JKRAramStream.cpp";
SECTION_DEAD static char const* const stringBase_8039D132 = "%s";
SECTION_DEAD static char const* const stringBase_8039D135 = ":::Cannot alloc memory\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039D14D = "\0\0";
#pragma pop
/* 802D3CE0-802D3ED0 2CE620 01F0+00 1/1 0/0 0/0 .text
* writeToAram__13JKRAramStreamFP20JKRAramStreamCommand */
#pragma push
@@ -269,13 +280,4 @@ asm void JSURandomInputStream::getAvailable() const {
}
#pragma pop
/* 8039D120-8039D150 029780 002D+03 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039D120 = "JKRAramStream.cpp";
SECTION_DEAD static char const* const stringBase_8039D132 = "%s";
SECTION_DEAD static char const* const stringBase_8039D135 = ":::Cannot alloc memory\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039D14D = "\0\0";
#pragma pop
/* 8039D120-8039D120 029780 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JKernel/JKRCompArchive.cpp
+19 -11
View File
@@ -262,6 +262,15 @@ asm void JKRCompArchive::fetchResource(JKRArchive::SDIFileEntry* param_0, u32* p
}
#pragma pop
/* ############################################################################################## */
/* 8039D220-8039D220 029880 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039D220 = "JKRCompArchive.cpp";
SECTION_DEAD static char const* const stringBase_8039D233 = "%s";
SECTION_DEAD static char const* const stringBase_8039D236 = "illegal archive.";
#pragma pop
/* 802D90C0-802D9260 2D3A00 01A0+00 1/0 0/0 0/0 .text
* fetchResource__14JKRCompArchiveFPvUlPQ210JKRArchive12SDIFileEntryPUl */
#pragma push
@@ -295,6 +304,15 @@ asm void JKRCompArchive::removeResource(void* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 8039D220-8039D220 029880 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039D247 = "illegal resource.";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039D259 = "\0\0\0\0\0\0";
#pragma pop
/* 802D9360-802D9518 2D3CA0 01B8+00 1/0 0/0 0/0 .text getExpandedResSize__14JKRCompArchiveCFPCv */
#pragma push
#pragma optimization_level 0
@@ -305,14 +323,4 @@ asm void JKRCompArchive::getExpandedResSize(void const* param_0) const {
}
#pragma pop
/* 8039D220-8039D260 029880 0039+07 2/2 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039D220 = "JKRCompArchive.cpp";
SECTION_DEAD static char const* const stringBase_8039D233 = "%s";
SECTION_DEAD static char const* const stringBase_8039D236 = "illegal archive.";
SECTION_DEAD static char const* const stringBase_8039D247 = "illegal resource.";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039D259 = "\0\0\0\0\0\0";
#pragma pop
/* 8039D220-8039D220 029880 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JKernel/JKRDecomp.cpp
+3 -2
View File
@@ -168,7 +168,7 @@ asm void JKRDecomp::run() {
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JKRDecomp::prepareCommand(u8* param_0, u8* param_1, u32 param_2, u32 param_3,
void (*)(u32)) {
void (*param_4)(u32)) {
nofralloc
#include "asm/JSystem/JKernel/JKRDecomp/prepareCommand__9JKRDecompFPUcPUcUlUlPFUl_v.s"
}
@@ -189,7 +189,8 @@ asm void JKRDecomp::sendCommand(JKRDecompCommand* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JKRDecomp::orderAsync(u8* param_0, u8* param_1, u32 param_2, u32 param_3, void (*)(u32)) {
asm void JKRDecomp::orderAsync(u8* param_0, u8* param_1, u32 param_2, u32 param_3,
void (*param_4)(u32)) {
nofralloc
#include "asm/JSystem/JKernel/JKRDecomp/orderAsync__9JKRDecompFPUcPUcUlUlPFUl_v.s"
}
libs/JSystem/JKernel/JKRDvdAramRipper.cpp
+6 -6
View File
@@ -27,7 +27,7 @@ template <typename A0>
struct JSUList {};
/* JSUList<JKRADCommand> */
struct JSUList__template10 {
/* 802DB62C */ void func_802DB62C();
/* 802DB62C */ void func_802DB62C(void* _this);
};
struct JSUInputStream {
@@ -119,7 +119,7 @@ extern "C" static void firstSrcData__Fv();
extern "C" static void nextSrcData__FPUc();
extern "C" static void dmaBufferFlush__FUl();
extern "C" void __sinit_JKRDvdAramRipper_cpp();
extern "C" void func_802DB62C();
extern "C" void func_802DB62C(void* _this);
extern "C" u8 sDvdAramAsyncList__16JKRDvdAramRipper[12];
extern "C" u32 sSZSBufferSize__16JKRDvdAramRipper;
@@ -207,8 +207,8 @@ asm void JKRDvdAramRipper::loadToAram(JKRDvdFile* param_0, u32 param_1, JKRExpan
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JKRDvdAramRipper::loadToAram_Async(JKRDvdFile* param_0, u32 param_1,
JKRExpandSwitch param_2, void (*)(u32), u32 param_4,
u32 param_5, u32* param_6) {
JKRExpandSwitch param_2, void (*param_3)(u32),
u32 param_4, u32 param_5, u32* param_6) {
nofralloc
#include "asm/JSystem/JKernel/JKRDvdAramRipper/func_802DA9C0.s"
}
@@ -402,7 +402,7 @@ asm void __sinit_JKRDvdAramRipper_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_802DB5E8 = (void*)__sinit_JKRDvdAramRipper_cpp;
REGISTER_CTORS(0x802DB5E8, __sinit_JKRDvdAramRipper_cpp);
#pragma pop
/* 802DB62C-802DB680 2D5F6C 0054+00 1/1 0/0 0/0 .text __dt__23JSUList<12JKRADCommand>Fv
@@ -410,7 +410,7 @@ SECTION_CTORS void* const _ctors_802DB5E8 = (void*)__sinit_JKRDvdAramRipper_cpp;
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802DB62C() {
extern "C" asm void func_802DB62C(void* _this) {
nofralloc
#include "asm/JSystem/JKernel/JKRDvdAramRipper/func_802DB62C.s"
}
libs/JSystem/JKernel/JKRDvdArchive.cpp
+20 -12
View File
@@ -234,6 +234,16 @@ asm void JKRDvdArchive::fetchResource(void* param_0, u32 param_1, JKRArchive::SD
}
#pragma pop
/* ############################################################################################## */
/* 8039D1B0-8039D1B0 029810 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039D1B0 = "JKRDvdArchive.cpp";
SECTION_DEAD static char const* const stringBase_8039D1C2 = "%s";
SECTION_DEAD static char const* const stringBase_8039D1C5 = "Sorry, not applied for SZP archive.\n";
SECTION_DEAD static char const* const stringBase_8039D1EA = "??? bad sequence\n";
#pragma pop
/* 802D826C-802D8474 2D2BAC 0208+00 1/1 1/1 0/0 .text
* fetchResource_subroutine__13JKRDvdArchiveFlUlUlPUcUlii */
#pragma push
@@ -246,6 +256,15 @@ asm void JKRDvdArchive::fetchResource_subroutine(s32 param_0, u32 param_1, u32 p
}
#pragma pop
/* ############################################################################################## */
/* 8039D1B0-8039D1B0 029810 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039D1FC = "Sorry, not applied SZP archive.\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039D21D = "\0\0";
#pragma pop
/* 802D8474-802D8698 2D2DB4 0224+00 1/1 1/1 0/0 .text
* fetchResource_subroutine__13JKRDvdArchiveFlUlUlP7JKRHeapiiPPUc */
#pragma push
@@ -269,15 +288,4 @@ asm void JKRDvdArchive::getExpandedResSize(void const* param_0) const {
}
#pragma pop
/* 8039D1B0-8039D220 029810 006D+03 2/2 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039D1B0 = "JKRDvdArchive.cpp";
SECTION_DEAD static char const* const stringBase_8039D1C2 = "%s";
SECTION_DEAD static char const* const stringBase_8039D1C5 = "Sorry, not applied for SZP archive.\n";
SECTION_DEAD static char const* const stringBase_8039D1EA = "??? bad sequence\n";
SECTION_DEAD static char const* const stringBase_8039D1FC = "Sorry, not applied SZP archive.\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039D21D = "\0\0";
#pragma pop
/* 8039D1B0-8039D1B0 029810 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JKernel/JKRDvdFile.cpp
+16 -14
View File
@@ -31,7 +31,7 @@ template <typename A0>
struct JSUList {};
/* JSUList<JKRDvdFile> */
struct JSUList__template8 {
/* 802D9B44 */ void func_802D9B44();
/* 802D9B44 */ void func_802D9B44(void* _this);
};
struct DVDFileInfo {};
@@ -77,7 +77,7 @@ extern "C" void sync__10JKRDvdFileFv();
extern "C" void doneProcess__10JKRDvdFileFlP11DVDFileInfo();
extern "C" void getFileSize__10JKRDvdFileCFv();
extern "C" void __sinit_JKRDvdFile_cpp();
extern "C" void func_802D9B44();
extern "C" void func_802D9B44(void* _this);
extern "C" extern char const* const JKRDvdFile__stringBase0;
extern "C" u8 sDvdList__10JKRDvdFile[12];
@@ -211,6 +211,17 @@ asm void JKRDvdFile::open(s32 param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 8039D260-8039D260 0298C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039D260 = "JKRDvdFile.cpp";
SECTION_DEAD static char const* const stringBase_8039D26F = "%s";
SECTION_DEAD static char const* const stringBase_8039D272 = "cannot close DVD file\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039D289 = "\0\0\0\0\0\0";
#pragma pop
/* 802D9938-802D99B4 2D4278 007C+00 1/0 0/0 0/0 .text close__10JKRDvdFileFv */
#pragma push
#pragma optimization_level 0
@@ -278,26 +289,17 @@ asm void __sinit_JKRDvdFile_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_802D9B00 = (void*)__sinit_JKRDvdFile_cpp;
REGISTER_CTORS(0x802D9B00, __sinit_JKRDvdFile_cpp);
#pragma pop
/* 802D9B44-802D9B98 2D4484 0054+00 1/1 0/0 0/0 .text __dt__21JSUList<10JKRDvdFile>Fv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802D9B44() {
extern "C" asm void func_802D9B44(void* _this) {
nofralloc
#include "asm/JSystem/JKernel/JKRDvdFile/func_802D9B44.s"
}
#pragma pop
/* 8039D260-8039D290 0298C0 0029+07 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039D260 = "JKRDvdFile.cpp";
SECTION_DEAD static char const* const stringBase_8039D26F = "%s";
SECTION_DEAD static char const* const stringBase_8039D272 = "cannot close DVD file\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039D289 = "\0\0\0\0\0\0";
#pragma pop
/* 8039D260-8039D260 0298C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JKernel/JKRDvdRipper.cpp
+16 -15
View File
@@ -24,7 +24,7 @@ template <typename A0>
struct JSUList {};
/* JSUList<JKRDMCommand> */
struct JSUList__template9 {
/* 802DA820 */ void func_802DA820();
/* 802DA820 */ void func_802DA820(void* _this);
};
struct JKRHeap {
@@ -80,7 +80,7 @@ extern "C" static void firstSrcData__Fv();
extern "C" static void nextSrcData__FPUc();
extern "C" u8 isErrorRetry__12JKRDvdRipperFv();
extern "C" void __sinit_JKRDvdRipper_cpp();
extern "C" void func_802DA820();
extern "C" void func_802DA820(void* _this);
extern "C" extern char const* const JKRDvdRipper__stringBase0;
extern "C" u8 sDvdAsyncList__12JKRDvdRipper[12];
extern "C" u32 sSZSBufferSize__12JKRDvdRipper;
@@ -159,6 +159,17 @@ asm void JKRDvdRipper::loadToMainRAM(s32 param_0, u8* param_1, JKRExpandSwitch p
#pragma pop
/* ############################################################################################## */
/* 8039D290-8039D290 0298F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039D290 = "JKRDvdRipper.cpp";
SECTION_DEAD static char const* const stringBase_8039D2A1 = "%s";
SECTION_DEAD static char const* const stringBase_8039D2A4 = "Sorry, not applied for SZP archive.";
SECTION_DEAD static char const* const stringBase_8039D2C8 = "Not support SZP with offset read";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039D2E9 = "\0\0\0\0\0\0";
#pragma pop
/* 804508C8-804508CC 000348 0004+00 3/2 0/0 0/0 .sdata None */
SECTION_SDATA static u32 data_804508C8 = 0x01000000;
@@ -294,7 +305,7 @@ asm void __sinit_JKRDvdRipper_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_802DA7DC = (void*)__sinit_JKRDvdRipper_cpp;
REGISTER_CTORS(0x802DA7DC, __sinit_JKRDvdRipper_cpp);
#pragma pop
/* 802DA820-802DA874 2D5160 0054+00 1/1 0/0 0/0 .text __dt__23JSUList<12JKRDMCommand>Fv
@@ -302,20 +313,10 @@ SECTION_CTORS void* const _ctors_802DA7DC = (void*)__sinit_JKRDvdRipper_cpp;
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802DA820() {
extern "C" asm void func_802DA820(void* _this) {
nofralloc
#include "asm/JSystem/JKernel/JKRDvdRipper/func_802DA820.s"
}
#pragma pop
/* 8039D290-8039D2F0 0298F0 0059+07 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039D290 = "JKRDvdRipper.cpp";
SECTION_DEAD static char const* const stringBase_8039D2A1 = "%s";
SECTION_DEAD static char const* const stringBase_8039D2A4 = "Sorry, not applied for SZP archive.";
SECTION_DEAD static char const* const stringBase_8039D2C8 = "Not support SZP with offset read";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039D2E9 = "\0\0\0\0\0\0";
#pragma pop
/* 8039D290-8039D290 0298F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JKernel/JKRExpHeap.cpp
+107 -36
View File
@@ -265,6 +265,13 @@ asm JKRExpHeap::~JKRExpHeap() {
}
#pragma pop
/* ############################################################################################## */
/* 8039CAF0-8039CAF0 029150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CAF0 = ":::cannot alloc memory (0x%x byte).\n";
#pragma pop
/* 802CF128-802CF234 2C9A68 010C+00 1/0 0/0 0/0 .text do_alloc__10JKRExpHeapFUli */
#pragma push
#pragma optimization_level 0
@@ -450,6 +457,15 @@ asm void JKRExpHeap::getTotalUsedSize() const {
}
#pragma pop
/* ############################################################################################## */
/* 8039CAF0-8039CAF0 029150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CB15 = "JKRExpHeap.cpp";
SECTION_DEAD static char const* const stringBase_8039CB24 = "%s";
SECTION_DEAD static char const* const stringBase_8039CB27 = "bad appendUsedList\n";
#pragma pop
/* 802CFDCC-802CFE68 2CA70C 009C+00 4/4 0/0 0/0 .text
* appendUsedList__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock */
#pragma push
@@ -507,6 +523,14 @@ asm void JKRExpHeap::recycleFreeBlock(JKRExpHeap::CMemBlock* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 8039CAF0-8039CAF0 029150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CB3B = ":::Heap may be broken. (block = %x)";
SECTION_DEAD static char const* const stringBase_8039CB5F = "Bad Block\n";
#pragma pop
/* 802D00B4-802D0190 2CA9F4 00DC+00 1/1 0/0 0/0 .text
* joinTwoBlocks__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock */
#pragma push
@@ -518,6 +542,25 @@ asm void JKRExpHeap::joinTwoBlocks(JKRExpHeap::CMemBlock* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 8039CAF0-8039CAF0 029150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CB6A =
":::addr %08x: bad heap signature. (%c%c)\n";
SECTION_DEAD static char const* const stringBase_8039CB94 =
":::addr %08x: bad next pointer (%08x)\nabort\n";
SECTION_DEAD static char const* const stringBase_8039CBC1 =
":::addr %08x: bad previous pointer (%08x)\n";
SECTION_DEAD static char const* const stringBase_8039CBEC =
":::addr %08x: bad used list(REV) (%08x)\n";
SECTION_DEAD static char const* const stringBase_8039CC15 = ":::addr %08x: bad block size (%08x)\n";
SECTION_DEAD static char const* const stringBase_8039CC3A =
":::bad total memory block size (%08X, %08X)\n";
SECTION_DEAD static char const* const stringBase_8039CC67 =
":::there is some error in this heap!\n";
#pragma pop
/* 802D0190-802D03B8 2CAAD0 0228+00 1/0 0/0 0/0 .text check__10JKRExpHeapFv */
#pragma push
#pragma optimization_level 0
@@ -529,6 +572,26 @@ asm void JKRExpHeap::check() {
#pragma pop
/* ############################################################################################## */
/* 8039CAF0-8039CAF0 029150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CC8D =
" attr address: size gid aln prev_ptr nex"
"t_ptr\n";
SECTION_DEAD static char const* const stringBase_8039CCC4 = "(Used Blocks)\n";
SECTION_DEAD static char const* const stringBase_8039CCD3 = " NONE\n";
SECTION_DEAD static char const* const stringBase_8039CCDA =
"xxxxx %08x: -------- --- --- (-------- -------"
"-)\nabort\n";
SECTION_DEAD static char const* const stringBase_8039CD14 = "%s %08x: %08x %3d %3d (%08x %08x)\n";
SECTION_DEAD static char const* const stringBase_8039CD39 = " temp";
SECTION_DEAD static char const* const stringBase_8039CD3F = "alloc";
SECTION_DEAD static char const* const stringBase_8039CD45 = "(Free Blocks)\n";
SECTION_DEAD static char const* const stringBase_8039CD54 = " free";
SECTION_DEAD static char const* const stringBase_8039CD5A =
"%d / %d bytes (%6.2f%%) used (U:%d F:%d)\n";
#pragma pop
/* 80455F98-80455FA0 004598 0004+04 2/2 0/0 0/0 .sdata2 @1121 */
SECTION_SDATA2 static f32 lit_1121[1 + 1 /* padding */] = {
100.0f,
@@ -660,52 +723,60 @@ asm void JKRExpHeap::do_getCurrentGroupId() {
}
#pragma pop
/* 8039CAF0-8039CE50 029150 0360+00 6/6 0/0 0/0 .rodata @stringBase0 */
/* ############################################################################################## */
/* 8039CD84-8039CDA0 0293E4 001C+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039CAF0 = ":::cannot alloc memory (0x%x byte).\n";
SECTION_DEAD static char const* const stringBase_8039CB15 = "JKRExpHeap.cpp";
SECTION_DEAD static char const* const stringBase_8039CB24 = "%s";
SECTION_DEAD static char const* const stringBase_8039CB27 = "bad appendUsedList\n";
SECTION_DEAD static char const* const stringBase_8039CB3B = ":::Heap may be broken. (block = %x)";
SECTION_DEAD static char const* const stringBase_8039CB5F = "Bad Block\n";
SECTION_DEAD static char const* const stringBase_8039CB6A =
":::addr %08x: bad heap signature. (%c%c)\n";
SECTION_DEAD static char const* const stringBase_8039CB94 =
":::addr %08x: bad next pointer (%08x)\nabort\n";
SECTION_DEAD static char const* const stringBase_8039CBC1 =
":::addr %08x: bad previous pointer (%08x)\n";
SECTION_DEAD static char const* const stringBase_8039CBEC =
":::addr %08x: bad used list(REV) (%08x)\n";
SECTION_DEAD static char const* const stringBase_8039CC15 = ":::addr %08x: bad block size (%08x)\n";
SECTION_DEAD static char const* const stringBase_8039CC3A =
":::bad total memory block size (%08X, %08X)\n";
SECTION_DEAD static char const* const stringBase_8039CC67 =
":::there is some error in this heap!\n";
SECTION_DEAD static char const* const stringBase_8039CC8D =
" attr address: size gid aln prev_ptr nex"
"t_ptr\n";
SECTION_DEAD static char const* const stringBase_8039CCC4 = "(Used Blocks)\n";
SECTION_DEAD static char const* const stringBase_8039CCD3 = " NONE\n";
SECTION_DEAD static char const* const stringBase_8039CCDA =
"xxxxx %08x: -------- --- --- (-------- -------"
"-)\nabort\n";
SECTION_DEAD static char const* const stringBase_8039CD14 = "%s %08x: %08x %3d %3d (%08x %08x)\n";
SECTION_DEAD static char const* const stringBase_8039CD39 = " temp";
SECTION_DEAD static char const* const stringBase_8039CD3F = "alloc";
SECTION_DEAD static char const* const stringBase_8039CD45 = "(Free Blocks)\n";
SECTION_DEAD static char const* const stringBase_8039CD54 = " free";
SECTION_DEAD static char const* const stringBase_8039CD5A =
"%d / %d bytes (%6.2f%%) used (U:%d F:%d)\n";
SECTION_DEAD static char const* const stringBase_8039CD84 = "+---------------JKRExpHeap\n";
#pragma pop
/* 8039CDA0-8039CDD0 029400 0030+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CDA0 =
"| Align Group size ( prev , next )\n";
#pragma pop
/* 8039CDD0-8039CDE2 029430 0012+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CDD0 = "| ---- FreeFirst\n";
#pragma pop
/* 8039CDE2-8039CDEB 029442 0009+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CDE2 = "| %08x ";
#pragma pop
/* 8039CDEB-8039CE07 02944B 001C+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CDEB = "%2x %3d %6x (%08x %08x)\n";
#pragma pop
/* 8039CE07-8039CE18 029467 0011+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CE07 = "| ---- FreeLast\n";
#pragma pop
/* 8039CE18-8039CE2A 029478 0012+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CE18 = "| ---- UsedFirst\n";
#pragma pop
/* 8039CE2A-8039CE3B 02948A 0011+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CE2A = "| ---- UsedLast\n";
#pragma pop
/* 8039CE3B-8039CE50 02949B 0015+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CE3B = "+---------------End\n";
#pragma pop
/* 8039CAF0-8039CAF0 029150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JKernel/JKRFileCache.cpp
+10 -9
View File
@@ -179,6 +179,15 @@ asm void JKRFileCache::mount(char const* param_0, JKRHeap* param_1, char const*
#pragma pop
/* ############################################################################################## */
/* 8039D158-8039D158 0297B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039D158 = "/";
SECTION_DEAD static char const* const stringBase_8039D15A = "dvd";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039D15E = "\0";
#pragma pop
/* 803CC238-803CC288 029358 004C+04 2/2 0/0 0/0 .data __vt__12JKRFileCache */
SECTION_DATA extern void* __vt__12JKRFileCache[19 + 1 /* padding */] = {
(void*)NULL /* RTTI */,
@@ -447,12 +456,4 @@ asm void JKRFileCache::readNameResource(void* param_0, u32 param_1, u32 param_2,
}
#pragma pop
/* 8039D158-8039D160 0297B8 0006+02 3/3 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039D158 = "/";
SECTION_DEAD static char const* const stringBase_8039D15A = "dvd";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039D15E = "\0";
#pragma pop
/* 8039D158-8039D158 0297B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JKernel/JKRFileLoader.cpp
+13 -12
View File
@@ -25,7 +25,7 @@ template <typename A0>
struct JSUList {};
/* JSUList<JKRFileLoader> */
struct JSUList__template7 {
/* 802D45E4 */ void func_802D45E4();
/* 802D45E4 */ void func_802D45E4(void* _this);
};
struct JKRFileLoader {
@@ -62,7 +62,7 @@ extern "C" void detachResource__13JKRFileLoaderFPvP13JKRFileLoader();
extern "C" void findVolume__13JKRFileLoaderFPPCc();
extern "C" void fetchVolumeName__13JKRFileLoaderFPclPCc();
extern "C" void __sinit_JKRFileLoader_cpp();
extern "C" void func_802D45E4();
extern "C" void func_802D45E4(void* _this);
extern "C" extern char const* const JKRFileLoader__stringBase0;
extern "C" u8 sVolumeList__13JKRFileLoader[12];
extern "C" u8 sCurrentVolume__13JKRFileLoader[4 + 4 /* padding */];
@@ -207,6 +207,14 @@ asm void JKRFileLoader::findVolume(char const** param_0) {
#pragma pop
/* ############################################################################################## */
/* 8039D150-8039D150 0297B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039D150 = "/";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039D152 = "\0\0\0\0\0";
#pragma pop
/* 804508C0-804508C8 000340 0002+06 1/1 0/0 0/0 .sdata rootPath$2498 */
SECTION_SDATA static u8 rootPath[2 + 6 /* padding */] = {
0x2F,
@@ -242,7 +250,7 @@ asm void __sinit_JKRFileLoader_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_802D45A0 = (void*)__sinit_JKRFileLoader_cpp;
REGISTER_CTORS(0x802D45A0, __sinit_JKRFileLoader_cpp);
#pragma pop
/* 802D45E4-802D4638 2CEF24 0054+00 1/1 0/0 0/0 .text __dt__24JSUList<13JKRFileLoader>Fv
@@ -250,17 +258,10 @@ SECTION_CTORS void* const _ctors_802D45A0 = (void*)__sinit_JKRFileLoader_cpp;
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802D45E4() {
extern "C" asm void func_802D45E4(void* _this) {
nofralloc
#include "asm/JSystem/JKernel/JKRFileLoader/func_802D45E4.s"
}
#pragma pop
/* 8039D150-8039D158 0297B0 0002+06 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039D150 = "/";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039D152 = "\0\0\0\0\0";
#pragma pop
/* 8039D150-8039D150 0297B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JKernel/JKRHeap.cpp
+13 -11
View File
@@ -544,6 +544,17 @@ asm void JKRHeap::copyMemory(void* param_0, void* param_1, u32 param_2) {
}
#pragma pop
/* ############################################################################################## */
/* 8039CAD8-8039CAD8 029138 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CAD8 = "JKRHeap.cpp";
SECTION_DEAD static char const* const stringBase_8039CAE4 = "%s";
SECTION_DEAD static char const* const stringBase_8039CAE7 = "abort\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039CAEE = "\0";
#pragma pop
/* 802CEB40-802CEB78 2C9480 0038+00 2/2 0/0 0/0 .text JKRDefaultMemoryErrorRoutine__FPvUli */
#pragma push
#pragma optimization_level 0
@@ -569,7 +580,7 @@ asm void JKRHeap::setErrorFlag(bool param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JKRHeap::setErrorHandler(void (*)(void*, u32, int)) {
asm void JKRHeap::setErrorHandler(void (*param_0)(void*, u32, int)) {
nofralloc
#include "asm/JSystem/JKernel/JKRHeap/setErrorHandler__7JKRHeapFPFPvUli_v.s"
}
@@ -698,13 +709,4 @@ bool JKRHeap::do_getCurrentGroupId() {
return false;
}
/* 8039CAD8-8039CAF0 029138 0016+02 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039CAD8 = "JKRHeap.cpp";
SECTION_DEAD static char const* const stringBase_8039CAE4 = "%s";
SECTION_DEAD static char const* const stringBase_8039CAE7 = "abort\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039CAEE = "\0";
#pragma pop
/* 8039CAD8-8039CAD8 029138 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JKernel/JKRMemArchive.cpp
+12 -10
View File
@@ -265,6 +265,17 @@ asm void JKRMemArchive::removeResource(void* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 8039D160-8039D160 0297C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039D160 = "JKRMemArchive.cpp";
SECTION_DEAD static char const* const stringBase_8039D172 = "%s";
SECTION_DEAD static char const* const stringBase_8039D175 = "??? bad sequence\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039D187 = "";
#pragma pop
/* 802D6F5C-802D7030 2D189C 00D4+00 1/1 1/1 0/0 .text
* fetchResource_subroutine__13JKRMemArchiveFPUcUlPUcUli */
#pragma push
@@ -287,13 +298,4 @@ asm void JKRMemArchive::getExpandedResSize(void const* param_0) const {
}
#pragma pop
/* 8039D160-8039D188 0297C0 0027+01 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039D160 = "JKRMemArchive.cpp";
SECTION_DEAD static char const* const stringBase_8039D172 = "%s";
SECTION_DEAD static char const* const stringBase_8039D175 = "??? bad sequence\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039D187 = "";
#pragma pop
/* 8039D160-8039D160 0297C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JKernel/JKRSolidHeap.cpp
+59 -22
View File
@@ -213,6 +213,14 @@ asm void JKRSolidHeap::do_alloc(u32 param_0, int param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 8039CE50-8039CE50 0294B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CE50 =
"allocFromHead: cannot alloc memory (0x%x byte).\n";
#pragma pop
/* 802D0D58-802D0E20 2CB698 00C8+00 1/1 0/0 0/0 .text allocFromHead__12JKRSolidHeapFUli
*/
#pragma push
@@ -224,6 +232,14 @@ asm void JKRSolidHeap::allocFromHead(u32 param_0, int param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 8039CE50-8039CE50 0294B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CE81 =
"allocFromTail: cannot alloc memory (0x%x byte).\n";
#pragma pop
/* 802D0E20-802D0EE4 2CB760 00C4+00 1/1 0/0 0/0 .text allocFromTail__12JKRSolidHeapFUli
*/
#pragma push
@@ -235,6 +251,14 @@ asm void JKRSolidHeap::allocFromTail(u32 param_0, int param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 8039CE50-8039CE50 0294B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CEB2 =
"free: cannot free memory block (%08x)\n";
#pragma pop
/* 802D0EE4-802D0F14 2CB824 0030+00 1/0 0/0 0/0 .text do_free__12JKRSolidHeapFPv */
#pragma push
#pragma optimization_level 0
@@ -271,6 +295,14 @@ void JKRSolidHeap::do_fillFreeArea() {
/* empty function */
}
/* ############################################################################################## */
/* 8039CE50-8039CE50 0294B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CED9 =
"resize: cannot resize memory block (%08x: %d)\n";
#pragma pop
/* 802D1004-802D1038 2CB944 0034+00 1/0 0/0 0/0 .text do_resize__12JKRSolidHeapFPvUl */
#pragma push
#pragma optimization_level 0
@@ -281,6 +313,14 @@ asm void JKRSolidHeap::do_resize(void* param_0, u32 param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 8039CE50-8039CE50 0294B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CF08 =
"getSize: cannot get memory block size (%08x)\n";
#pragma pop
/* 802D1038-802D106C 2CB978 0034+00 1/0 0/0 0/0 .text do_getSize__12JKRSolidHeapFPv */
#pragma push
#pragma optimization_level 0
@@ -291,6 +331,14 @@ asm void JKRSolidHeap::do_getSize(void* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 8039CE50-8039CE50 0294B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CF36 =
"check: bad total memory block size (%08X, %08X)\n";
#pragma pop
/* 802D106C-802D10FC 2CB9AC 0090+00 1/0 0/0 0/0 .text check__12JKRSolidHeapFv */
#pragma push
#pragma optimization_level 0
@@ -302,6 +350,16 @@ asm void JKRSolidHeap::check() {
#pragma pop
/* ############################################################################################## */
/* 8039CE50-8039CE50 0294B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CF67 = "head %08x: %08x\n";
SECTION_DEAD static char const* const stringBase_8039CF78 = "tail %08x: %08x\n";
SECTION_DEAD static char const* const stringBase_8039CF89 = "%d / %d bytes (%6.2f%%) used\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039CFA7 = "";
#pragma pop
/* 80455FA8-80455FB0 0045A8 0004+04 1/1 0/0 0/0 .sdata2 @693 */
SECTION_SDATA2 static f32 lit_693[1 + 1 /* padding */] = {
100.0f,
@@ -388,25 +446,4 @@ asm void JKRSolidHeap::do_getTotalFreeSize() {
}
#pragma pop
/* 8039CE50-8039CFA8 0294B0 0157+01 7/7 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039CE50 =
"allocFromHead: cannot alloc memory (0x%x byte).\n";
SECTION_DEAD static char const* const stringBase_8039CE81 =
"allocFromTail: cannot alloc memory (0x%x byte).\n";
SECTION_DEAD static char const* const stringBase_8039CEB2 =
"free: cannot free memory block (%08x)\n";
SECTION_DEAD static char const* const stringBase_8039CED9 =
"resize: cannot resize memory block (%08x: %d)\n";
SECTION_DEAD static char const* const stringBase_8039CF08 =
"getSize: cannot get memory block size (%08x)\n";
SECTION_DEAD static char const* const stringBase_8039CF36 =
"check: bad total memory block size (%08X, %08X)\n";
SECTION_DEAD static char const* const stringBase_8039CF67 = "head %08x: %08x\n";
SECTION_DEAD static char const* const stringBase_8039CF78 = "tail %08x: %08x\n";
SECTION_DEAD static char const* const stringBase_8039CF89 = "%d / %d bytes (%6.2f%%) used\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039CFA7 = "";
#pragma pop
/* 8039CE50-8039CE50 0294B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JKernel/JKRThread.cpp
+31 -25
View File
@@ -36,12 +36,12 @@ template <typename A0>
struct JSUList {};
/* JSUList<JKRTask> */
struct JSUList__template3 {
/* 802D1EFC */ void func_802D1EFC();
/* 802D1EFC */ void func_802D1EFC(void* _this);
};
/* JSUList<JKRThread> */
struct JSUList__template4 {
/* 802D1F50 */ void func_802D1F50();
/* 802D1F50 */ void func_802D1F50(void* _this);
};
struct JKRHeap {
@@ -119,8 +119,8 @@ extern "C" bool run__9JKRThreadFv();
extern "C" void draw__15JKRThreadSwitchFP14JKRThreadName_();
extern "C" void __dt__15JKRThreadSwitchFv();
extern "C" void __sinit_JKRThread_cpp();
extern "C" void func_802D1EFC();
extern "C" void func_802D1F50();
extern "C" void func_802D1EFC(void* _this);
extern "C" void func_802D1F50(void* _this);
extern "C" extern char const* const JKRThread__stringBase0;
extern "C" u8 sThreadList__9JKRThread[12];
extern "C" u8 sTaskList__7JKRTask[12];
@@ -338,6 +338,17 @@ asm void JKRThreadSwitch::enter(JKRThread* param_0, int param_1) {
#pragma pop
/* ############################################################################################## */
/* 8039CFA8-8039CFA8 029608 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039CFA8 = "on";
SECTION_DEAD static char const* const stringBase_8039CFAB = "off";
SECTION_DEAD static char const* const stringBase_8039CFAF =
"JKRThread:%x OSThread:%x Load:ID:%d (%s)\n";
SECTION_DEAD static char const* const stringBase_8039CFDC =
"JKRThreadSwitch: currentHeap destroyed.\n";
#pragma pop
/* 804513C0-804513C4 0008C0 0004+00 1/1 0/0 0/0 .sbss mUserPreCallback__15JKRThreadSwitch
*/
u8 JKRThreadSwitch::mUserPreCallback[4];
@@ -357,6 +368,18 @@ asm void JKRThreadSwitch::callback(OSThread* param_0, OSThread* param_1) {
#pragma pop
/* ############################################################################################## */
/* 8039CFA8-8039CFA8 029608 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039D005 = " total: switch:%3d time:%d(%df)\n";
SECTION_DEAD static char const* const stringBase_8039D027 =
" -------------------------------------\n";
SECTION_DEAD static char const* const stringBase_8039D04F = "%d";
SECTION_DEAD static char const* const stringBase_8039D052 = " [%10s] switch:%5d cost:%2d.%d%%\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039D075 = "\0\0";
#pragma pop
/* 80455FC0-80455FC4 0045C0 0004+00 1/1 0/0 0/0 .sdata2 @934 */
SECTION_SDATA2 static f32 lit_934 = 100.0f;
@@ -427,14 +450,14 @@ asm void __sinit_JKRThread_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_802D1E94 = (void*)__sinit_JKRThread_cpp;
REGISTER_CTORS(0x802D1E94, __sinit_JKRThread_cpp);
#pragma pop
/* 802D1EFC-802D1F50 2CC83C 0054+00 1/1 0/0 0/0 .text __dt__17JSUList<7JKRTask>Fv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802D1EFC() {
extern "C" asm void func_802D1EFC(void* _this) {
nofralloc
#include "asm/JSystem/JKernel/JKRThread/func_802D1EFC.s"
}
@@ -444,7 +467,7 @@ extern "C" asm void func_802D1EFC() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802D1F50() {
extern "C" asm void func_802D1F50(void* _this) {
nofralloc
#include "asm/JSystem/JKernel/JKRThread/func_802D1F50.s"
}
@@ -457,21 +480,4 @@ extern "C" asm void func_802D1F50() {
u8 JKRTask::sEndMesgQueue[32];
#pragma pop
/* 8039CFA8-8039D078 029608 00CD+03 2/2 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039CFA8 = "on";
SECTION_DEAD static char const* const stringBase_8039CFAB = "off";
SECTION_DEAD static char const* const stringBase_8039CFAF =
"JKRThread:%x OSThread:%x Load:ID:%d (%s)\n";
SECTION_DEAD static char const* const stringBase_8039CFDC =
"JKRThreadSwitch: currentHeap destroyed.\n";
SECTION_DEAD static char const* const stringBase_8039D005 = " total: switch:%3d time:%d(%df)\n";
SECTION_DEAD static char const* const stringBase_8039D027 =
" -------------------------------------\n";
SECTION_DEAD static char const* const stringBase_8039D04F = "%d";
SECTION_DEAD static char const* const stringBase_8039D052 = " [%10s] switch:%5d cost:%2d.%d%%\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039D075 = "\0\0";
#pragma pop
/* 8039CFA8-8039CFA8 029608 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JMath/JMATrigonometric.cpp
+4 -4
View File
@@ -16,7 +16,7 @@ template <typename A1, typename B1>
struct pair {};
/* pair<f32, f32> */
struct pair__template0 {
/* 80339CB0 */ void func_80339CB0();
/* 80339CB0 */ void func_80339CB0(void* _this);
};
}; // namespace std
@@ -32,7 +32,7 @@ struct JMath {
//
extern "C" void __sinit_JMATrigonometric_cpp();
extern "C" void func_80339CB0();
extern "C" void func_80339CB0(void* _this);
extern "C" u8 sincosTable___5JMath[65536];
extern "C" f32 atanTable___5JMath[1032];
extern "C" f32 asinAcosTable___5JMath[1032];
@@ -101,14 +101,14 @@ asm void __sinit_JMATrigonometric_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80339AEC = (void*)__sinit_JMATrigonometric_cpp;
REGISTER_CTORS(0x80339AEC, __sinit_JMATrigonometric_cpp);
#pragma pop
/* 80339CB0-80339CC0 3345F0 0010+00 1/1 0/0 0/0 .text __ct__Q23std9pair<f,f>Fv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80339CB0() {
extern "C" asm void func_80339CB0(void* _this) {
nofralloc
#include "asm/JSystem/JMath/JMATrigonometric/func_80339CB0.s"
}
libs/JSystem/JMath/random.cpp
+3 -8
View File
@@ -31,12 +31,7 @@ extern "C" void __ct__Q25JMath13TRandom_fast_FUl();
// Declarations:
//
/* 80339AE4-80339AEC 334424 0008+00 0/0 3/3 0/0 .text __ct__Q25JMath13TRandom_fast_FUl */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm JMath::TRandom_fast_::TRandom_fast_(u32 param_0) {
nofralloc
#include "asm/JSystem/JMath/random/__ct__Q25JMath13TRandom_fast_FUl.s"
/* 80339AE4-80339AEC -00001 0008+00 0/0 0/0 0/0 .text __ct__Q25JMath13TRandom_fast_FUl */
JMath::TRandom_fast_::TRandom_fast_(u32 param_0) {
*(u32*)this = (u32)(param_0);
}
#pragma pop
libs/JSystem/JMessage/processor.cpp
+5 -5
View File
@@ -378,7 +378,7 @@ asm void JMessage::TProcessor::toMessageCode_messageID(u32 param_0, u32 param_1,
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JMessage::TProcessor::on_select_begin(char const* (*)(JMessage::TProcessor*),
asm void JMessage::TProcessor::on_select_begin(char const* (*param_0)(JMessage::TProcessor*),
void const* param_1, char const* param_2,
u32 param_3) {
nofralloc
@@ -588,9 +588,8 @@ asm void JMessage::TSequenceProcessor::on_isReady() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void
JMessage::TSequenceProcessor::on_jump_register(void const* (*)(JMessage::TSequenceProcessor const*),
u32 param_1) {
asm void JMessage::TSequenceProcessor::on_jump_register(
void const* (*param_0)(JMessage::TSequenceProcessor const*), u32 param_1) {
nofralloc
#include "asm/JSystem/JMessage/processor/func_802A85D0.s"
}
@@ -625,7 +624,8 @@ asm void JMessage::TSequenceProcessor::on_jump(void const* param_0, char const*
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JMessage::TSequenceProcessor::on_branch_register(
void const* (*)(JMessage::TSequenceProcessor const*, u32), void const* param_1, u32 param_2) {
void const* (*param_0)(JMessage::TSequenceProcessor const*, u32), void const* param_1,
u32 param_2) {
nofralloc
#include "asm/JSystem/JMessage/processor/func_802A8690.s"
}
libs/JSystem/JMessage/resource.cpp
+4 -3
View File
@@ -15,7 +15,7 @@ namespace std {
template <typename A1, typename B1>
void lower_bound(/* ... */);
/* 802A94D4 */ /* std::lower_bound<u32 const*, u32> */
void func_802A94D4(u32 const*, u32 const*, u32 const&);
void func_802A94D4(void* _this, u32 const*, u32 const*, u32 const&);
}; // namespace std
struct JMessage {
@@ -96,7 +96,7 @@ extern "C" void parseHeader_next__Q28JMessage6TParseFPPCvPUlUl();
extern "C" void parseBlock_next__Q28JMessage6TParseFPPCvPUlUl();
extern "C" void parseCharacter_1Byte__Q28JMessage6localeFPPCc();
extern "C" void parseCharacter_2Byte__Q28JMessage6localeFPPCc();
extern "C" void func_802A94D4(u32 const*, u32 const*, u32 const&);
extern "C" void func_802A94D4(void* _this, u32 const*, u32 const*, u32 const&);
extern "C" void* sapfnParseCharacter___Q28JMessage18TResourceContainer[5];
//
@@ -326,7 +326,8 @@ asm void JMessage::locale::parseCharacter_2Byte(char const** param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_802A94D4(u32 const* param_0, u32 const* param_1, u32 const& param_2) {
extern "C" asm void func_802A94D4(void* _this, u32 const* param_0, u32 const* param_1,
u32 const& param_2) {
nofralloc
#include "asm/JSystem/JMessage/resource/func_802A94D4.s"
}
libs/JSystem/JParticle/JPAChildShape.cpp
+3 -8
View File
@@ -78,12 +78,7 @@ asm void JPACalcChildScaleOut(JPAEmitterWorkData* param_0, JPABaseParticle* para
}
#pragma pop
/* 8027B038-8027B040 275978 0008+00 0/0 1/1 0/0 .text __ct__13JPAChildShapeFPCUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm JPAChildShape::JPAChildShape(u8 const* param_0) {
nofralloc
#include "asm/JSystem/JParticle/JPAChildShape/__ct__13JPAChildShapeFPCUc.s"
/* 8027B038-8027B040 -00001 0008+00 0/0 0/0 0/0 .text __ct__13JPAChildShapeFPCUc */
JPAChildShape::JPAChildShape(u8 const* param_0) {
*(u32*)this = (u32)(param_0);
}
#pragma pop
libs/JSystem/JParticle/JPAEmitterManager.cpp
+16 -16
View File
@@ -28,8 +28,8 @@ template <typename A0>
struct JSUList {};
/* JSUList<JPABaseEmitter> */
struct JSUList__template1 {
/* 8027E51C */ void func_8027E51C();
/* 8027E598 */ void func_8027E598();
/* 8027E51C */ void func_8027E51C(void* _this);
/* 8027E598 */ void func_8027E598(void* _this);
};
struct JPAResourceManager {
@@ -45,15 +45,15 @@ struct JGeometry {
struct TVec3__template0 {};
};
struct JPADrawInfo {};
struct JPAParticleCallBack {};
struct JKRHeap {};
struct JPADrawInfo {};
struct JPAEmitterCallBack {};
struct JPABaseEmitter;
struct JPAParticleCallBack {};
struct JKRHeap {};
struct JPABaseEmitter;
struct JPAEmitterManager {
/* 8027DCA0 */ JPAEmitterManager(u32, u32, JKRHeap*, u8, u8);
/* 8027DEBC */ void createSimpleEmitterID(JGeometry::TVec3<f32> const&, u16, u8, u8,
@@ -85,8 +85,8 @@ template <typename A0>
struct JPANode {};
/* JPANode<JPABaseParticle> */
struct JPANode__template0 {
/* 8027E54C */ void func_8027E54C();
/* 8027E588 */ void func_8027E588();
/* 8027E54C */ void func_8027E54C(void* _this);
/* 8027E588 */ void func_8027E588(void* _this);
};
//
@@ -103,10 +103,10 @@ extern "C" void forceDeleteEmitter__17JPAEmitterManagerFP14JPABaseEmitter();
extern "C" void entryResourceManager__17JPAEmitterManagerFP18JPAResourceManagerUc();
extern "C" void clearResourceManager__17JPAEmitterManagerFUc();
extern "C" void calcYBBCam__17JPAEmitterManagerFv();
extern "C" void func_8027E51C();
extern "C" void func_8027E54C();
extern "C" void func_8027E588();
extern "C" void func_8027E598();
extern "C" void func_8027E51C(void* _this);
extern "C" void func_8027E54C(void* _this);
extern "C" void func_8027E588(void* _this);
extern "C" void func_8027E598(void* _this);
extern "C" void __dt__14JPABaseEmitterFv();
extern "C" void __ct__14JPABaseEmitterFv();
@@ -300,7 +300,7 @@ asm void JPAEmitterManager::calcYBBCam() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8027E51C() {
extern "C" asm void func_8027E51C(void* _this) {
nofralloc
#include "asm/JSystem/JParticle/JPAEmitterManager/func_8027E51C.s"
}
@@ -310,7 +310,7 @@ extern "C" asm void func_8027E51C() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8027E54C() {
extern "C" asm void func_8027E54C(void* _this) {
nofralloc
#include "asm/JSystem/JParticle/JPAEmitterManager/func_8027E54C.s"
}
@@ -320,7 +320,7 @@ extern "C" asm void func_8027E54C() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8027E588() {
extern "C" asm void func_8027E588(void* _this) {
nofralloc
#include "asm/JSystem/JParticle/JPAEmitterManager/func_8027E588.s"
}
@@ -331,7 +331,7 @@ extern "C" asm void func_8027E588() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8027E598() {
extern "C" asm void func_8027E598(void* _this) {
nofralloc
#include "asm/JSystem/JParticle/JPAEmitterManager/func_8027E598.s"
}
libs/JSystem/JParticle/JPAExTexShape.cpp
+3 -8
View File
@@ -51,12 +51,7 @@ asm void JPALoadExTex(JPAEmitterWorkData* param_0) {
}
#pragma pop
/* 8027B13C-8027B144 275A7C 0008+00 0/0 1/1 0/0 .text __ct__13JPAExTexShapeFPCUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm JPAExTexShape::JPAExTexShape(u8 const* param_0) {
nofralloc
#include "asm/JSystem/JParticle/JPAExTexShape/__ct__13JPAExTexShapeFPCUc.s"
/* 8027B13C-8027B144 -00001 0008+00 0/0 0/0 0/0 .text __ct__13JPAExTexShapeFPCUc */
JPAExTexShape::JPAExTexShape(u8 const* param_0) {
*(u32*)this = (u32)(param_0);
}
#pragma pop
libs/JSystem/JParticle/JPAFieldBlock.cpp
+2 -2
View File
@@ -11,8 +11,6 @@
// Types:
//
struct JPABaseParticle {};
struct JPAEmitterWorkData {};
struct JKRHeap {};
@@ -22,6 +20,8 @@ struct JPAFieldBlock {
/* 8027D0C0 */ void init(JKRHeap*);
};
struct JPABaseParticle {};
struct JPAFieldVortex {
/* 8027C56C */ void prepare(JPAEmitterWorkData*, JPAFieldBlock*);
/* 8027C674 */ void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*);

Some files were not shown because too many files have changed in this diff Show More