project cleanup (#2895)

* some wii OS fixes

* remove old dol2asm comments

* remove dol2asm.h

* remove function address comments

* normalize ATTRIBUTE_ALIGN usage

* DECL_WEAK macro

* fix gcc attribute weak macro

* wrap more mwcc specific things in ifdefs

* fixes

* fix revo sdk version flags

* fixes
This commit is contained in:
TakaRikka
2025-11-30 14:23:42 -08:00
committed by GitHub
parent 434415337d
commit a6e76c0841
2375 changed files with 24683 additions and 71069 deletions
+49 -49
View File
@@ -12,8 +12,8 @@
struct Z2Audible;
struct Z2AudibleAbsPos {
/* 802BBCDC */ void calc(const JGeometry::TVec3<f32>& pos);
/* 802BBD18 */ void init(JGeometry::TVec3<f32>*, const JGeometry::TVec3<f32>&,
void calc(const JGeometry::TVec3<f32>& pos);
void init(JGeometry::TVec3<f32>*, const JGeometry::TVec3<f32>&,
const JGeometry::TVec3<f32>*);
/* 0x00 */ JGeometry::TVec3<f32> field_0x0;
@@ -21,13 +21,13 @@ struct Z2AudibleAbsPos {
};
struct Z2AudioCamera {
/* 802BC758 */ Z2AudioCamera();
/* 802BC788 */ void init();
/* 802BC8AC */ void setCameraState(f32 (*)[4], Vec& pos, Vec&, f32, f32, bool, bool);
/* 802BC7DC */ void setCameraState(f32 const (*)[4], Vec& pos, bool);
/* 802BCBEC */ void convertAbsToRel(Z2Audible* audible, int channelNum);
/* 802BCC7C */ bool convertAbsToRel(Vec& src, Vec* dst) const;
/* 802BCCC0 */ bool isInSight(Vec&) const;
Z2AudioCamera();
void init();
void setCameraState(f32 (*)[4], Vec& pos, Vec&, f32, f32, bool, bool);
void setCameraState(f32 const (*)[4], Vec& pos, bool);
void convertAbsToRel(Z2Audible* audible, int channelNum);
bool convertAbsToRel(Vec& src, Vec* dst) const;
bool isInSight(Vec&) const;
const JGeometry::TVec3<f32>* getPos() const { return &mPos; }
f32 getVolCenterZ() const { return mVolCenterZ; }
@@ -60,13 +60,13 @@ struct Z2AudioCamera {
}; // Size: 0x74
struct Z2SpotMic {
/* 802BCD28 */ Z2SpotMic();
/* 802BCDA8 */ void clearMicState(int camID);
/* 802BCDE8 */ void calcVolumeFactor(int camID);
/* 802BCE14 */ void setMicState(Z2AudioCamera* camera, int camID);
/* 802BCF5C */ f32 calcMicDist(Z2Audible* audible);
/* 802BCFE4 */ u32 calcMicPriority(f32);
/* 802BD03C */ f32 calcMicVolume(f32, int camID, f32);
Z2SpotMic();
void clearMicState(int camID);
void calcVolumeFactor(int camID);
void setMicState(Z2AudioCamera* camera, int camID);
f32 calcMicDist(Z2Audible* audible);
u32 calcMicPriority(f32);
f32 calcMicVolume(f32, int camID, f32);
void setPosPtr(Vec* posPtr) { mPosPtr = posPtr; }
bool isOn() { return mMicOn; }
@@ -86,12 +86,12 @@ struct Z2SpotMic {
}; // Size: 0x28
struct Z2Audience3DSetting {
/* 802BC248 */ Z2Audience3DSetting();
/* 802BC284 */ void init();
/* 802BC308 */ void initVolumeDist();
/* 802BC4D0 */ void updateVolumeDist(f32);
/* 802BC6A4 */ void initDolbyDist();
/* 802BC6F8 */ void updateDolbyDist(f32, f32);
Z2Audience3DSetting();
void init();
void initVolumeDist();
void updateVolumeDist(f32);
void initDolbyDist();
void updateDolbyDist(f32, f32);
void calcVolumeFactorAll() {
field_0x0[1] = 1.25f * field_0x0[0];
@@ -153,7 +153,7 @@ struct Z2AudibleRelPos {
};
struct Z2AudibleChannel {
/* 802BBE74 */ Z2AudibleChannel();
Z2AudibleChannel();
void init() {
mParams.init();
field_0x28 = -1.0f;
@@ -171,13 +171,13 @@ struct Z2AudibleChannel {
};
struct Z2Audible : public JAIAudible, public JASPoolAllocObject<Z2Audible> {
/* 802BBD94 */ Z2Audible(const JGeometry::TVec3<f32>& pos, const JGeometry::TVec3<f32>*, u32 channel, bool);
/* 802BBE98 */ void calc();
/* 802BBED0 */ JASSoundParams* getOuterParams(int index);
/* 802BBEE4 */ void setOuterParams(const JASSoundParams& outParams, const JASSoundParams& inParams, int index);
/* 802BC204 */ Z2AudibleChannel* getChannel(int index);
/* 802BC218 */ u32 getDistVolBit();
/* 802BD510 */ ~Z2Audible();
Z2Audible(const JGeometry::TVec3<f32>& pos, const JGeometry::TVec3<f32>*, u32 channel, bool);
void calc();
JASSoundParams* getOuterParams(int index);
void setOuterParams(const JASSoundParams& outParams, const JASSoundParams& inParams, int index);
Z2AudibleChannel* getChannel(int index);
u32 getDistVolBit();
~Z2Audible();
bool isDoppler() {
return ((*(u8*)&mParam.field_0x0) >> 4) & 0xf;
@@ -197,29 +197,29 @@ struct Z2Audible : public JAIAudible, public JASPoolAllocObject<Z2Audible> {
};
struct Z2Audience : public JAIAudience, public JASGlobalInstance<Z2Audience> {
/* 802BD130 */ Z2Audience();
/* 802BD2DC */ void setAudioCamera(f32 (*)[4], Vec&, Vec&, f32, f32, bool, int camID, bool);
/* 802BD704 */ f32 calcOffMicSound(f32);
/* 802BD90C */ void setTargetVolume(f32 volume, int index);
/* 802BD92C */ bool convertAbsToRel(Vec& src, Vec* dst, int camID);
/* 802BD95C */ f32 calcRelPosVolume(const Vec&, f32, int camID);
/* 802BDA44 */ f32 calcRelPosPan(const Vec&, int camID);
/* 802BDB44 */ f32 calcRelPosDolby(const Vec&, int camID);
/* 802BDBDC */ f32 calcVolume_(f32, int distVolBit) const;
/* 802BDC44 */ u32 calcDeltaPriority_(f32, int distVolBit, bool) const;
/* 802BDCB0 */ f32 calcPitchDoppler_(const JGeometry::TVec3<f32>&,
Z2Audience();
void setAudioCamera(f32 (*)[4], Vec&, Vec&, f32, f32, bool, int camID, bool);
f32 calcOffMicSound(f32);
void setTargetVolume(f32 volume, int index);
bool convertAbsToRel(Vec& src, Vec* dst, int camID);
f32 calcRelPosVolume(const Vec&, f32, int camID);
f32 calcRelPosPan(const Vec&, int camID);
f32 calcRelPosDolby(const Vec&, int camID);
f32 calcVolume_(f32, int distVolBit) const;
u32 calcDeltaPriority_(f32, int distVolBit, bool) const;
f32 calcPitchDoppler_(const JGeometry::TVec3<f32>&,
const JGeometry::TVec3<f32>&,
const JGeometry::TVec3<f32>&, f32) const;
/* 802BDD00 */ f32 calcFxMix_(f32, int distVolBit) const;
/* 802BDD48 */ f32 calcPitch_(Z2AudibleChannel* channel, const Z2Audible* audible, const Z2AudioCamera* camera) const;
f32 calcFxMix_(f32, int distVolBit) const;
f32 calcPitch_(Z2AudibleChannel* channel, const Z2Audible* audible, const Z2AudioCamera* camera) const;
/* 802BD1FC */ virtual ~Z2Audience();
/* 802BD338 */ virtual JAIAudible* newAudible(const JGeometry::TVec3<f32>& pos, JAISoundID soundID,
virtual ~Z2Audience();
virtual JAIAudible* newAudible(const JGeometry::TVec3<f32>& pos, JAISoundID soundID,
const JGeometry::TVec3<f32>*, u32);
/* 802BDED4 */ virtual int getMaxChannels();
/* 802BD4D4 */ virtual void deleteAudible(JAIAudible* audible);
/* 802BD5B8 */ virtual u32 calcPriority(JAIAudible* audible);
/* 802BD71C */ virtual void mixChannelOut(const JASSoundParams& outParams, JAIAudible* audible, int channelNum);
virtual int getMaxChannels();
virtual void deleteAudible(JAIAudible* audible);
virtual u32 calcPriority(JAIAudible* audible);
virtual void mixChannelOut(const JASSoundParams& outParams, JAIAudible* audible, int channelNum);
Z2SpotMic* getLinkMic() { return mLinkMic; }
JGeometry::TVec3<f32> getAudioCamPos(int camID) {
+42 -42
View File
@@ -36,20 +36,20 @@ public:
class Z2CreatureEnemy : public Z2Creature, public JSULink<Z2CreatureEnemy> {
public:
/* 802C0F64 */ Z2CreatureEnemy();
/* 802C0FC4 */ virtual void deleteObject();
/* 802C1094 */ void init(Vec* animePosPtr, Vec* simplePosPtr, u8 animeHandleNum, u8 simpleHandleNum);
/* 802C10B4 */ void init(Vec*, Vec*, Vec*, u8, u8, u8);
/* 802C10D4 */ virtual void framework(u32 mapinfo, s8 reverb);
/* 802C110C */ virtual Z2SoundHandlePool* startCreatureSound(JAISoundID soundID, u32 mapinfo, s8 reverb);
/* 802C136C */ virtual Z2SoundHandlePool* startCreatureSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb);
/* 802C168C */ virtual Z2SoundHandlePool* startCreatureVoice(JAISoundID soundID, s8 reverb);
/* 802C1948 */ virtual Z2SoundHandlePool* startCreatureVoiceLevel(JAISoundID soundID, s8 reverb);
/* 802C199C */ virtual Z2SoundHandlePool* startCreatureExtraSound(JAISoundID soundID, u32 mapinfo, s8 reverb);
/* 802C19D8 */ virtual Z2SoundHandlePool* startCreatureExtraSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb);
/* 802C1A14 */ virtual Z2SoundHandlePool* startCollisionSE(u32 hitID, u32 mapinfo);
/* 802C1B7C */ void setLinkSearch(bool isLinkSearch);
/* 802C1B90 */ void setEnemyName(const char* enemyName);
Z2CreatureEnemy();
virtual void deleteObject();
void init(Vec* animePosPtr, Vec* simplePosPtr, u8 animeHandleNum, u8 simpleHandleNum);
void init(Vec*, Vec*, Vec*, u8, u8, u8);
virtual void framework(u32 mapinfo, s8 reverb);
virtual Z2SoundHandlePool* startCreatureSound(JAISoundID soundID, u32 mapinfo, s8 reverb);
virtual Z2SoundHandlePool* startCreatureSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb);
virtual Z2SoundHandlePool* startCreatureVoice(JAISoundID soundID, s8 reverb);
virtual Z2SoundHandlePool* startCreatureVoiceLevel(JAISoundID soundID, s8 reverb);
virtual Z2SoundHandlePool* startCreatureExtraSound(JAISoundID soundID, u32 mapinfo, s8 reverb);
virtual Z2SoundHandlePool* startCreatureExtraSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb);
virtual Z2SoundHandlePool* startCollisionSE(u32 hitID, u32 mapinfo);
void setLinkSearch(bool isLinkSearch);
void setEnemyName(const char* enemyName);
/* 0xA0 */ u8 mEnemyID;
/* 0xA1 */ s8 field_0xa1;
@@ -59,13 +59,13 @@ public:
class Z2CreatureCitizen : public Z2Creature, public JSULink<Z2CreatureCitizen> {
public:
/* 802C0C10 */ Z2CreatureCitizen();
/* 802C0C6C */ ~Z2CreatureCitizen();
/* 802C0CE4 */ void init(Vec* animePosPtr, Vec* simplePosPtr, u8 animeHandleNum, u8 simpleHandleNum);
/* 802C0D04 */ virtual void deleteObject();
/* 802C0D48 */ void setMdlType(s8, bool, bool);
/* 802C0E18 */ void playVoice(int);
/* 802C0ED8 */ virtual Z2SoundHandlePool* startCreatureVoice(JAISoundID soundID, s8 reverb);
Z2CreatureCitizen();
~Z2CreatureCitizen();
void init(Vec* animePosPtr, Vec* simplePosPtr, u8 animeHandleNum, u8 simpleHandleNum);
virtual void deleteObject();
void setMdlType(s8, bool, bool);
void playVoice(int);
virtual Z2SoundHandlePool* startCreatureVoice(JAISoundID soundID, s8 reverb);
private:
/* 0xA0 */ s8 mCitizenID;
@@ -76,26 +76,26 @@ private:
class Z2CreatureSumomo : public Z2Creature {
public:
/* 802C1BE8 */ Z2CreatureSumomo();
/* 802C1C24 */ void playSumomoBgm(u32 dist);
/* 802C1CA0 */ void deleteObject();
Z2CreatureSumomo();
void playSumomoBgm(u32 dist);
void deleteObject();
}; // Size: 0x90
class Z2SoundObjBeeGroup : public Z2SoundObjBase {
public:
/* 802C1D10 */ Z2SoundObjBeeGroup();
/* 802C1D4C */ void init(Vec* posPtr, u8 handleNum);
/* 802C1D6C */ void playBeeGroupSound(JAISoundID soundID, u8);
Z2SoundObjBeeGroup();
void init(Vec* posPtr, u8 handleNum);
void playBeeGroupSound(JAISoundID soundID, u8);
}; // Size: 0x20
class Z2CreatureFM : public Z2CreatureEnemy {
public:
/* 802C1F54 */ Z2CreatureFM();
/* 802C1FB0 */ void deleteObject();
/* 802C1FFC */ void init(Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, u8, u8, u8, u8, u8, u8);
/* 802C20E8 */ void framework(u32 mapinfo, s8 reverb);
/* 802C2194 */ Z2SoundHandlePool* startChainSound(JAISoundID soundID, u8, f32, u32 mapinfo, s8 reverb);
/* 802C2290 */ Z2SoundHandlePool* startChainSoundLevel(JAISoundID soundID, u8, f32, u32 mapinfo, s8 reverb);
Z2CreatureFM();
void deleteObject();
void init(Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, u8, u8, u8, u8, u8, u8);
void framework(u32 mapinfo, s8 reverb);
Z2SoundHandlePool* startChainSound(JAISoundID soundID, u8, f32, u32 mapinfo, s8 reverb);
Z2SoundHandlePool* startChainSoundLevel(JAISoundID soundID, u8, f32, u32 mapinfo, s8 reverb);
/* 0x0A4 */ Z2SoundObjSimple field_0xa4;
/* 0x0C4 */ Z2SoundObjSimple field_0xc4;
@@ -105,20 +105,20 @@ public:
class Z2CreatureGob : public Z2Creature {
public:
/* 802C24B0 */ void init(Vec*, Vec*, Vec*, u8, u8, u8);
/* 802C24D0 */ Z2SoundHandlePool* startCreatureVoiceLevel(JAISoundID soundID, s8 reverb);
void init(Vec*, Vec*, Vec*, u8, u8, u8);
Z2SoundHandlePool* startCreatureVoiceLevel(JAISoundID soundID, s8 reverb);
};
class Z2CreatureOI : public Z2CreatureEnemy {
public:
/* 802C2578 */ Z2CreatureOI();
/* 802C25EC */ void deleteObject();
/* 802C2670 */ void init(Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*,
Z2CreatureOI();
void deleteObject();
void init(Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*,
Vec*);
/* 802C2864 */ void framework(u32 mapinfo, s8 reverb);
/* 802C29D4 */ Z2SoundHandlePool* startCreatureSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb);
/* 802C2C84 */ Z2SoundHandlePool* startTentacleSound(JAISoundID soundID, u8, u32 mapinfo, s8 reverb);
/* 802C2CD4 */ Z2SoundHandlePool* startTentacleSoundLevel(JAISoundID soundID, u8, f32, u32 mapinfo, s8 reverb);
void framework(u32 mapinfo, s8 reverb);
Z2SoundHandlePool* startCreatureSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb);
Z2SoundHandlePool* startTentacleSound(JAISoundID soundID, u8, u32 mapinfo, s8 reverb);
Z2SoundHandlePool* startTentacleSoundLevel(JAISoundID soundID, u8, f32, u32 mapinfo, s8 reverb);
/* 0x0A4 */ Z2SoundObjSimple field_0xa4;
/* 0x0C4 */ Z2SoundObjSimple field_0xc4;
+49 -49
View File
@@ -12,10 +12,10 @@ enum WindType {
};
struct Z2EnvSeBase {
/* 802C589C */ Z2EnvSeBase(Vec* posPtr = NULL);
/* 802C58AC */ ~Z2EnvSeBase();
/* 802C5908 */ bool startEnvSe(JAISoundID soundID, f32 fxMix, f32 volume, f32 pan, f32 dolby, f32 pitch, u32 moveSteps);
/* 802C5AB4 */ bool startEnvSeLevel(JAISoundID soundID, f32 fxMix, f32 volume, f32 pan, f32 dolby, f32 pitch, u32 moveSteps);
Z2EnvSeBase(Vec* posPtr = NULL);
~Z2EnvSeBase();
bool startEnvSe(JAISoundID soundID, f32 fxMix, f32 volume, f32 pan, f32 dolby, f32 pitch, u32 moveSteps);
bool startEnvSeLevel(JAISoundID soundID, f32 fxMix, f32 volume, f32 pan, f32 dolby, f32 pitch, u32 moveSteps);
JAISoundHandle* getHandle() { return &mHandle; }
void setPos(Vec* pos) { mPos = pos; }
@@ -25,11 +25,11 @@ struct Z2EnvSeBase {
}; // Size: 0x8
struct Z2EnvSeAutoPan : public Z2EnvSeBase {
/* 802C5ECC */ Z2EnvSeAutoPan();
/* 802C5F28 */ ~Z2EnvSeAutoPan();
/* 802C5F7C */ void setPanParam(f32 pan, f32 dolby, bool, bool, f32, f32);
/* 802C5F98 */ void calcPan();
/* 802C60E0 */ bool startEnvSeAutoPanLevel(JAISoundID soundID, f32 fxMix, f32 volume, f32 pitch);
Z2EnvSeAutoPan();
~Z2EnvSeAutoPan();
void setPanParam(f32 pan, f32 dolby, bool, bool, f32, f32);
void calcPan();
bool startEnvSeAutoPanLevel(JAISoundID soundID, f32 fxMix, f32 volume, f32 pitch);
/* 0x08 */ f32 mPan;
/* 0x0C */ f32 mDolby;
@@ -40,11 +40,11 @@ struct Z2EnvSeAutoPan : public Z2EnvSeBase {
}; // Size: 0x1C
struct Z2EnvSeDir : public Z2EnvSeBase {
/* 802C5C9C */ Z2EnvSeDir(Vec* dir = NULL);
/* 802C5D1C */ ~Z2EnvSeDir();
/* 802C5D70 */ void setPanDir(Vec* dir);
/* 802C5D9C */ void calcPan(f32);
/* 802C5E90 */ bool startEnvSeDirLevel(JAISoundID soundID, f32 fxMix, f32 volume);
Z2EnvSeDir(Vec* dir = NULL);
~Z2EnvSeDir();
void setPanDir(Vec* dir);
void calcPan(f32);
bool startEnvSeDirLevel(JAISoundID soundID, f32 fxMix, f32 volume);
/* 0x08 */ f32 mPan;
/* 0x0C */ f32 mDolby;
@@ -52,41 +52,41 @@ struct Z2EnvSeDir : public Z2EnvSeBase {
}; // Size: 0x1C
struct Z2EnvSeMgr : public JASGlobalInstance<Z2EnvSeMgr> {
/* 802C611C */ Z2EnvSeMgr();
/* 802C6540 */ ~Z2EnvSeMgr();
/* 802C66B0 */ void framework();
/* 802C6998 */ void resetScene();
/* 802C699C */ void resetSceneInner();
/* 802C6AC0 */ void initSceneEnvSe(s32 sceneID, s8 room, f32);
/* 802C6C1C */ void playSceneEnvSe();
/* 802C6C84 */ void initStaticEnvSe(u8, u8, u8, u8, Vec*);
/* 802C70C8 */ bool startStaticEnvSe(s8 reverb);
/* 802C780C */ void registWindowPos(Vec* posPtr);
/* 802C7830 */ bool startRainSe(s32, s8);
/* 802C7CF4 */ void startNearThunderSe(s8 reverb);
/* 802C7E68 */ void startFarThunderSe(Vec* posPtr, s8 reverb);
/* 802C7FB4 */ void setSnowPower(s8 reverb);
/* 802C7FBC */ void initStrongWindSe();
/* 802C7FC8 */ void setWindDirection(Vec* dir);
/* 802C800C */ bool startStrongWindSe(s8 reverb);
/* 802C80F8 */ void initRiverSe(u8, u8, u8, u8);
/* 802C8234 */ void registRiverSePos(Vec* posPtr);
/* 802C8258 */ void setHyrulSewerOpen(bool isSewerOpen);
/* 802C8300 */ bool startRiverSe(s8 reverb);
/* 802C8730 */ void initFallSe(u8, u8, u8, u8);
/* 802C886C */ void registFallSePos(Vec* posPtr);
/* 802C8890 */ bool startFallSe(s8 reverb);
/* 802C8A90 */ void initEtcSe(u8, u8, u8, u8);
/* 802C8C24 */ void registEtcSePos(Vec* posPtr);
/* 802C8C48 */ bool startEtcSe(s8 reverb);
/* 802C92C8 */ void registWolfSmellSePos(Vec* posPtr);
/* 802C92EC */ void startFogWipeTrigger(Vec* pos);
/* 802C93A0 */ void setFogWipeWidth(f32 width);
/* 802C93E4 */ f32 getFogDensity();
/* 802C9400 */ bool startFogSe();
/* 802C950C */ void initLv3WaterSe(u8, u8, u8, u8);
/* 802C9F58 */ void registLv3WaterSePos(u8, Vec* posPtr);
/* 802CA794 */ void startLv3WaterSe(s8 reverb);
Z2EnvSeMgr();
~Z2EnvSeMgr();
void framework();
void resetScene();
void resetSceneInner();
void initSceneEnvSe(s32 sceneID, s8 room, f32);
void playSceneEnvSe();
void initStaticEnvSe(u8, u8, u8, u8, Vec*);
bool startStaticEnvSe(s8 reverb);
void registWindowPos(Vec* posPtr);
bool startRainSe(s32, s8);
void startNearThunderSe(s8 reverb);
void startFarThunderSe(Vec* posPtr, s8 reverb);
void setSnowPower(s8 reverb);
void initStrongWindSe();
void setWindDirection(Vec* dir);
bool startStrongWindSe(s8 reverb);
void initRiverSe(u8, u8, u8, u8);
void registRiverSePos(Vec* posPtr);
void setHyrulSewerOpen(bool isSewerOpen);
bool startRiverSe(s8 reverb);
void initFallSe(u8, u8, u8, u8);
void registFallSePos(Vec* posPtr);
bool startFallSe(s8 reverb);
void initEtcSe(u8, u8, u8, u8);
void registEtcSePos(Vec* posPtr);
bool startEtcSe(s8 reverb);
void registWolfSmellSePos(Vec* posPtr);
void startFogWipeTrigger(Vec* pos);
void setFogWipeWidth(f32 width);
f32 getFogDensity();
bool startFogSe();
void initLv3WaterSe(u8, u8, u8, u8);
void registLv3WaterSePos(u8, Vec* posPtr);
void startLv3WaterSe(s8 reverb);
void setWindType(u8 type) { mWindType = type; }
void registSmellSePos(Vec* posPtr) { registEtcSePos(posPtr); }
+7 -7
View File
@@ -26,13 +26,13 @@ struct Z2FxLineConfig {
}; // Size: 0x30
struct Z2FxLineMgr : public JASGlobalInstance<Z2FxLineMgr> {
/* 802BA7DC */ Z2FxLineMgr();
/* 802BA7FC */ void initDataArc(JKRArchive* arc, JKRHeap* heap);
/* 802BAC28 */ void setLineID(s8 fxID, bool, bool);
/* 802BAC74 */ void setLine(Z2FxLineConfig* config, bool, bool);
/* 802BAE1C */ void setFxForceOff(bool);
/* 802BAE48 */ void setUnderWaterFx(bool isUnderWaterFx);
/* 802BAEB8 */ void setSceneFx(s32 sceneNo);
Z2FxLineMgr();
void initDataArc(JKRArchive* arc, JKRHeap* heap);
void setLineID(s8 fxID, bool, bool);
void setLine(Z2FxLineConfig* config, bool, bool);
void setFxForceOff(bool);
void setUnderWaterFx(bool isUnderWaterFx);
void setSceneFx(s32 sceneNo);
/* 0x00 */ Z2FxLineConfig* mConfig;
/* 0x04 */ void* mFxLineBuffer[4];
+7 -7
View File
@@ -101,9 +101,9 @@ inline Z2CreatureLink* Z2GetLink() {
class Z2CreatureRide;
struct Z2RideSoundStarter : public Z2SoundStarter {
/* 802C5234 */ Z2RideSoundStarter(Z2CreatureRide* ride);
Z2RideSoundStarter(Z2CreatureRide* ride);
/* 802C5284 */ virtual bool startSound(JAISoundID soundID, JAISoundHandle* handle,
virtual bool startSound(JAISoundID soundID, JAISoundHandle* handle,
const JGeometry::TVec3<f32>* posPtr, u32 mapinfo,
f32 fxMix, f32 pitch, f32 volume, f32 pan,
f32 dolby, u32 moveSteps);
@@ -129,11 +129,11 @@ private:
class Z2SoundObjCoach : public Z2SoundObjBase {
public:
/* 802C54B8 */ Z2SoundObjCoach();
/* 802C54FC */ void init(Vec* posPtr, u8 handleNum);
/* 802C551C */ Z2SoundHandlePool* startWheelSound(f32);
/* 802C56C0 */ Z2SoundHandlePool* startFireSound(u16);
/* 802C57C0 */ Z2SoundHandlePool* startSound(JAISoundID soundID, u32 mapinfo, s8 reverb);
Z2SoundObjCoach();
void init(Vec* posPtr, u8 handleNum);
Z2SoundHandlePool* startWheelSound(f32);
Z2SoundHandlePool* startFireSound(u16);
Z2SoundHandlePool* startSound(JAISoundID soundID, u32 mapinfo, s8 reverb);
private:
/* 0x20 */ f32 field_0x20;
+21 -21
View File
@@ -55,29 +55,29 @@ struct Z2MultiSeObj : Z2MultiSeMgr {
class Z2SeMgr : public JASGlobalInstance<Z2SeMgr> {
public:
/* 802AB64C */ Z2SeMgr();
/* 802AB750 */ void initSe();
/* 802AB80C */ void resetModY();
/* 802AB830 */ void modHeightAtCamera(const Vec**);
/* 802AB93C */ void incrCrowdSize();
/* 802AB960 */ void decrCrowdSize();
/* 802AB984 */ bool seStart(JAISoundID soundID, const Vec* posPtr, u32, s8 reverb,
Z2SeMgr();
void initSe();
void resetModY();
void modHeightAtCamera(const Vec**);
void incrCrowdSize();
void decrCrowdSize();
bool seStart(JAISoundID soundID, const Vec* posPtr, u32, s8 reverb,
f32 pitch, f32 volume, f32 pan, f32 dolby, u8);
/* 802AC50C */ bool seStartLevel(JAISoundID soundID, const Vec* posPtr, u32, s8 reverb,
bool seStartLevel(JAISoundID soundID, const Vec* posPtr, u32, s8 reverb,
f32 pitch, f32 volume, f32 pan, f32 dolby, u8);
/* 802AD8B0 */ void seStop(JAISoundID soundID, u32 fadeTime);
/* 802AD94C */ void seStopAll(u32 fadeTime);
/* 802AD9F4 */ void seMoveVolumeAll(f32 volume, u32 moveTime);
/* 802ADB14 */ void messageSePlay(u16, Vec*, s8);
/* 802ADB50 */ void talkInSe();
/* 802ADC54 */ void talkOutSe();
/* 802ADD58 */ void menuInSe();
/* 802ADE5C */ void setLevObjSE(u32 soundID, Vec* posPtr, s8 reverb);
/* 802ADFF4 */ void setMultiTriggerSE(u32 soundID, Vec* posPtr, s8 reverb);
/* 802AE184 */ void processSeFramework();
/* 802AE524 */ bool isLevelSe(JAISoundID soundID);
/* 802AE5B0 */ bool isSoundCulling(JAISoundID soundID);
/* 802B9AC4 */ void resetCrowdSize() { mCrowdSize = 0; }
void seStop(JAISoundID soundID, u32 fadeTime);
void seStopAll(u32 fadeTime);
void seMoveVolumeAll(f32 volume, u32 moveTime);
void messageSePlay(u16, Vec*, s8);
void talkInSe();
void talkOutSe();
void menuInSe();
void setLevObjSE(u32 soundID, Vec* posPtr, s8 reverb);
void setMultiTriggerSE(u32 soundID, Vec* posPtr, s8 reverb);
void processSeFramework();
bool isLevelSe(JAISoundID soundID);
bool isSoundCulling(JAISoundID soundID);
void resetCrowdSize() { mCrowdSize = 0; }
#if PLATFORM_WII || PLATFORM_SHIELD
void homeMenuSeCallback(s32);
+4 -4
View File
@@ -127,18 +127,18 @@ public:
void setFieldBgmPlay(bool value) { mFlags.mFieldBgmPlay = value; }
/* 802B99AC */ void unMuteSceneBgm(u32 fadeTime) {
void unMuteSceneBgm(u32 fadeTime) {
mBgmPause.move(1.0f, 0);
mSceneBgm.move(1.0f, fadeTime);
}
/* 802B9A24 */ void muteSceneBgm(u32 fadeTime, f32 vol) { mSceneBgm.move(vol, fadeTime); }
void muteSceneBgm(u32 fadeTime, f32 vol) { mSceneBgm.move(vol, fadeTime); }
/* 802B9AD0 */ void setTwilightGateVol(f32 vol) {
void setTwilightGateVol(f32 vol) {
mTwilightGateVol = vol < 0.0f ? 0.0f : vol > 1.0f ? 1.0f : vol;
}
/* 802B9AFC */ void setWindStoneVol(f32 vol, u32 fadeTime) { mWindStone.move(vol, fadeTime); };
void setWindStoneVol(f32 vol, u32 fadeTime) { mWindStone.move(vol, fadeTime); };
void onEnemyDamage() { setBattleSeqState(2); }
+14 -14
View File
@@ -9,21 +9,21 @@
class Z2SoundInfo : public JAISoundInfo, public JAUSoundInfo, public JAIStreamDataMgr, public JASGlobalInstance<Z2SoundInfo> {
public:
Z2SoundInfo() : JAISoundInfo(true), JAUSoundInfo(true), JASGlobalInstance<Z2SoundInfo>(true) {}
/* 802BB448 */ virtual u16 getAudibleSw(JAISoundID soundID) const;
/* 802BB00C */ virtual u16 getBgmSeqResourceID(JAISoundID soundID) const;
/* 802BBA88 */ virtual s32 getStreamFileEntry(JAISoundID soundID);
/* 802BB090 */ virtual int getSoundType(JAISoundID soundID) const;
/* 802BB0D8 */ virtual int getCategory(JAISoundID soundID) const;
/* 802BB0E0 */ virtual u32 getPriority(JAISoundID soundID) const;
/* 802BB6DC */ virtual void getSeInfo(JAISoundID soundID, JAISe* sePtr) const;
/* 802BB8B4 */ virtual void getSeqInfo(JAISoundID soundID, JAISeq* seqPtr) const;
/* 802BB8E0 */ virtual void getStreamInfo(JAISoundID soundID, JAIStream* streamPtr) const;
/* 802BBBE0 */ virtual ~Z2SoundInfo() {}
virtual u16 getAudibleSw(JAISoundID soundID) const;
virtual u16 getBgmSeqResourceID(JAISoundID soundID) const;
virtual s32 getStreamFileEntry(JAISoundID soundID);
virtual int getSoundType(JAISoundID soundID) const;
virtual int getCategory(JAISoundID soundID) const;
virtual u32 getPriority(JAISoundID soundID) const;
virtual void getSeInfo(JAISoundID soundID, JAISe* sePtr) const;
virtual void getSeqInfo(JAISoundID soundID, JAISeq* seqPtr) const;
virtual void getStreamInfo(JAISoundID soundID, JAIStream* streamPtr) const;
virtual ~Z2SoundInfo() {}
/* 802BB158 */ JAUAudibleParam getAudibleSwFull(JAISoundID soundID);
/* 802BBA10 */ const char* getStreamFilePath(JAISoundID soundID);
/* 802BBAC8 */ int getSwBit(JAISoundID soundID) const;
/* 802BBB48 */ void getSoundInfo_(JAISoundID soundID, JAISound* soundPtr) const;
JAUAudibleParam getAudibleSwFull(JAISoundID soundID);
const char* getStreamFilePath(JAISoundID soundID);
int getSwBit(JAISoundID soundID) const;
void getSoundInfo_(JAISoundID soundID, JAISound* soundPtr) const;
BOOL isValid() const {
return JASGlobalInstance<JAUSoundTable>::getInstance() != NULL && JASGlobalInstance<JAUSoundTable>::getInstance()->isValid();
+15 -15
View File
@@ -9,22 +9,22 @@ u16 seqCallback(JASTrack* track, u16 command);
class Z2SoundMgr : public JASGlobalInstance<Z2SoundMgr> {
public:
/* 802A9E80 */ Z2SoundMgr();
/* 802AA1B0 */ void calc();
/* 802AA270 */ void setIIR(JAISound* sound, const s16* iir);
/* 802AA33C */ void setFilterOff(JAISound* sound);
/* 802AA430 */ void resetFilterAll();
/* 802AA528 */ void mixOut();
/* 802AA67C */ void framework();
/* 802AA6B0 */ void pauseAllGameSound(bool paused);
/* 802AA7DC */ void stopSoundID(JAISoundID soundID);
/* 802AA84C */ void stopSync();
/* 802AA8C8 */ void stop();
/* 802AA908 */ void initParams();
/* 802AA9E8 */ void multiVolumeSoundID(JAISoundID soundID, f32 volume);
/* 802AAAC4 */ bool isPlayingSoundID(JAISoundID soundID);
Z2SoundMgr();
void calc();
void setIIR(JAISound* sound, const s16* iir);
void setFilterOff(JAISound* sound);
void resetFilterAll();
void mixOut();
void framework();
void pauseAllGameSound(bool paused);
void stopSoundID(JAISoundID soundID);
void stopSync();
void stop();
void initParams();
void multiVolumeSoundID(JAISoundID soundID, f32 volume);
bool isPlayingSoundID(JAISoundID soundID);
/* 802A9EE8 */ virtual bool startSound(JAISoundID soundID, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr);
virtual bool startSound(JAISoundID soundID, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr);
JAISeMgr* getSeMgr() { return &seMgr_; }
const JAISeMgr* getSeMgr() const { return &seMgr_; }
+11 -11
View File
@@ -47,17 +47,17 @@ public:
class Z2SoundObjAnime : public Z2SoundObjBase {
public:
/* 802BEB94 */ Z2SoundObjAnime();
/* 802BEBFC */ void initAnime(void* animation, bool, f32 startFrame, f32);
/* 802BED68 */ void ageSounds_();
/* 802BEED4 */ void updateAnime(f32, f32);
/* 802BF304 */ void updateSoundLifeTime_(f32, f32);
/* 802BF660 */ void startSoundInner(const JGeometry::TVec3<f32>& pos, f32 param_1,
Z2SoundObjAnime();
void initAnime(void* animation, bool, f32 startFrame, f32);
void ageSounds_();
void updateAnime(f32, f32);
void updateSoundLifeTime_(f32, f32);
void startSoundInner(const JGeometry::TVec3<f32>& pos, f32 param_1,
Z2SoundStarter* soundStarter, u32 mapinfo, s8 reverb);
/* 802BF890 */ u32 getSoundID(const JAUSoundAnimationSound* animationSound, const JGeometry::TVec3<f32>&, f32);
/* 802BF898 */ bool playsSound(const JAUSoundAnimationSound* animationSound, const JGeometry::TVec3<f32>&, f32);
u32 getSoundID(const JAUSoundAnimationSound* animationSound, const JGeometry::TVec3<f32>&, f32);
bool playsSound(const JAUSoundAnimationSound* animationSound, const JGeometry::TVec3<f32>&, f32);
/* 802BEBDC */ virtual void init(Vec* posPtr, u8 handleNum);
virtual void init(Vec* posPtr, u8 handleNum);
void stopAnime() { animation_ = NULL; }
@@ -106,8 +106,8 @@ public:
class Z2SoundObjArrow : public Z2DopplerSoundObjBase {
public:
/* 802BEB38 */ Z2SoundObjArrow();
/* 802BEB74 */ virtual void init(Vec* posPtr, u8 handleNum);
Z2SoundObjArrow();
virtual void init(Vec* posPtr, u8 handleNum);
};
#endif /* Z2SOUNDOBJECT_H */
+12 -12
View File
@@ -6,9 +6,9 @@
#include "Z2AudioLib/Z2SoundStarter.h"
struct Z2SpeechStarter : public Z2SoundStarter {
/* 802CCFB8 */ Z2SpeechStarter();
Z2SpeechStarter();
/* 802CCFF8 */ virtual bool startSound(JAISoundID, JAISoundHandle*,
virtual bool startSound(JAISoundID, JAISoundHandle*,
JGeometry::TVec3<f32> const*, u32, f32, f32, f32, f32,
f32, u32);
};
@@ -18,17 +18,17 @@ struct Z2SpeechMgr : public JASGlobalInstance<Z2SpeechMgr> {
};
struct Z2SpeechMgr2 : public JASGlobalInstance<Z2SpeechMgr2> {
/* 802CBC60 */ Z2SpeechMgr2();
Z2SpeechMgr2();
~Z2SpeechMgr2() {}
/* 802CBD88 */ void setString(u16 const*, s16, u8, u16);
/* 802CBF60 */ void setTextCount(s16);
/* 802CC190 */ void speakOneWord(bool);
/* 802CC2FC */ bool isNonVerbal();
/* 802CC4C0 */ void selectUnit(bool);
/* 802CC738 */ void selectTail();
/* 802CC9D0 */ void framework();
/* 802CCA18 */ void playOneShotVoice(u8, u16, Vec*, s8);
/* 802CCF88 */ bool isMidnaSpeak();
void setString(u16 const*, s16, u8, u16);
void setTextCount(s16);
void speakOneWord(bool);
bool isNonVerbal();
void selectUnit(bool);
void selectTail();
void framework();
void playOneShotVoice(u8, u16, Vec*, s8);
bool isMidnaSpeak();
/* 0x000 */ JAISoundHandle field_0x0;
/* 0x004 */ JAISoundHandle field_0x4;