move d_a_alink and some related stuff (#130)

* clean up d_a_player

* move some of daalink

* more daalink / daplayer

* setup some daalink members

* rest of daalink members setup

* remove comment

* few more matches

* remove asm

* more matches

* more matches + move e_wb_class

* fix some d_save classes

Co-authored-by: lepelog <lepelog@users.noreply.github.com>
This commit is contained in:
TakaRikka
2021-05-23 03:09:59 -07:00
committed by GitHub
parent d5c3fd8c2f
commit 2c9f53e00a
196 changed files with 5322 additions and 6569 deletions
@@ -287,7 +287,7 @@ SECTION_SDATA2 static f64 lit_975 = 4503601774854144.0 /* cast s32 to float */;
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DFrameCtrl::checkPass(f32 param_0) {
asm int J3DFrameCtrl::checkPass(f32 param_0) {
nofralloc
#include "asm/JSystem/J3DGraphAnimator/J3DAnimation/checkPass__12J3DFrameCtrlFf.s"
}
@@ -11,52 +11,6 @@
// Types:
//
struct Vec {};
struct J3DModel;
struct J3DModelData {
/* 803260F8 */ void syncJ3DSysFlags() const;
};
struct J3DSkinDeform {
/* 8032C9B0 */ void initSkinInfo(J3DModelData*);
/* 8032CF44 */ void initMtxIndexArray(J3DModelData*);
/* 8032D378 */ void changeFastSkinDL(J3DModelData*);
/* 8032D738 */ void transformVtxPosNrm(J3DModelData*);
/* 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);
/* 80327300 */ void createShapePacket(J3DModelData*);
/* 803273CC */ void createMatPacket(J3DModelData*, u32);
/* 803275FC */ void newDifferedDisplayList(u32);
/* 8032767C */ void lock();
/* 803276B4 */ void unlock();
/* 803276EC */ void calcMaterial();
/* 80327858 */ void calcDiffTexMtx();
/* 803279A0 */ void diff();
/* 80327A2C */ void setDeformData(J3DDeformData*, u32);
/* 80327AA0 */ void setSkinDeform(J3DSkinDeform*, u32);
/* 80327BD4 */ void calcAnmMtx();
/* 80327C58 */ void calcWeightEnvelopeMtx();
/* 80327CA4 */ void update();
/* 80327CF0 */ void calc();
/* 80327E4C */ void entry();
/* 80327F40 */ void viewCalc();
/* 80328190 */ void calcNrmMtx();
/* 803281B4 */ void calcBumpMtx();
/* 803282B8 */ void calcBBoardMtx();
/* 803282EC */ void prepareShapePackets();
/* 80328350 */ ~J3DModel();
};
struct J3DVtxColorCalc {
/* 8032E180 */ void calc(J3DModel*);
};
@@ -81,16 +35,6 @@ struct J3DShape {
/* 80314DA8 */ void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
};
struct J3DMtxBuffer {
/* 80326214 */ void initialize();
/* 80326258 */ void create(J3DModelData*, u32);
/* 803268D4 */ void calcWeightEnvelopeMtx();
/* 80326ACC */ void calcDrawMtx(u32, Vec const&, f32 const (&)[3][4]);
/* 80326D3C */ void calcNrmMtx();
/* 80326EF0 */ void calcBBoardMtx();
/* 803283B4 */ ~J3DMtxBuffer();
};
struct J3DMaterial {
/* 80316290 */ void countDLSize();
/* 80316E90 */ void newSharedDisplayList(u32);
@@ -189,8 +133,6 @@ extern "C" void deform__13J3DDeformDataFP8J3DModel();
extern "C" void entryIn__8J3DJointFv();
extern "C" void DCStoreRange();
extern "C" void DCStoreRangeNoSync();
extern "C" void PSMTXIdentity();
extern "C" void PSMTXCopy();
extern "C" void __construct_new_array();
extern "C" void _savegpr_23();
extern "C" void _savegpr_25();
@@ -19,18 +19,6 @@ struct J3DShapeTable {
/* 80326134 */ ~J3DShapeTable();
};
struct J3DModelData {
/* 80325D88 */ void clear();
/* 80325DA0 */ J3DModelData();
/* 80325E14 */ void newSharedDisplayList(u32);
/* 80325EC8 */ void indexToPtr();
/* 80325F94 */ void makeSharedDL();
/* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]);
/* 803260CC */ void syncJ3DSysPointers() const;
/* 803260F8 */ void syncJ3DSysFlags() const;
/* 8032617C */ ~J3DModelData();
};
struct J3DMaterialTable {
/* 8032F5D0 */ J3DMaterialTable();
/* 8032F604 */ ~J3DMaterialTable();
@@ -31,10 +31,6 @@ struct _GXFogType {};
struct _GXFogAdjTable {};
struct _GXColorS10 {};
struct _GXColor {};
struct _GXChannelID {};
struct J3DZMode {};
@@ -115,8 +111,6 @@ struct J3DTevStage {};
struct J3DTevOrder {};
struct J3DGXColorS10 {};
struct J3DIndTevStage {};
struct J3DGXColor {};
-43
View File
@@ -11,56 +11,13 @@
// Types:
//
struct JGeometry {
template <typename A1>
struct TVec3 {};
/* TVec3<f32> */
struct TVec3__template0 {};
};
struct JASSoundParams {};
struct JASTrack {
/* 80291444 */ void setChannelMgrCount(u32);
/* 802919F4 */ void assignExtBuffer(u32, JASSoundParams*);
};
struct JAISoundStatus_ {
/* 802A2220 */ void lockWhenPrepared();
/* 802A2244 */ void unlockIfLocked();
};
struct JAISoundParams {
/* 802A2280 */ void mixOutAll(JASSoundParams const&, JASSoundParams*, f32);
};
struct JAISoundID {};
struct JAISoundHandle {
/* 802A2184 */ void releaseSound();
};
struct JAIAudience {};
struct JAISound {
/* 802A21A0 */ void releaseHandle();
/* 802A21BC */ void attachHandle(JAISoundHandle*);
/* 802A22F8 */ JAISound();
/* 802A2328 */ void start_JAISound_(JAISoundID, JGeometry::TVec3<f32> const*, JAIAudience*);
/* 802A244C */ void acceptsNewAudible() const;
/* 802A2474 */ void newAudible(JGeometry::TVec3<f32> const&, JGeometry::TVec3<f32> const*, u32,
JAIAudience*);
/* 802A2598 */ void stop();
/* 802A24DC */ void stop(u32);
/* 802A25D8 */ bool asSe();
/* 802A25E0 */ bool asSeq();
/* 802A25E8 */ bool asStream();
/* 802A25F0 */ void die_JAISound_();
/* 802A266C */ void increasePrepareCount_JAISound_();
/* 802A26B8 */ void calc_JAISound_();
/* 802A29DC */ void initTrack_JAISound_(JASTrack*);
};
//
// Forward References:
//
-9
View File
@@ -15,11 +15,6 @@ struct Vec {};
struct JPAEmitterWorkData {};
struct JPABaseParticle;
struct JPABaseEmitter {
/* 8027EB60 */ void createChild(JPABaseParticle*);
};
struct JPABaseParticle {
/* 8027EFEC */ void init_p(JPAEmitterWorkData*);
/* 8027F8C8 */ void init_c(JPAEmitterWorkData*, JPABaseParticle*);
@@ -36,10 +31,6 @@ struct JPAResource {
/* 80276684 */ void calcField(JPAEmitterWorkData*, JPABaseParticle*);
};
struct JPAParticleCallBack {
/* 8027EFA4 */ ~JPAParticleCallBack();
};
//
// Forward References:
//
-2
View File
@@ -17,8 +17,6 @@ struct _GXTlut {};
struct _GXTexMapID {};
struct ResTIMG {};
struct JUTTransparency {};
struct JUTPalette {