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

move d_a_alink and some related stuff (#130)

Browse Source 
* 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 462d71cbef
commit e915df66c8
196 changed files with 5322 additions and 6569 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/Z2AudioLib/Z2Creature.cpp
-73
View File
@@ -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);
libs/Z2AudioLib/Z2SoundHandles.cpp
+3 -46
View File
@@ -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"
}
libs/Z2AudioLib/Z2SoundObject.cpp
+1 -90
View File
@@ -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"
}
libs/Z2AudioLib/Z2SoundStarter.cpp
-32
View File
@@ -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);
libs/Z2AudioLib/Z2WolfHowlMgr.cpp
-43
View File
@@ -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();