mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-31 07:45:48 -04:00
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:
@@ -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 {};
|
||||
|
||||
@@ -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:
|
||||
//
|
||||
|
||||
@@ -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:
|
||||
//
|
||||
|
||||
@@ -17,8 +17,6 @@ struct _GXTlut {};
|
||||
|
||||
struct _GXTexMapID {};
|
||||
|
||||
struct ResTIMG {};
|
||||
|
||||
struct JUTTransparency {};
|
||||
|
||||
struct JUTPalette {
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
|
||||
/* 80267B4C-80267B70 26248C 0024+00 0/0 7/7 0/0 .text __ct__8cBgS_ChkFv */
|
||||
cBgS_Chk::cBgS_Chk(void) {
|
||||
unk_0x00 = 0;
|
||||
unk_0x04 = 0;
|
||||
mPolyPassChk = 0;
|
||||
mGrpPassChk = 0;
|
||||
unk_0x0C = 1;
|
||||
}
|
||||
|
||||
@@ -23,17 +23,17 @@ cBgS_Chk::~cBgS_Chk(void) {}
|
||||
|
||||
/* 80267BB8-80267BDC 2624F8 0024+00 0/0 4/4 0/0 .text SetExtChk__8cBgS_ChkFR8cBgS_Chk */
|
||||
void cBgS_Chk::SetExtChk(cBgS_Chk& pOther) {
|
||||
unk_0x00 = pOther.unk_0x00;
|
||||
unk_0x04 = pOther.unk_0x04;
|
||||
unk_0x08 = pOther.unk_0x08;
|
||||
mPolyPassChk = pOther.mPolyPassChk;
|
||||
mGrpPassChk = pOther.mGrpPassChk;
|
||||
mActorPid = pOther.mActorPid;
|
||||
unk_0x0C = pOther.unk_0x0C;
|
||||
}
|
||||
|
||||
/* 80267BDC-80267C1C 26251C 0040+00 0/0 7/7 0/0 .text ChkSameActorPid__8cBgS_ChkCFUi */
|
||||
bool cBgS_Chk::ChkSameActorPid(unsigned int pUint) const {
|
||||
if (unk_0x08 == -1 || pUint == UINT32_MAX || unk_0x0C == 0) {
|
||||
if (mActorPid == -1 || pUint == UINT32_MAX || unk_0x0C == 0) {
|
||||
return 0;
|
||||
} else {
|
||||
return (unk_0x08 == pUint) ? 1 : 0;
|
||||
return (mActorPid == pUint) ? 1 : 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,22 +15,6 @@ struct Z2SpeechMgr2 {
|
||||
/* 802CCF88 */ void isMidnaSpeak();
|
||||
};
|
||||
|
||||
struct Z2SoundStarter {};
|
||||
|
||||
struct Z2SoundObjSimple {
|
||||
/* 8015BA3C */ ~Z2SoundObjSimple();
|
||||
/* 802BE844 */ Z2SoundObjSimple();
|
||||
};
|
||||
|
||||
template <typename A0>
|
||||
struct JSULink {};
|
||||
/* JSULink<Z2CreatureEnemy> */
|
||||
struct JSULink__template2 {};
|
||||
|
||||
struct JAISoundID {};
|
||||
|
||||
struct Vec {};
|
||||
|
||||
struct Z2CreatureEnemy {
|
||||
/* 802C0F64 */ Z2CreatureEnemy();
|
||||
/* 802C0FC4 */ void deleteObject();
|
||||
@@ -59,33 +43,6 @@ struct Z2SoundObjBeeGroup {
|
||||
/* 802C1D6C */ void playBeeGroupSound(JAISoundID, u8);
|
||||
};
|
||||
|
||||
struct Z2SoundHandlePool {};
|
||||
|
||||
struct Z2SoundObjBase {
|
||||
/* 802BDEF0 */ Z2SoundObjBase();
|
||||
/* 802BDF48 */ ~Z2SoundObjBase();
|
||||
/* 802BDFB0 */ void init(Vec*, u8);
|
||||
/* 802BDFF8 */ void deleteObject();
|
||||
/* 802BE038 */ void framework(u32, s8);
|
||||
/* 802BE070 */ void dispose();
|
||||
/* 802BE104 */ void stopOK(Z2SoundHandlePool&);
|
||||
/* 802BE144 */ void startSound(JAISoundID, u32, s8);
|
||||
/* 802BE2D4 */ void startLevelSound(JAISoundID, u32, s8);
|
||||
/* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*);
|
||||
};
|
||||
|
||||
struct Z2SoundObjAnime {
|
||||
/* 802BEB94 */ Z2SoundObjAnime();
|
||||
/* 802BEBFC */ void initAnime(void*, bool, f32, f32);
|
||||
/* 802BEED4 */ void updateAnime(f32, f32);
|
||||
};
|
||||
|
||||
struct Z2SoundHandles {
|
||||
/* 802AB254 */ void getHandleSoundID(JAISoundID);
|
||||
};
|
||||
|
||||
struct JAISoundHandle {};
|
||||
|
||||
struct Z2SeqMgr {
|
||||
/* 802AF49C */ void subBgmStart(u32);
|
||||
/* 802AF884 */ void subBgmStop();
|
||||
@@ -141,26 +98,6 @@ struct Z2CreatureCitizen {
|
||||
/* 802C0ED8 */ void startCreatureVoice(JAISoundID, s8);
|
||||
};
|
||||
|
||||
struct Z2Creature {
|
||||
/* 802C03C8 */ Z2Creature();
|
||||
/* 802C0420 */ ~Z2Creature();
|
||||
/* 802C04E8 */ void deleteObject();
|
||||
/* 802C0530 */ void init(Vec*, Vec*, u8, u8);
|
||||
/* 802C05B0 */ void init(Vec*, Vec*, Vec*, u8, u8, u8);
|
||||
/* 802C0618 */ void setSoundStarter(Z2SoundStarter*);
|
||||
/* 802C0628 */ void initAnime(void*, bool, f32, f32);
|
||||
/* 802C064C */ void framework(u32, s8);
|
||||
/* 802C06D0 */ void updateAnime(f32, f32);
|
||||
/* 802C06F4 */ void stopAnime();
|
||||
/* 802C0720 */ void startCreatureSound(JAISoundID, u32, s8);
|
||||
/* 802C087C */ void startCreatureSoundLevel(JAISoundID, u32, s8);
|
||||
/* 802C0A4C */ void startCreatureVoice(JAISoundID, s8);
|
||||
/* 802C0AF8 */ void startCreatureVoiceLevel(JAISoundID, s8);
|
||||
/* 802C0B70 */ void startCreatureExtraSound(JAISoundID, u32, s8);
|
||||
/* 802C0BAC */ void startCreatureExtraSoundLevel(JAISoundID, u32, s8);
|
||||
/* 802C0BE8 */ void startCollisionSE(u32, u32);
|
||||
};
|
||||
|
||||
struct Z2Calc {
|
||||
struct CurveSign {};
|
||||
|
||||
@@ -180,16 +117,6 @@ struct Z2Audience {
|
||||
/* 802BDB44 */ void calcRelPosDolby(Vec const&, int);
|
||||
};
|
||||
|
||||
struct JSUPtrLink {
|
||||
/* 802DBDFC */ JSUPtrLink(void*);
|
||||
/* 802DBE14 */ ~JSUPtrLink();
|
||||
};
|
||||
|
||||
struct JSUPtrList {
|
||||
/* 802DBF4C */ void append(JSUPtrLink*);
|
||||
/* 802DC15C */ void remove(JSUPtrLink*);
|
||||
};
|
||||
|
||||
struct JAISoundParamsMove {
|
||||
/* 802A2DB4 */ void moveVolume(f32, u32);
|
||||
/* 802A2E0C */ void movePitch(f32, u32);
|
||||
|
||||
@@ -11,41 +11,6 @@
|
||||
// Types:
|
||||
//
|
||||
|
||||
struct JAISoundID {};
|
||||
|
||||
struct JGeometry {
|
||||
template <typename A1>
|
||||
struct TVec3 {};
|
||||
/* TVec3<f32> */
|
||||
struct TVec3__template0 {};
|
||||
};
|
||||
|
||||
struct Z2SoundHandles {
|
||||
/* 802AB07C */ Z2SoundHandles();
|
||||
/* 802AB0B4 */ ~Z2SoundHandles();
|
||||
/* 802AB118 */ void initHandlesPool(u8);
|
||||
/* 802AB120 */ void deleteHandlesPool();
|
||||
/* 802AB254 */ void getHandleSoundID(JAISoundID);
|
||||
/* 802AB2A0 */ void getHandleUserData(u32);
|
||||
/* 802AB2D8 */ void getFreeHandle();
|
||||
/* 802AB3D0 */ void getLowPrioSound(JAISoundID);
|
||||
/* 802AB4A0 */ void stopAllSounds(u32);
|
||||
/* 802AB504 */ void isActive() const;
|
||||
/* 802AB538 */ void setPos(JGeometry::TVec3<f32> const&);
|
||||
};
|
||||
|
||||
struct JSUPtrLink {
|
||||
/* 802DBDFC */ JSUPtrLink(void*);
|
||||
/* 802DBE14 */ ~JSUPtrLink();
|
||||
};
|
||||
|
||||
struct JSUPtrList {
|
||||
/* 802DBEAC */ ~JSUPtrList();
|
||||
/* 802DBF14 */ void initiate();
|
||||
/* 802DBF4C */ void append(JSUPtrLink*);
|
||||
/* 802DC15C */ void remove(JSUPtrLink*);
|
||||
};
|
||||
|
||||
template <typename A0>
|
||||
struct JASMemPool {};
|
||||
/* JASMemPool<Z2SoundHandlePool> */
|
||||
@@ -60,14 +25,6 @@ struct JASGenericMemPool {
|
||||
/* 80290994 */ void free(void*, u32);
|
||||
};
|
||||
|
||||
struct JAISoundHandle {
|
||||
/* 802A2184 */ void releaseSound();
|
||||
};
|
||||
|
||||
struct JAISound {
|
||||
/* 802A24DC */ void stop(u32);
|
||||
};
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
@@ -173,7 +130,7 @@ extern "C" asm void func_802AB200(void* _this) {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void Z2SoundHandles::getHandleSoundID(JAISoundID param_0) {
|
||||
asm JAISoundHandle* Z2SoundHandles::getHandleSoundID(JAISoundID param_0) {
|
||||
nofralloc
|
||||
#include "asm/Z2AudioLib/Z2SoundHandles/getHandleSoundID__14Z2SoundHandlesF10JAISoundID.s"
|
||||
}
|
||||
@@ -183,7 +140,7 @@ asm void Z2SoundHandles::getHandleSoundID(JAISoundID param_0) {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void Z2SoundHandles::getHandleUserData(u32 param_0) {
|
||||
asm JAISoundHandle* Z2SoundHandles::getHandleUserData(u32 param_0) {
|
||||
nofralloc
|
||||
#include "asm/Z2AudioLib/Z2SoundHandles/getHandleUserData__14Z2SoundHandlesFUl.s"
|
||||
}
|
||||
@@ -226,7 +183,7 @@ asm void Z2SoundHandles::stopAllSounds(u32 param_0) {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void Z2SoundHandles::isActive() const {
|
||||
asm bool Z2SoundHandles::isActive() const {
|
||||
nofralloc
|
||||
#include "asm/Z2AudioLib/Z2SoundHandles/isActive__14Z2SoundHandlesCFv.s"
|
||||
}
|
||||
|
||||
@@ -11,107 +11,25 @@
|
||||
// Types:
|
||||
//
|
||||
|
||||
struct JAISoundHandle {
|
||||
/* 802A2184 */ void releaseSound();
|
||||
};
|
||||
|
||||
struct Z2SoundStarter {
|
||||
/* 802AAEDC */ void setPortData(JAISoundHandle*, u32, u16, s8);
|
||||
};
|
||||
|
||||
struct JAISoundID {};
|
||||
|
||||
struct Vec {};
|
||||
|
||||
struct Z2SoundObjSimple {
|
||||
/* 802BE844 */ Z2SoundObjSimple();
|
||||
/* 802BE880 */ void init(Vec*, u8);
|
||||
/* 802BE8A0 */ void startSound(JAISoundID, u32, s8);
|
||||
/* 802BE9B0 */ void startLevelSound(JAISoundID, u32, s8);
|
||||
};
|
||||
|
||||
struct Z2SoundHandlePool {};
|
||||
|
||||
struct Z2SoundObjBase {
|
||||
/* 802BDEF0 */ Z2SoundObjBase();
|
||||
/* 802BDF48 */ ~Z2SoundObjBase();
|
||||
/* 802BDFB0 */ void init(Vec*, u8);
|
||||
/* 802BDFF8 */ void deleteObject();
|
||||
/* 802BE038 */ void framework(u32, s8);
|
||||
/* 802BE070 */ void dispose();
|
||||
/* 802BE104 */ void stopOK(Z2SoundHandlePool&);
|
||||
/* 802BE144 */ void startSound(JAISoundID, u32, s8);
|
||||
/* 802BE2D4 */ void startLevelSound(JAISoundID, u32, s8);
|
||||
/* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*);
|
||||
};
|
||||
|
||||
struct Z2SoundObjArrow {
|
||||
/* 802BEB38 */ Z2SoundObjArrow();
|
||||
/* 802BEB74 */ void init(Vec*, u8);
|
||||
};
|
||||
|
||||
struct JAUSoundAnimationSound {};
|
||||
|
||||
struct JGeometry {
|
||||
template <typename A1>
|
||||
struct TVec3 {};
|
||||
/* TVec3<f32> */
|
||||
struct TVec3__template0 {};
|
||||
};
|
||||
|
||||
struct Z2SoundObjAnime {
|
||||
/* 802BEB94 */ Z2SoundObjAnime();
|
||||
/* 802BEBDC */ void init(Vec*, u8);
|
||||
/* 802BEBFC */ void initAnime(void*, bool, f32, f32);
|
||||
/* 802BED68 */ void ageSounds_();
|
||||
/* 802BEED4 */ void updateAnime(f32, f32);
|
||||
/* 802BF304 */ void updateSoundLifeTime_(f32, f32);
|
||||
/* 802BF660 */ void startSoundInner(JGeometry::TVec3<f32> const&, f32, Z2SoundStarter*, u32,
|
||||
s8);
|
||||
/* 802BF890 */ void getSoundID(JAUSoundAnimationSound const*, JGeometry::TVec3<f32> const&,
|
||||
f32);
|
||||
/* 802BF898 */ void playsSound(JAUSoundAnimationSound const*, JGeometry::TVec3<f32> const&,
|
||||
f32);
|
||||
};
|
||||
|
||||
struct Z2SoundInfo {
|
||||
/* 802BBAC8 */ void getSwBit(JAISoundID) const;
|
||||
};
|
||||
|
||||
struct Z2SoundHandles {
|
||||
/* 802AB07C */ Z2SoundHandles();
|
||||
/* 802AB0B4 */ ~Z2SoundHandles();
|
||||
/* 802AB120 */ void deleteHandlesPool();
|
||||
/* 802AB254 */ void getHandleSoundID(JAISoundID);
|
||||
/* 802AB2A0 */ void getHandleUserData(u32);
|
||||
/* 802AB2D8 */ void getFreeHandle();
|
||||
/* 802AB3D0 */ void getLowPrioSound(JAISoundID);
|
||||
/* 802AB538 */ void setPos(JGeometry::TVec3<f32> const&);
|
||||
};
|
||||
|
||||
struct Z2SeMgr {
|
||||
/* 802AE5B0 */ void isSoundCulling(JAISoundID);
|
||||
};
|
||||
|
||||
struct Z2DopplerSoundObjBase {
|
||||
/* 802BE5A0 */ Z2DopplerSoundObjBase();
|
||||
/* 802BE5FC */ ~Z2DopplerSoundObjBase();
|
||||
/* 802BE65C */ void init(Vec*, u8);
|
||||
/* 802BE6B8 */ void framework(u32, s8);
|
||||
/* 802BE714 */ void startSound(JAISoundID, u32, s8);
|
||||
/* 802BE7AC */ void startLevelSound(JAISoundID, u32, s8);
|
||||
};
|
||||
|
||||
struct Z2Calc {
|
||||
struct CurveSign {};
|
||||
|
||||
/* 802A96F4 */ void getParamByExp(f32, f32, f32, f32, f32, f32, Z2Calc::CurveSign);
|
||||
};
|
||||
|
||||
struct JSUPtrList {
|
||||
/* 802DC20C */ void getNthLink(u32) const;
|
||||
};
|
||||
|
||||
struct JAUSoundAnimation {
|
||||
/* 802A6F70 */ void getStartSoundIndex(f32) const;
|
||||
/* 802A7044 */ void getEndSoundIndex(f32) const;
|
||||
@@ -125,13 +43,6 @@ struct JAISoundParamsMove {
|
||||
|
||||
struct JAIAudience {};
|
||||
|
||||
struct JAISound {
|
||||
/* 802A244C */ void acceptsNewAudible() const;
|
||||
/* 802A2474 */ void newAudible(JGeometry::TVec3<f32> const&, JGeometry::TVec3<f32> const*, u32,
|
||||
JAIAudience*);
|
||||
/* 802A2598 */ void stop();
|
||||
};
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
@@ -339,7 +250,7 @@ asm void Z2SoundObjBase::dispose() {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void Z2SoundObjBase::stopOK(Z2SoundHandlePool& param_0) {
|
||||
asm bool Z2SoundObjBase::stopOK(Z2SoundHandlePool& param_0) {
|
||||
nofralloc
|
||||
#include "asm/Z2AudioLib/Z2SoundObject/stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool.s"
|
||||
}
|
||||
|
||||
@@ -11,27 +11,6 @@
|
||||
// Types:
|
||||
//
|
||||
|
||||
struct JGeometry {
|
||||
template <typename A1>
|
||||
struct TVec3 {};
|
||||
/* TVec3<f32> */
|
||||
struct TVec3__template0 {};
|
||||
};
|
||||
|
||||
struct JAISoundID {};
|
||||
|
||||
struct JAISoundHandle {};
|
||||
|
||||
struct Z2SoundStarter {
|
||||
/* 802AAB94 */ Z2SoundStarter(bool);
|
||||
/* 802AAC3C */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*, u32,
|
||||
f32, f32, f32, f32, f32, u32);
|
||||
/* 802AABF4 */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*);
|
||||
/* 802AAEDC */ void setPortData(JAISoundHandle*, u32, u16, s8);
|
||||
/* 802AAF74 */ void getPortData(JAISoundHandle*, u32, s8);
|
||||
/* 802AAFF0 */ ~Z2SoundStarter();
|
||||
};
|
||||
|
||||
struct Z2EnvSeMgr {
|
||||
/* 802C93E4 */ void getFogDensity();
|
||||
};
|
||||
@@ -40,17 +19,6 @@ struct Z2AudioMgr {
|
||||
static u8 mAudioMgrPtr[4 + 4 /* padding */];
|
||||
};
|
||||
|
||||
struct JASTrack {
|
||||
/* 80291C30 */ void openChild(u32);
|
||||
/* 80292918 */ void writePort(u32, u16);
|
||||
/* 8029297C */ void readPort(u32);
|
||||
};
|
||||
|
||||
struct JAISoundStarter {
|
||||
/* 802A2F6C */ JAISoundStarter(bool);
|
||||
/* 802A2F88 */ ~JAISoundStarter();
|
||||
};
|
||||
|
||||
struct JAISoundParamsMove {
|
||||
/* 802A2DB4 */ void moveVolume(f32, u32);
|
||||
/* 802A2E0C */ void movePitch(f32, u32);
|
||||
|
||||
@@ -11,35 +11,11 @@
|
||||
// Types:
|
||||
//
|
||||
|
||||
struct Z2WolfHowlData {};
|
||||
|
||||
struct Vec {};
|
||||
|
||||
struct Z2WolfHowlMgr {
|
||||
/* 802CAAC0 */ Z2WolfHowlMgr();
|
||||
/* 802CAB8C */ void resetState();
|
||||
/* 802CABEC */ void calcVolumeMod(f32);
|
||||
/* 802CACB0 */ void getNowPitch();
|
||||
/* 802CACCC */ void getNowInputValue();
|
||||
/* 802CACD4 */ void calcPitchMod(f32, f32);
|
||||
/* 802CAED4 */ void startWolfHowlSound(f32, f32, bool, f32);
|
||||
/* 802CB100 */ void setCorrectData(s8, Z2WolfHowlData*);
|
||||
/* 802CB320 */ void getCorrectLine(u8);
|
||||
/* 802CB370 */ void getCorrectLineNum();
|
||||
/* 802CB38C */ void checkLine();
|
||||
/* 802CB650 */ void getOnLineNum();
|
||||
/* 802CB6EC */ void startWindStoneSound(s8, Vec*);
|
||||
/* 802CBA88 */ void startGuideMelody(bool);
|
||||
/* 802CBB58 */ void skipCorrectDemo();
|
||||
};
|
||||
|
||||
struct Z2SeqMgr {
|
||||
/* 802AF49C */ void subBgmStart(u32);
|
||||
/* 802B327C */ void stopWolfHowlSong();
|
||||
};
|
||||
|
||||
struct JAISoundID {};
|
||||
|
||||
struct Z2SeMgr {
|
||||
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
|
||||
};
|
||||
@@ -55,29 +31,11 @@ struct Z2Calc {
|
||||
/* 802A96F4 */ void getParamByExp(f32, f32, f32, f32, f32, f32, Z2Calc::CurveSign);
|
||||
};
|
||||
|
||||
struct JGeometry {
|
||||
template <typename A1>
|
||||
struct TVec3 {};
|
||||
/* TVec3<f32> */
|
||||
struct TVec3__template0 {};
|
||||
};
|
||||
|
||||
struct JAISoundHandle {};
|
||||
|
||||
struct JAISoundStarter {
|
||||
/* 802A2FEC */ void startLevelSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*);
|
||||
};
|
||||
|
||||
struct JAISoundParamsMove {
|
||||
/* 802A2DB4 */ void moveVolume(f32, u32);
|
||||
/* 802A2E0C */ void movePitch(f32, u32);
|
||||
};
|
||||
|
||||
struct JAISound {
|
||||
/* 802A2598 */ void stop();
|
||||
/* 802A24DC */ void stop(u32);
|
||||
};
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
@@ -113,7 +71,6 @@ extern "C" void getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign();
|
||||
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
|
||||
extern "C" void subBgmStart__8Z2SeqMgrFUl();
|
||||
extern "C" void stopWolfHowlSong__8Z2SeqMgrFv();
|
||||
extern "C" void PSVECSquareDistance();
|
||||
extern "C" void _savegpr_28();
|
||||
extern "C" void _savegpr_29();
|
||||
extern "C" void _restgpr_28();
|
||||
|
||||
Reference in New Issue
Block a user