mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-30 16:04:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

auto decompile more functions

Browse Source
This commit is contained in:
Julgodis
2021-04-08 21:05:48 +02:00
parent a23a106399
commit 2661db6aaa
559 changed files with 3534 additions and 3686 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/J2DGraph/J2DMatBlock.cpp
+4 -4
View File
@@ -77,15 +77,15 @@ struct J2DTevOrder {
/* 802F1B70 */ J2DTevOrder();
};
struct J2DGXColorS10 {
/* 802F1B90 */ J2DGXColorS10();
};
struct J2DIndTevStage {
/* 802EA044 */ void load(u8);
/* 802F18A0 */ J2DIndTevStage();
};
struct J2DGXColorS10 {
/* 802F1B90 */ J2DGXColorS10();
};
struct J2DTevBlock8 {
/* 802EED64 */ J2DTevBlock8();
/* 802EEE8C */ ~J2DTevBlock8();
libs/JSystem/J2DGraph/J2DMaterial.cpp
+6 -6
View File
@@ -86,6 +86,12 @@ 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;
};
@@ -95,12 +101,6 @@ struct J2DAnmTevRegKey {
/* 8030C3B4 */ void getTevKonstReg(u16, _GXColor*) const;
};
struct J2DAnmTexPattern {
/* 8030BEE8 */ void getTexNo(u16, u16*) const;
/* 8030BF9C */ void getResTIMG(u16) const;
/* 8030BFF0 */ void getPalette(u16) const;
};
struct J2DMaterial {
struct J2DMaterialAnmPointer {
/* 802EA79C */ J2DMaterialAnmPointer();
libs/JSystem/J2DGraph/J2DMaterialFactory.cpp
+2 -2
View File
@@ -38,13 +38,13 @@ struct J2DResReference {
/* 8030CF44 */ void getName(u16) const;
};
struct J2DMaterialBlock {};
struct J2DMaterial {
/* 802EA410 */ void createTevBlock(int, bool);
/* 802EA5C4 */ void createIndBlock(int, bool);
};
struct J2DMaterialBlock {};
struct J2DMaterialFactory {
/* 802F2AD0 */ J2DMaterialFactory(J2DMaterialBlock const&);
/* 802F2C94 */ void countStages(int) const;
libs/JSystem/J2DGraph/J2DPane.cpp
+9 -9
View File
@@ -60,29 +60,29 @@ struct J2DScreen {
struct J2DRotateAxis {};
struct J2DAnmVtxColor {};
struct J2DAnmTexPattern {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmTevRegKey {};
struct J2DAnmTransform {};
struct J2DBasePosition {};
struct J2DGrafContext {
/* 802E8E20 */ void setScissor();
/* 802E90C0 */ void scissor(JGeometry::TBox2<f32> const&);
};
struct J2DAnmVtxColor {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmVisibilityFull {};
struct J2DAnmColor {};
struct J2DBasePosition {};
struct J2DAnmVisibilityFull {};
struct J2DAnmTransform {};
struct J2DAnmBase {};
struct J2DAnmTexPattern {};
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
/* 80053BC0 */ void calcMtx();
libs/JSystem/J2DGraph/J2DPicture.cpp
+12 -12
View File
@@ -75,23 +75,21 @@ struct J2DScreen {
struct J2DMirror {};
struct J2DBinding {};
struct J2DAnmColor {};
struct J2DAnmTevRegKey {};
struct J2DAnmVisibilityFull {};
struct J2DAnmBase {};
struct J2DAnmTransform {};
struct J2DAnmTexPattern {};
struct J2DAnmVtxColor {};
struct J2DAnmVisibilityFull {};
struct J2DAnmColor {};
struct J2DAnmTransform {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmTexPattern {};
struct J2DAnmTevRegKey {};
struct J2DAnmBase {};
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
@@ -136,6 +134,8 @@ struct J2DPane {
struct J2DMaterial {};
struct J2DBinding {};
struct J2DPicture {
/* 800202CC */ void setBlendRatio(f32, f32);
/* 802FF208 */ void append(JUTTexture*, f32);
libs/JSystem/J2DGraph/J2DPictureEx.cpp
+15 -15
View File
@@ -71,18 +71,30 @@ struct J2DScreen {
/* 802F9640 */ void getNameResource(char const*);
};
struct J2DAnmTevRegKey {};
struct J2DAnmTransform {};
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 J2DPane {
@@ -110,18 +122,6 @@ struct J2DPane {
/* 802F8474 */ void update();
};
struct J2DAnmTexPattern {};
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 {};
libs/JSystem/J2DGraph/J2DScreen.cpp
+21 -21
View File
@@ -52,15 +52,33 @@ 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 J2DAnmBase {};
struct J2DAnmVtxColor {};
struct J2DAnmTransform {};
struct J2DGrafContext {};
struct J2DAnmBase {};
struct J2DAnmVtxColor {};
struct J2DGrafContext {};
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
@@ -91,24 +109,6 @@ struct J2DPane {
/* 802F8478 */ void drawSelf(f32, f32);
};
struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
struct J2DAnmTevRegKey {};
struct J2DAnmTexPattern {};
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/J2DTextBox.cpp
+10 -10
View File
@@ -53,21 +53,21 @@ struct J2DTextBoxVBinding {};
struct J2DTextBoxHBinding {};
struct J2DAnmColor {};
struct J2DAnmTevRegKey {};
struct J2DAnmVisibilityFull {};
struct J2DAnmBase {};
struct J2DAnmTransform {};
struct J2DAnmTexPattern {};
struct J2DAnmVtxColor {};
struct J2DAnmVisibilityFull {};
struct J2DAnmColor {};
struct J2DAnmTransform {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmTexPattern {};
struct J2DAnmTevRegKey {};
struct J2DAnmBase {};
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
libs/JSystem/J2DGraph/J2DTextBoxEx.cpp
+16 -16
View File
@@ -38,20 +38,30 @@ struct J2DTextBoxVBinding {};
struct J2DTextBoxHBinding {};
struct J2DAnmTevRegKey {};
struct J2DAnmTransform {};
struct J2DTevStage {};
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 J2DPane {
@@ -77,17 +87,7 @@ struct J2DPane {
/* 802F8474 */ void update();
};
struct J2DAnmTexPattern {};
struct J2DAnmColor {};
struct J2DMaterial {
/* 802EA38C */ void setGX();
/* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
/* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
/* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
/* 802EA89C */ void setAnimation(J2DAnmColor*);
};
struct J2DTevStage {};
struct J2DTextBoxEx {
struct stage_enum {};
libs/JSystem/J2DGraph/J2DWindow.cpp
+10 -10
View File
@@ -57,21 +57,21 @@ struct JGeometry {
struct TBox2__template0 {};
};
struct J2DAnmColor {};
struct J2DAnmTevRegKey {};
struct J2DAnmVisibilityFull {};
struct J2DAnmBase {};
struct J2DAnmTransform {};
struct J2DAnmTexPattern {};
struct J2DAnmVtxColor {};
struct J2DAnmVisibilityFull {};
struct J2DAnmColor {};
struct J2DAnmTransform {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmTexPattern {};
struct J2DAnmTevRegKey {};
struct J2DAnmBase {};
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
libs/JSystem/J2DGraph/J2DWindowEx.cpp
+26 -26
View File
@@ -41,22 +41,42 @@ struct JGeometry {
struct TBox2__template0 {};
};
struct J2DAnmTevRegKey {};
struct J2DAnmTransform {};
struct J2DTevStage {};
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 J2DAnmBase {};
struct J2DPane {
@@ -85,27 +105,7 @@ struct J2DPane {
/* 802F8474 */ void update();
};
struct J2DAnmTexPattern {};
struct J2DAnmColor {};
struct J2DWindow {
struct TMaterial {};
/* 802F9A7C */ J2DWindow();
/* 802FA880 */ ~J2DWindow();
/* 802FB000 */ void resize(f32, f32);
/* 802FB1D8 */ void drawSelf(f32, f32);
/* 802FBF98 */ s32 getTypeID() const;
};
struct J2DMaterial {
/* 802EA38C */ void setGX();
/* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
/* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
/* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
/* 802EA89C */ void setAnimation(J2DAnmColor*);
};
struct J2DTevStage {};
struct J2DWindowEx {
struct stage_enum {};
libs/JSystem/J3DGraphAnimator/J3DCluster.cpp
+2 -2
View File
@@ -29,10 +29,10 @@ struct J3DDeformData {
/* 8032E364 */ void setAnm(J3DAnmCluster*);
};
struct J3DClusterKey {};
struct J3DCluster {};
struct J3DClusterKey {};
struct J3DDeformer {
/* 8032E39C */ J3DDeformer(J3DDeformData*);
/* 8032EAB4 */ void deform(J3DVertexBuffer*, u16, f32*);
libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp
+4 -4
View File
@@ -23,13 +23,13 @@ struct J3DTevKColorAnm {};
struct J3DTevColorAnm {};
struct J3DAnmColor {};
struct J3DAnmTexPattern {};
struct J3DAnmTextureSRTKey {};
struct J3DAnmTevRegKey {};
struct J3DAnmTextureSRTKey {};
struct J3DAnmColor {};
struct J3DAnmTexPattern {};
struct J3DMaterialTable {
/* 8032F5A8 */ void clear();
libs/JSystem/J3DGraphAnimator/J3DModel.cpp
+5 -5
View File
@@ -14,11 +14,6 @@
struct Vec {};
struct J3DModel;
struct J3DDeformData {
/* 8032E230 */ void offAllFlag(u32);
/* 8032E274 */ void deform(J3DModel*);
};
struct J3DModelData {
/* 803260F8 */ void syncJ3DSysFlags() const;
};
@@ -31,6 +26,11 @@ struct J3DSkinDeform {
/* 8032DFDC */ void deform(J3DModel*);
};
struct J3DDeformData {
/* 8032E230 */ void offAllFlag(u32);
/* 8032E274 */ void deform(J3DModel*);
};
struct J3DModel {
/* 80327100 */ void initialize();
/* 80327184 */ void entryModelData(J3DModelData*, u32, u32);
libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp
+2 -2
View File
@@ -27,10 +27,10 @@ struct J3DSkinNList {
/* 8032C8E4 */ void calcSkin_VtxNrmF32(f32 (*)[4], void*, void*);
};
struct J3DModelData {};
struct J3DMtxBuffer {};
struct J3DModelData {};
struct J3DSkinDeform {
/* 8032C96C */ J3DSkinDeform();
/* 8032C9B0 */ void initSkinInfo(J3DModelData*);
libs/JSystem/J3DGraphBase/J3DMatBlock.cpp
+6 -6
View File
@@ -45,8 +45,6 @@ struct J3DTexMtx {
/* 80323C0C */ void calcPostTexMtx(f32 const (*)[4]);
};
struct J3DTexCoord {};
struct J3DNBTScale {};
struct J3DTexGenBlock {
@@ -55,6 +53,8 @@ struct J3DTexGenBlock {
/* 80317424 */ void setNBTScale(J3DNBTScale const*);
};
struct J3DTexCoord {};
struct J3DTexGenBlockPatched {
/* 80317180 */ ~J3DTexGenBlockPatched();
/* 80317644 */ void initialize();
@@ -115,10 +115,10 @@ struct J3DTevStage {};
struct J3DTevOrder {};
struct J3DIndTevStage {};
struct J3DGXColorS10 {};
struct J3DIndTevStage {};
struct J3DGXColor {};
struct J3DTevBlock {
@@ -452,10 +452,10 @@ struct J3DPEBlockOpa {
/* 80323334 */ ~J3DPEBlockOpa();
};
struct J3DBlend {};
struct J3DAlphaComp {};
struct J3DBlend {};
struct J3DFog {};
struct J3DPEBlock {
libs/JSystem/J3DGraphBase/J3DMaterial.cpp
+4 -4
View File
@@ -30,12 +30,12 @@ struct J3DTexGenBlock4 {
/* 80317674 */ void initialize();
};
struct J3DNBTScale {};
struct J3DTexCoord {
/* 8000E464 */ J3DTexCoord();
};
struct J3DNBTScale {};
struct J3DTexGenBlock {
/* 8000DFD8 */ bool getTexMtx(u32);
/* 8000DFE0 */ bool getTexCoord(u32);
@@ -109,10 +109,10 @@ struct J3DPEBlockFogOff {
struct J3DBlend {};
struct J3DAlphaComp {};
struct J3DFog {};
struct J3DAlphaComp {};
struct J3DPEBlock {
/* 8000DBCC */ void patch();
/* 8000DF3C */ bool getZCompLoc() const;
libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
+5 -5
View File
@@ -79,15 +79,15 @@ struct J3DAnmLoader {
/* 80339800 */ ~J3DAnmLoader();
};
struct J3DAnmClusterKey {};
struct J3DAnmColorKeyData {};
struct J3DAnmClusterKeyData {};
struct J3DAnmColorKey {
/* 8032AB00 */ J3DAnmColorKey();
};
struct J3DAnmClusterKeyData {};
struct J3DAnmClusterKey {};
struct J3DAnmKeyLoader_v15 {
/* 803384E0 */ J3DAnmKeyLoader_v15();
@@ -108,14 +108,14 @@ struct J3DAnmKeyLoader_v15 {
/* 80339634 */ void setAnmVtxColor(J3DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*);
};
struct J3DAnmColorFullData {};
struct J3DAnmColorFull {
/* 8032A93C */ J3DAnmColorFull();
};
struct J3DAnmClusterFullData {};
struct J3DAnmColorFullData {};
struct J3DAnmClusterFull {};
struct J3DAnmFullLoader_v15 {
libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
+10 -10
View File
@@ -79,10 +79,6 @@ struct J3DTevBlockPatched {
/* 803176E0 */ void initialize();
};
struct J3DIndTevStage {
/* 8000E14C */ J3DIndTevStage();
};
struct J3DGXColorS10 {
/* 8000E460 */ J3DGXColorS10();
};
@@ -91,6 +87,10 @@ struct J3DGXColor {
/* 8000E538 */ J3DGXColor();
};
struct J3DIndTevStage {
/* 8000E14C */ J3DIndTevStage();
};
struct J3DTevBlock {
/* 8000DBC8 */ void patchTexNoAndTexCoordScale();
/* 8000DBD4 */ void patch();
@@ -164,10 +164,10 @@ struct J3DPEBlockNull {
struct J3DBlend {};
struct J3DAlphaComp {};
struct J3DFog {};
struct J3DAlphaComp {};
struct J3DPEBlock {
/* 8000DBCC */ void patch();
/* 8000DF3C */ bool getZCompLoc() const;
@@ -197,10 +197,6 @@ struct J3DPEBlock {
/* 80317394 */ void setFogOffset(u32);
};
struct J3DMaterialDLBlock {};
struct J3DMaterialBlock {};
struct J3DMaterial {
/* 803157A0 */ void createColorBlock(u32);
/* 803159A0 */ void createTexGenBlock(u32);
@@ -216,6 +212,10 @@ struct J3DMaterial {
/* 80332B94 */ ~J3DMaterial();
};
struct J3DMaterialBlock {};
struct J3DMaterialDLBlock {};
struct J3DMaterialFactory {
struct MaterialType {};
libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp
+2 -2
View File
@@ -22,8 +22,6 @@ struct J3DTevStage {
/* 8003AACC */ J3DTevStage(J3DTevStageInfo const&);
};
struct J3DMaterialBlock_v21 {};
struct J3DMaterial {
/* 803157A0 */ void createColorBlock(u32);
/* 803159A0 */ void createTexGenBlock(u32);
@@ -33,6 +31,8 @@ struct J3DMaterial {
/* 80316240 */ void initialize();
};
struct J3DMaterialBlock_v21 {};
struct J3DMaterialFactory_v21 {
/* 80332DA4 */ J3DMaterialFactory_v21(J3DMaterialBlock_v21 const&);
/* 80332F84 */ void countUniqueMaterials();
libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp
+4 -4
View File
@@ -126,16 +126,16 @@ struct J3DModelLoaderDataBase {
/* 803346BC */ void load(void const*, u32);
};
struct J3DMaterialDLBlock {};
struct J3DEnvelopeBlock {};
struct J3DModelInfoBlock {};
struct J3DJointBlock {};
struct J3DDrawBlock {};
struct J3DEnvelopeBlock {};
struct J3DMaterialDLBlock {};
struct J3DModelLoader {
/* 8033468C */ J3DModelLoader();
/* 803347E0 */ void load(void const*, u32);
libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
+4 -4
View File
@@ -28,16 +28,16 @@ struct J3DModelLoader_v26 {
/* 80336F60 */ void calcSizeMaterialTable(J3DMaterialBlock const*, u32);
};
struct J3DMaterialDLBlock {};
struct J3DEnvelopeBlock {};
struct J3DModelInfoBlock {};
struct J3DJointBlock {};
struct J3DDrawBlock {};
struct J3DEnvelopeBlock {};
struct J3DMaterialDLBlock {};
struct J3DModelLoader {
/* 80336794 */ void countMaterialNum(void const*);
/* 803367D4 */ void calcLoadSize(void const*, u32);
libs/JSystem/JAudio2/JAISeqMgr.cpp
+1 -1
View File
@@ -66,9 +66,9 @@ struct JAISound {
/* 802A24DC */ void stop(u32);
};
struct JAISeqMgr;
struct JAIAudience {};
struct JAISeqMgr;
struct JAISeq {
/* 802A0A8C */ JAISeq(JAISeqMgr*, JAISoundStrategyMgr<JAISeq>*);
/* 802A0B64 */ void JAISeqMgr_startID_(JAISoundID, JGeometry::TVec3<f32> const*, JAIAudience*,
libs/JSystem/JAudio2/JAISoundStarter.cpp
+2 -2
View File
@@ -18,10 +18,10 @@ struct JGeometry {
struct TVec3__template0 {};
};
struct JAISoundHandle {};
struct JAISoundID {};
struct JAISoundHandle {};
struct JAISoundStarter {
/* 802A2F6C */ JAISoundStarter(bool);
/* 802A2F88 */ ~JAISoundStarter();
libs/JSystem/JAudio2/JAIStream.cpp
+2 -2
View File
@@ -49,8 +49,6 @@ struct JASAramStream {
struct JAIStreamMgr {};
struct JAIAudience {};
template <typename A0>
struct JAISoundStrategyMgr {};
/* JAISoundStrategyMgr<JAIStream> */
@@ -58,6 +56,8 @@ struct JAISoundStrategyMgr__template2 {};
struct JAISoundID {};
struct JAIAudience {};
struct JAISoundActivity {};
struct JAIStream {
libs/JSystem/JAudio2/JAIStreamMgr.cpp
+4 -4
View File
@@ -44,10 +44,10 @@ struct JASGenericMemPool {
/* 80290994 */ void free(void*, u32);
};
struct JAISoundHandle {};
struct JAISoundID {};
struct JAISoundHandle {};
struct JAIStreamMgr {
/* 802A3B68 */ JAIStreamMgr(bool);
/* 802A3C3C */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*);
@@ -60,13 +60,13 @@ struct JAIStreamMgr {
/* 802A4174 */ void newStream_();
};
struct JAIAudience {};
template <typename A0>
struct JAISoundStrategyMgr {};
/* JAISoundStrategyMgr<JAIStream> */
struct JAISoundStrategyMgr__template2 {};
struct JAIAudience {};
struct JAISoundActivity {};
struct JAIStream {
libs/JSystem/JAudio2/JASAiCtrl.cpp
+12 -22
View File
@@ -48,14 +48,14 @@ struct JASDriver {
/* 8029C900 */ void finishDSPFrame();
/* 8029C9DC */ void registerMixCallback(s16* (*)(s32), JASMixMode);
/* 8029C9E8 */ void getDacRate();
/* 8029C9F0 */ void getSubFrames();
/* 8029C9F0 */ u32 getSubFrames();
/* 8029C9F8 */ void getDacSize();
/* 8029CA04 */ void getFrameSamples();
/* 8029CA10 */ void mixMonoTrack(s16*, u32, s16* (*)(s32));
/* 8029CAC0 */ void mixMonoTrackWide(s16*, u32, s16* (*)(s32));
/* 8029CB70 */ void mixExtraTrack(s16*, u32, s16* (*)(s32));
/* 8029CC50 */ void mixInterleaveTrack(s16*, u32, s16* (*)(s32));
/* 8029CCD4 */ void getSubFrameCounter();
/* 8029CCD4 */ u32 getSubFrameCounter();
/* 8029E2A8 */ void subframeCallback();
/* 8029E2D0 */ void DSPSyncCallback();
@@ -113,14 +113,14 @@ extern "C" void readDspBuffer__9JASDriverFPsUl();
extern "C" void finishDSPFrame__9JASDriverFv();
extern "C" void registerMixCallback__9JASDriverFPFl_Ps10JASMixMode();
extern "C" void getDacRate__9JASDriverFv();
extern "C" void getSubFrames__9JASDriverFv();
extern "C" u32 getSubFrames__9JASDriverFv();
extern "C" void getDacSize__9JASDriverFv();
extern "C" void getFrameSamples__9JASDriverFv();
extern "C" void mixMonoTrack__9JASDriverFPsUlPFl_Ps();
extern "C" void mixMonoTrackWide__9JASDriverFPsUlPFl_Ps();
extern "C" void mixExtraTrack__9JASDriverFPsUlPFl_Ps();
extern "C" void mixInterleaveTrack__9JASDriverFPsUlPFl_Ps();
extern "C" void getSubFrameCounter__9JASDriverFv();
extern "C" u32 getSubFrameCounter__9JASDriverFv();
extern "C" void* const sMixFuncs__9JASDriver[4];
extern "C" extern char const* const JASAiCtrl__stringBase0;
extern "C" u8 sDmaDacBuffer__9JASDriver[12 + 4 /* padding */];
@@ -257,7 +257,7 @@ SECTION_SDATA u32 JASDriver::sMixMode = 0x00000002;
/* 804507B0-804507B4 000230 0004+00 2/2 0/0 0/0 .sdata sDacRate__9JASDriver */
SECTION_SDATA f32 JASDriver::sDacRate = 32028.5f;
/* 804507B4-804507B8 000234 0004+00 4/4 0/0 0/0 .sdata sSubFrames__9JASDriver */
/* 804507B4-804507B8 000234 0004+00 4/3 0/0 0/0 .sdata sSubFrames__9JASDriver */
SECTION_SDATA u32 JASDriver::sSubFrames = 0x00000007;
/* 80455720-80455724 003D20 0004+00 1/1 0/0 0/0 .sdata2 @233 */
@@ -289,7 +289,7 @@ SECTION_RODATA void* const JASDriver::sMixFuncs[4] = {
};
COMPILER_STRIP_GATE(8039B2E0, &JASDriver::sMixFuncs);
/* 804512C4-804512C8 0007C4 0004+00 2/2 0/0 0/0 .sbss sSubFrameCounter__9JASDriver */
/* 804512C4-804512C8 0007C4 0004+00 2/1 0/0 0/0 .sbss sSubFrameCounter__9JASDriver */
u8 JASDriver::sSubFrameCounter[4];
/* 804512C8-804512CC 0007C8 0004+00 1/1 0/0 0/0 .sbss dacp$239 */
@@ -386,15 +386,10 @@ asm void JASDriver::getDacRate() {
}
#pragma pop
/* 8029C9F0-8029C9F8 297330 0008+00 2/2 2/2 0/0 .text getSubFrames__9JASDriverFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDriver::getSubFrames() {
nofralloc
#include "asm/JSystem/JAudio2/JASAiCtrl/getSubFrames__9JASDriverFv.s"
/* 8029C9F0-8029C9F8 -00001 0008+00 0/0 0/0 0/0 .text getSubFrames__9JASDriverFv */
u32 JASDriver::getSubFrames() {
return *(u32*)(&JASDriver::sSubFrames);
}
#pragma pop
/* 8029C9F8-8029CA04 297338 000C+00 2/2 0/0 0/0 .text getDacSize__9JASDriverFv */
#pragma push
@@ -457,15 +452,10 @@ asm void JASDriver::mixInterleaveTrack(s16* param_0, u32 param_1, s16* (*)(s32))
}
#pragma pop
/* 8029CCD4-8029CCDC 297614 0008+00 0/0 1/1 0/0 .text getSubFrameCounter__9JASDriverFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDriver::getSubFrameCounter() {
nofralloc
#include "asm/JSystem/JAudio2/JASAiCtrl/getSubFrameCounter__9JASDriverFv.s"
/* 8029CCD4-8029CCDC -00001 0008+00 0/0 0/0 0/0 .text getSubFrameCounter__9JASDriverFv */
u32 JASDriver::getSubFrameCounter() {
return *(u32*)(&JASDriver::sSubFrameCounter);
}
#pragma pop
/* 8039B2F0-8039B338 027950 0048+00 5/5 0/0 0/0 .rodata @stringBase0 */
#pragma push
libs/JSystem/JAudio2/JASAramStream.cpp
-4
View File
@@ -41,10 +41,6 @@ struct JASGenericMemPool {
/* 80290948 */ void alloc(u32);
};
struct JASDvd {
/* 8028FEFC */ void getThreadPointer();
};
struct JASDsp {
struct TChannel {};
};
libs/JSystem/JAudio2/JASChannel.cpp
-2
View File
@@ -67,8 +67,6 @@ struct JASDsp {
struct JASDriver {
/* 8029C9E8 */ void getDacRate();
/* 8029E150 */ void getChannelLevel_dsp();
/* 8029E180 */ void getOutputMode();
};
struct JASDSPChannel {
libs/JSystem/JAudio2/JASDriverIF.cpp
+12 -23
View File
@@ -17,12 +17,11 @@ struct JASDsp {
};
struct JASDriver {
/* 8029CCD4 */ void getSubFrameCounter();
/* 8029E130 */ void setDSPLevel(f32);
/* 8029E150 */ void getChannelLevel_dsp();
/* 8029E150 */ u16 getChannelLevel_dsp();
/* 8029E158 */ void getDSPLevel();
/* 8029E178 */ void setOutputMode(u32);
/* 8029E180 */ void getOutputMode();
/* 8029E180 */ u32 getOutputMode();
/* 8029E188 */ void waitSubFrame();
/* 8029E1C4 */ void rejectCallback(s32 (*)(void*), void*);
/* 8029E240 */ void registerDspSyncCallback(s32 (*)(void*), void*);
@@ -53,10 +52,10 @@ struct JASCallbackMgr {
//
extern "C" void setDSPLevel__9JASDriverFf();
extern "C" void getChannelLevel_dsp__9JASDriverFv();
extern "C" u16 getChannelLevel_dsp__9JASDriverFv();
extern "C" void getDSPLevel__9JASDriverFv();
extern "C" void setOutputMode__9JASDriverFUl();
extern "C" void getOutputMode__9JASDriverFv();
extern "C" u32 getOutputMode__9JASDriverFv();
extern "C" void waitSubFrame__9JASDriverFv();
extern "C" void rejectCallback__9JASDriverFPFPv_lPv();
extern "C" void registerDspSyncCallback__9JASDriverFPFPv_lPv();
@@ -102,23 +101,18 @@ asm void JASDriver::setDSPLevel(f32 param_0) {
#pragma pop
/* ############################################################################################## */
/* 804507C0-804507C4 000240 0002+02 1/1 0/0 0/0 .sdata MAX_MIXERLEVEL__9JASDriver */
/* 804507C0-804507C4 000240 0002+02 1/0 0/0 0/0 .sdata MAX_MIXERLEVEL__9JASDriver */
SECTION_SDATA u16 JASDriver::MAX_MIXERLEVEL[1 + 1 /* padding */] = {
0x2EE0,
/* padding */
0x0000,
};
/* 8029E150-8029E158 298A90 0008+00 0/0 2/2 0/0 .text getChannelLevel_dsp__9JASDriverFv
/* 8029E150-8029E158 -00001 0008+00 0/0 0/0 0/0 .text getChannelLevel_dsp__9JASDriverFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDriver::getChannelLevel_dsp() {
nofralloc
#include "asm/JSystem/JAudio2/JASDriverIF/getChannelLevel_dsp__9JASDriverFv.s"
u16 JASDriver::getChannelLevel_dsp() {
return *(u16*)(&JASDriver::MAX_MIXERLEVEL);
}
#pragma pop
/* 8029E158-8029E178 298A98 0020+00 0/0 3/3 0/0 .text getDSPLevel__9JASDriverFv */
#pragma push
@@ -131,7 +125,7 @@ asm void JASDriver::getDSPLevel() {
#pragma pop
/* ############################################################################################## */
/* 804507C4-804507C8 000244 0004+00 2/2 0/0 0/0 .sdata JAS_SYSTEM_OUTPUT_MODE__9JASDriver
/* 804507C4-804507C8 000244 0004+00 2/1 0/0 0/0 .sdata JAS_SYSTEM_OUTPUT_MODE__9JASDriver
*/
SECTION_SDATA u32 JASDriver::JAS_SYSTEM_OUTPUT_MODE = 0x00000001;
@@ -145,15 +139,10 @@ asm void JASDriver::setOutputMode(u32 param_0) {
}
#pragma pop
/* 8029E180-8029E188 298AC0 0008+00 0/0 4/4 1/1 .text getOutputMode__9JASDriverFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDriver::getOutputMode() {
nofralloc
#include "asm/JSystem/JAudio2/JASDriverIF/getOutputMode__9JASDriverFv.s"
/* 8029E180-8029E188 -00001 0008+00 0/0 0/0 0/0 .text getOutputMode__9JASDriverFv */
u32 JASDriver::getOutputMode() {
return *(u32*)(&JASDriver::JAS_SYSTEM_OUTPUT_MODE);
}
#pragma pop
/* 8029E188-8029E1C4 298AC8 003C+00 0/0 1/1 0/0 .text waitSubFrame__9JASDriverFv */
#pragma push
libs/JSystem/JAudio2/JASDvdThread.cpp
+6 -11
View File
@@ -21,7 +21,7 @@ struct JASTaskThread {
};
struct JASDvd {
/* 8028FEFC */ void getThreadPointer();
/* 8028FEFC */ u32 getThreadPointer();
/* 8028FF04 */ void createThread(s32, int, u32);
static u8 sThread[4 + 4 /* padding */];
@@ -31,7 +31,7 @@ struct JASDvd {
// Forward References:
//
extern "C" void getThreadPointer__6JASDvdFv();
extern "C" u32 getThreadPointer__6JASDvdFv();
extern "C" void createThread__6JASDvdFliUl();
extern "C" u8 sThread__6JASDvd[4 + 4 /* padding */];
@@ -53,18 +53,13 @@ extern "C" u8 sCurrentHeap__7JKRHeap[4];
//
/* ############################################################################################## */
/* 80451208-80451210 000708 0004+04 2/2 0/0 0/0 .sbss sThread__6JASDvd */
/* 80451208-80451210 000708 0004+04 2/1 0/0 0/0 .sbss sThread__6JASDvd */
u8 JASDvd::sThread[4 + 4 /* padding */];
/* 8028FEFC-8028FF04 28A83C 0008+00 0/0 6/6 0/0 .text getThreadPointer__6JASDvdFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDvd::getThreadPointer() {
nofralloc
#include "asm/JSystem/JAudio2/JASDvdThread/getThreadPointer__6JASDvdFv.s"
/* 8028FEFC-8028FF04 -00001 0008+00 0/0 0/0 0/0 .text getThreadPointer__6JASDvdFv */
u32 JASDvd::getThreadPointer() {
return *(u32*)(&JASDvd::sThread);
}
#pragma pop
/* 8028FF04-8028FFA8 28A844 00A4+00 0/0 1/1 0/0 .text createThread__6JASDvdFliUl */
#pragma push
libs/JSystem/JAudio2/JASHeapCtrl.cpp
+12 -22
View File
@@ -35,8 +35,8 @@ struct JKRExpHeap {
struct JASKernel {
/* 802909B8 */ void setupRootHeap(JKRSolidHeap*, u32);
/* 80290AC0 */ void getSystemHeap();
/* 80290AC8 */ void getCommandHeap();
/* 80290AC0 */ u32 getSystemHeap();
/* 80290AC8 */ u32 getCommandHeap();
/* 80290AD0 */ void setupAramHeap(u32, u32);
/* 80290B08 */ void getAramHeap();
@@ -90,8 +90,8 @@ extern "C" void newMemPool__17JASGenericMemPoolFUli();
extern "C" void alloc__17JASGenericMemPoolFUl();
extern "C" void free__17JASGenericMemPoolFPvUl();
extern "C" void setupRootHeap__9JASKernelFP12JKRSolidHeapUl();
extern "C" void getSystemHeap__9JASKernelFv();
extern "C" void getCommandHeap__9JASKernelFv();
extern "C" u32 getSystemHeap__9JASKernelFv();
extern "C" u32 getCommandHeap__9JASKernelFv();
extern "C" void setupAramHeap__9JASKernelFUlUl();
extern "C" void getAramHeap__9JASKernelFv();
extern "C" void __sinit_JASHeapCtrl_cpp();
@@ -287,10 +287,10 @@ asm void JASGenericMemPool::free(void* param_0, u32 param_1) {
/* 80451214-80451218 000714 0004+00 1/1 0/0 0/0 .sbss sAramBase__9JASKernel */
u8 JASKernel::sAramBase[4];
/* 80451218-8045121C 000718 0004+00 2/2 0/0 0/0 .sbss sSystemHeap__9JASKernel */
/* 80451218-8045121C 000718 0004+00 2/1 0/0 0/0 .sbss sSystemHeap__9JASKernel */
u8 JASKernel::sSystemHeap[4];
/* 8045121C-80451220 00071C 0004+00 2/2 0/0 0/0 .sbss sCommandHeap__9JASKernel */
/* 8045121C-80451220 00071C 0004+00 2/1 0/0 0/0 .sbss sCommandHeap__9JASKernel */
u8 JASKernel::sCommandHeap[4];
/* 802909B8-80290AC0 28B2F8 0108+00 0/0 1/1 0/0 .text setupRootHeap__9JASKernelFP12JKRSolidHeapUl
@@ -304,25 +304,15 @@ asm void JASKernel::setupRootHeap(JKRSolidHeap* param_0, u32 param_1) {
}
#pragma pop
/* 80290AC0-80290AC8 28B400 0008+00 1/1 3/3 0/0 .text getSystemHeap__9JASKernelFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASKernel::getSystemHeap() {
nofralloc
#include "asm/JSystem/JAudio2/JASHeapCtrl/getSystemHeap__9JASKernelFv.s"
/* 80290AC0-80290AC8 -00001 0008+00 0/0 0/0 0/0 .text getSystemHeap__9JASKernelFv */
u32 JASKernel::getSystemHeap() {
return *(u32*)(&JASKernel::sSystemHeap);
}
#pragma pop
/* 80290AC8-80290AD0 28B408 0008+00 0/0 6/6 0/0 .text getCommandHeap__9JASKernelFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASKernel::getCommandHeap() {
nofralloc
#include "asm/JSystem/JAudio2/JASHeapCtrl/getCommandHeap__9JASKernelFv.s"
/* 80290AC8-80290AD0 -00001 0008+00 0/0 0/0 0/0 .text getCommandHeap__9JASKernelFv */
u32 JASKernel::getCommandHeap() {
return *(u32*)(&JASKernel::sCommandHeap);
}
#pragma pop
/* ############################################################################################## */
/* 804315D0-804315DC 05E2F0 000C+00 1/1 0/0 0/0 .bss @313 */
libs/JSystem/JAudio2/JASResArcLoader.cpp
-4
View File
@@ -28,10 +28,6 @@ struct JASResArcLoader {
/* 80290D18 */ void loadResourceAsync(JKRArchive*, u16, u8*, u32, void (*)(u32, u32), u32);
};
struct JASDvd {
/* 8028FEFC */ void getThreadPointer();
};
//
// Forward References:
//
libs/JSystem/JAudio2/JASTaskThread.cpp
-5
View File
@@ -31,11 +31,6 @@ struct JASTaskThread {
/* 8028FE88 */ void pause(bool);
};
struct JASKernel {
/* 80290AC0 */ void getSystemHeap();
/* 80290AC8 */ void getCommandHeap();
};
struct JASCalc {
/* 8028F354 */ void bcopy(void const*, void*, u32);
};
libs/JSystem/JAudio2/JASTrack.cpp
+2 -3
View File
@@ -32,6 +32,8 @@ struct JASTrackPort {
/* 802935E8 */ void writeExport(u32, u16);
};
struct JASSoundParams {};
struct JASOscillator {
struct Point {};
@@ -46,8 +48,6 @@ struct JASChannel {
/* 8029BBFC */ void free();
};
struct JASSoundParams {};
struct JASDsp {
struct TChannel {
/* 8029E00C */ void setFilterMode(u16);
@@ -175,7 +175,6 @@ struct JASGenericMemPool {
struct JASDriver {
/* 8029C9E8 */ void getDacRate();
/* 8029C9F0 */ void getSubFrames();
/* 8029E274 */ void registerSubFrameCallback(s32 (*)(void*), void*);
};
libs/JSystem/JAudio2/JASWaveArcLoader.cpp
-5
View File
@@ -70,14 +70,9 @@ struct JASTaskThread {
};
struct JASKernel {
/* 80290AC0 */ void getSystemHeap();
/* 80290B08 */ void getAramHeap();
};
struct JASDvd {
/* 8028FEFC */ void getThreadPointer();
};
//
// Forward References:
//
libs/JSystem/JAudio2/JAUInitializer.cpp
-1
View File
@@ -88,7 +88,6 @@ struct JASGenericMemPool {
};
struct JASDvd {
/* 8028FEFC */ void getThreadPointer();
/* 8028FF04 */ void createThread(s32, int, u32);
};
libs/JSystem/JAudio2/JAUSectionHeap.cpp
+2 -2
View File
@@ -84,12 +84,12 @@ struct JAUSeqCollection {
/* 802A66AC */ void init(void const*);
};
struct JAISeqData {};
struct JAISoundID {};
struct JAISeqDataUser {};
struct JAISeqData {};
struct JAUSectionHeap {
struct TSectionHeapData {
/* 802A5DF4 */ TSectionHeapData();
libs/JSystem/JAudio2/JAUSeqCollection.cpp
+2 -2
View File
@@ -11,12 +11,12 @@
// Types:
//
struct JAISeqData {};
struct JAISoundID {};
struct JAISeqDataUser {};
struct JAISeqData {};
struct JAUSeqDataMgr_SeqCollection {
/* 802A677C */ JAUSeqDataMgr_SeqCollection();
/* 802A67D0 */ void setSeqDataUser(JAISeqDataUser*);
libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp
+4 -4
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 JAISeqDataUser {};
struct JAISeqData {};
struct JAISeqDataUser {};
struct JAUDynamicSeqDataBlocks {
/* 802A6A58 */ JAUDynamicSeqDataBlocks();
/* 802A6AA0 */ void setSeqDataArchive(JKRArchive*);
libs/JSystem/JKernel/JKRAram.cpp
+2 -2
View File
@@ -53,10 +53,10 @@ struct JKRAramStream {
/* 802D3B48 */ void create(s32);
};
struct JKRAramBlock {};
struct JKRAMCommand {};
struct JKRAramBlock {};
struct JKRAramPiece {
/* 802D3838 */ void orderSync(int, u32, u32, u32, JKRAramBlock*);
/* 802D38CC */ void startDMA(JKRAMCommand*);
libs/JSystem/JKernel/JKRAramPiece.cpp
+2 -2
View File
@@ -45,13 +45,13 @@ struct JKRDecomp {
/* 802DB8D0 */ void sendCommand(JKRDecompCommand*);
};
struct JKRAramBlock {};
struct JKRAMCommand {
/* 802D39EC */ JKRAMCommand();
/* 802D3A5C */ ~JKRAMCommand();
};
struct JKRAramBlock {};
struct JKRAramPiece {
/* 802D3574 */ void prepareCommand(int, u32, u32, u32, JKRAramBlock*, void (*)(u32));
/* 802D35F4 */ void sendCommand(JKRAMCommand*);
libs/JSystem/JKernel/JKRDvdRipper.cpp
+6 -11
View File
@@ -53,7 +53,7 @@ struct JKRDvdRipper {
JKRDvdRipper::EAllocDirection, u32, int*, u32*);
/* 802D9B98 */ void loadToMainRAM(char const*, u8*, JKRExpandSwitch, u32, JKRHeap*,
JKRDvdRipper::EAllocDirection, u32, int*, u32*);
/* 802DA7D4 */ void isErrorRetry();
/* 802DA7D4 */ u8 isErrorRetry();
static u8 sDvdAsyncList[12];
static u32 sSZSBufferSize;
@@ -78,7 +78,7 @@ extern "C" static void JKRDecompressFromDVD__FP10JKRDvdFilePvUlUlUlUlPUl();
extern "C" static void decompSZS_subroutine__FPUcPUc();
extern "C" static void firstSrcData__Fv();
extern "C" static void nextSrcData__FPUc();
extern "C" void isErrorRetry__12JKRDvdRipperFv();
extern "C" u8 isErrorRetry__12JKRDvdRipperFv();
extern "C" void __sinit_JKRDvdRipper_cpp();
extern "C" void func_802DA820();
extern "C" extern char const* const JKRDvdRipper__stringBase0;
@@ -159,7 +159,7 @@ asm void JKRDvdRipper::loadToMainRAM(s32 param_0, u8* param_1, JKRExpandSwitch p
#pragma pop
/* ############################################################################################## */
/* 804508C8-804508CC 000348 0004+00 3/3 0/0 0/0 .sdata None */
/* 804508C8-804508CC 000348 0004+00 3/2 0/0 0/0 .sdata None */
SECTION_SDATA static u32 data_804508C8 = 0x01000000;
/* 802D9D10-802DA1E4 2D4650 04D4+00 2/2 0/0 0/0 .text
@@ -277,15 +277,10 @@ static asm void nextSrcData(u8* param_0) {
}
#pragma pop
/* 802DA7D4-802DA7DC 2D5114 0008+00 1/1 0/0 0/0 .text isErrorRetry__12JKRDvdRipperFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JKRDvdRipper::isErrorRetry() {
nofralloc
#include "asm/JSystem/JKernel/JKRDvdRipper/isErrorRetry__12JKRDvdRipperFv.s"
/* 802DA7D4-802DA7DC -00001 0008+00 0/0 0/0 0/0 .text isErrorRetry__12JKRDvdRipperFv */
u8 JKRDvdRipper::isErrorRetry() {
return *(u8*)(&data_804508C8);
}
#pragma pop
/* 802DA7DC-802DA820 2D511C 0044+00 0/0 1/0 0/0 .text __sinit_JKRDvdRipper_cpp */
#pragma push
libs/JSystem/JKernel/JKRHeap.cpp
+1 -1
View File
@@ -214,7 +214,7 @@ SECTION_DATA extern void* __vt__7JKRHeap[24] = {
/* 80451370-80451374 000870 0004+00 3/3 44/44 0/0 .sbss sSystemHeap__7JKRHeap */
u8 JKRHeap::sSystemHeap[4];
/* 80451374-80451378 000874 0004+00 4/4 23/23 0/0 .sbss sCurrentHeap__7JKRHeap */
/* 80451374-80451378 000874 0004+00 4/4 23/22 0/0 .sbss sCurrentHeap__7JKRHeap */
u8 JKRHeap::sCurrentHeap[4];
/* 80451378-8045137C 000878 0004+00 3/3 10/10 0/0 .sbss sRootHeap__7JKRHeap */
libs/JSystem/JParticle/JPAEmitterManager.cpp
+5 -5
View File
@@ -38,9 +38,6 @@ struct JPAResourceManager {
struct JPAEmitterWorkData {};
struct JPAResource;
struct JPAParticleCallBack {};
struct JGeometry {
template <typename A1>
struct TVec3 {};
@@ -48,13 +45,15 @@ struct JGeometry {
struct TVec3__template0 {};
};
struct JPAEmitterCallBack {};
struct JPADrawInfo {};
struct JKRHeap {};
struct JPAEmitterCallBack {};
struct JPABaseEmitter;
struct JPAParticleCallBack {};
struct JPAEmitterManager {
/* 8027DCA0 */ JPAEmitterManager(u32, u32, JKRHeap*, u8, u8);
/* 8027DEBC */ void createSimpleEmitterID(JGeometry::TVec3<f32> const&, u16, u8, u8,
@@ -69,6 +68,7 @@ struct JPAEmitterManager {
/* 8027E3F4 */ void calcYBBCam();
};
struct JPAResource;
struct JPABaseEmitter {
/* 8027E5EC */ ~JPABaseEmitter();
/* 8027E64C */ JPABaseEmitter();
libs/JSystem/JParticle/JPAFieldBlock.cpp
+2 -2
View File
@@ -11,10 +11,10 @@
// Types:
//
struct JPAEmitterWorkData {};
struct JPABaseParticle {};
struct JPAEmitterWorkData {};
struct JKRHeap {};
struct JPAFieldBlock {
libs/JSystem/JParticle/JPAResource.cpp
+5 -5
View File
@@ -19,16 +19,16 @@ struct JUTTexture {
struct JPAEmitterWorkData {};
struct JPABaseEmitter {
/* 8027EDD4 */ void processTillStartFrame();
/* 8027EE14 */ void processTermination();
};
struct JPABaseParticle {
/* 8027FFD0 */ void calc_p(JPAEmitterWorkData*);
/* 80280260 */ void calc_c(JPAEmitterWorkData*);
};
struct JPABaseEmitter {
/* 8027EDD4 */ void processTillStartFrame();
/* 8027EE14 */ void processTermination();
};
struct JKRHeap {
/* 802CE474 */ void alloc(u32, int, JKRHeap*);
};
libs/JSystem/JStage/JSGCamera.cpp
+2 -2
View File
@@ -14,10 +14,10 @@
struct Vec {};
struct JStage {
struct TECameraProjection {};
struct TECameraView {};
struct TECameraProjection {};
struct TCamera {
/* 80280BA0 */ ~TCamera();
/* 80280C00 */ s32 JSGFGetType() const;
libs/JSystem/JStage/JSGSystem.cpp
+2 -2
View File
@@ -12,8 +12,6 @@
//
struct JStage {
struct TEObject {};
struct TObject {
/* 80280DD4 */ ~TObject();
/* 80280E1C */ bool JSGGetName() const;
@@ -29,6 +27,8 @@ struct JStage {
/* 80280E54 */ void JSGGetNodeTransformation(u32, f32 (*)[4]) const;
};
struct TEObject {};
struct TSystem {
/* 80280E90 */ ~TSystem();
/* 80280EF0 */ bool JSGFGetType() const;
libs/JSystem/JStudio/JStudio/fvb.cpp
+12 -12
View File
@@ -49,18 +49,6 @@ struct TVector_pointer_void {
namespace JStudio {
namespace fvb {
struct data {
struct TParse_TBlock {};
struct TParse_TParagraph {
struct TData {};
/* 802850AC */ void getData(JStudio::fvb::data::TParse_TParagraph::TData*) const;
};
static f32 ga4cSignature[1 + 1 /* padding */];
};
struct TObject;
struct TControl {
/* 80284668 */ TControl();
@@ -73,6 +61,18 @@ struct TControl {
/* 802848D4 */ void getObject_index(u32);
};
struct data {
struct TParse_TBlock {};
struct TParse_TParagraph {
struct TData {};
/* 802850AC */ void getData(JStudio::fvb::data::TParse_TParagraph::TData*) const;
};
static f32 ga4cSignature[1 + 1 /* padding */];
};
struct TObject {
/* 80283F80 */ ~TObject();
/* 80283FC8 */ void prepare(JStudio::fvb::data::TParse_TBlock const&, JStudio::fvb::TControl*);
libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp
+2 -2
View File
@@ -111,12 +111,12 @@ struct JAISoundStatus_ {
/* 802A2244 */ void unlockIfLocked();
};
struct JAISoundID {};
struct JAISoundHandle {
/* 802A2184 */ void releaseSound();
};
struct JAISoundID {};
struct JAISoundStarter {
/* 802A2FEC */ void startLevelSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*);
};
libs/JSystem/JStudio/JStudio_JParticle/control.cpp
+2 -2
View File
@@ -55,6 +55,8 @@ struct JStudio_JParticle {
struct JPAParticleCallBack {};
struct JPAEmitterCallBack {};
struct JGeometry {
template <typename A1>
struct TVec3 {};
@@ -62,8 +64,6 @@ struct JGeometry {
struct TVec3__template0 {};
};
struct JPAEmitterCallBack {};
struct JPAEmitterManager {
/* 8027DEBC */ void createSimpleEmitterID(JGeometry::TVec3<f32> const&, u16, u8, u8,
JPAEmitterCallBack*, JPAParticleCallBack*);
libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp
+8 -8
View File
@@ -13,6 +13,14 @@
struct Vec {};
struct JStage {
struct TSystem {};
struct TActor {};
struct TObject {};
};
namespace JStudio {
struct data {
struct TEOperationData {};
@@ -56,14 +64,6 @@ struct TAdaptor_actor {
}; // namespace JStudio
struct JStage {
struct TSystem {};
struct TActor {};
struct TObject {};
};
struct JStudio_JStage {
struct TAdaptor_actor {
struct TVVOutput_ANIMATION_FRAME_ {
libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp
+8 -8
View File
@@ -13,14 +13,6 @@
struct Vec {};
struct JStage {
struct TSystem {};
struct TCamera {};
struct TObject {};
};
namespace JStudio {
struct data {
struct TEOperationData {};
@@ -55,6 +47,14 @@ struct TAdaptor_camera {
}; // namespace JStudio
struct JStage {
struct TSystem {};
struct TCamera {};
struct TObject {};
};
struct JStudio_JStage {
struct TAdaptor_camera {
/* 8028B8A0 */ TAdaptor_camera(JStage::TSystem const*, JStage::TCamera*);
libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp
+6 -6
View File
@@ -13,12 +13,6 @@
struct _GXColor {};
struct JStage {
struct TSystem {};
struct TFog {};
};
namespace JStudio {
struct TAdaptor {
/* 802862AC */ void adaptor_setVariableValue_GXColor(u32 const*, _GXColor const&);
@@ -44,6 +38,12 @@ struct TAdaptor_fog {
}; // namespace JStudio
struct JStage {
struct TSystem {};
struct TFog {};
};
struct JStudio_JStage {
struct TAdaptor_fog {
/* 8028C574 */ TAdaptor_fog(JStage::TSystem const*, JStage::TFog*);
libs/JSystem/JStudio/JStudio_JStage/object-light.cpp
+6 -6
View File
@@ -15,12 +15,6 @@ struct _GXColor {};
struct Vec {};
struct JStage {
struct TSystem {};
struct TLight {};
};
namespace JStudio {
struct data {
struct TEOperationData {};
@@ -54,6 +48,12 @@ struct TAdaptor_light {
}; // namespace JStudio
struct JStage {
struct TSystem {};
struct TLight {};
};
struct JStudio_JStage {
struct TAdaptor_light {
struct TVVOutput_direction_ {
libs/JSystem/JUtility/JUTConsole.cpp
+10 -20
View File
@@ -118,9 +118,9 @@ extern "C" void draw__17JUTConsoleManagerCFv();
extern "C" void drawDirect__17JUTConsoleManagerCFb();
extern "C" void setDirectConsole__17JUTConsoleManagerFP10JUTConsole();
extern "C" void JUTSetReportConsole();
extern "C" static void JUTGetReportConsole();
extern "C" u32 JUTGetReportConsole();
extern "C" void JUTSetWarningConsole();
extern "C" static void JUTGetWarningConsole();
extern "C" u32 JUTGetWarningConsole();
extern "C" static void JUTReportConsole_f_va();
extern "C" void JUTReportConsole_f();
extern "C" void JUTReportConsole();
@@ -453,7 +453,7 @@ asm void JUTConsoleManager::setDirectConsole(JUTConsole* param_0) {
#pragma pop
/* ############################################################################################## */
/* 80451574-80451578 000A74 0004+00 2/2 0/0 0/0 .sbss sReportConsole */
/* 80451574-80451578 000A74 0004+00 2/1 0/0 0/0 .sbss sReportConsole */
static u8 sReportConsole[4];
/* 802E8520-802E8528 2E2E60 0008+00 1/1 1/1 0/0 .text JUTSetReportConsole */
@@ -466,18 +466,13 @@ asm void JUTSetReportConsole() {
}
#pragma pop
/* 802E8528-802E8530 2E2E68 0008+00 2/2 0/0 0/0 .text JUTGetReportConsole */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void JUTGetReportConsole() {
nofralloc
#include "asm/JSystem/JUtility/JUTConsole/JUTGetReportConsole.s"
/* 802E8528-802E8530 -00001 0008+00 0/0 0/0 0/0 .text JUTGetReportConsole */
u32 JUTGetReportConsole() {
return *(u32*)(&sReportConsole);
}
#pragma pop
/* ############################################################################################## */
/* 80451578-80451580 000A78 0004+04 2/2 0/0 0/0 .sbss sWarningConsole */
/* 80451578-80451580 000A78 0004+04 2/1 0/0 0/0 .sbss sWarningConsole */
static u8 sWarningConsole[4 + 4 /* padding */];
/* 802E8530-802E8538 2E2E70 0008+00 1/1 1/1 0/0 .text JUTSetWarningConsole */
@@ -490,15 +485,10 @@ asm void JUTSetWarningConsole() {
}
#pragma pop
/* 802E8538-802E8540 2E2E78 0008+00 1/1 0/0 0/0 .text JUTGetWarningConsole */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void JUTGetWarningConsole() {
nofralloc
#include "asm/JSystem/JUtility/JUTConsole/JUTGetWarningConsole.s"
/* 802E8538-802E8540 -00001 0008+00 0/0 0/0 0/0 .text JUTGetWarningConsole */
u32 JUTGetWarningConsole() {
return *(u32*)(&sWarningConsole);
}
#pragma pop
/* 802E8540-802E85C8 2E2E80 0088+00 2/2 0/0 0/0 .text JUTReportConsole_f_va */
#pragma push
libs/JSystem/JUtility/JUTGamePad.cpp
+2 -2
View File
@@ -29,10 +29,10 @@ struct JUTGamePad {
/* 802E1CD8 */ CButton();
};
struct EWhichStick {};
struct EStickMode {};
struct EWhichStick {};
struct CStick {
/* 802E121C */ void clear();
/* 802E1238 */ void update(s8, s8, JUTGamePad::EStickMode, JUTGamePad::EWhichStick, u32);