mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-20 05:16:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

project cleanup (#2895)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
src/Z2AudioLib/Z2Audience.cpp
-64
View File
@@ -8,15 +8,11 @@
#include "JSystem/JGeometry.h"
#include "JSystem/J3DU/J3DUD.h"
/* 802BBCDC-802BBD18 2B661C 003C+00 1/1 0/0 0/0 .text
* calc__15Z2AudibleAbsPosFRCQ29JGeometry8TVec3<f> */
void Z2AudibleAbsPos::calc(const JGeometry::TVec3<f32>& pos) {
velocity_.sub(pos, field_0x0);
field_0x0.set(pos);
}
/* 802BBD18-802BBD94 2B6658 007C+00 1/1 0/0 0/0 .text
* init__15Z2AudibleAbsPosFPQ29JGeometry8TVec3<f>RCQ29JGeometry8TVec3<f>PCQ29JGeometry8TVec3<f> */
void Z2AudibleAbsPos::init(JGeometry::TVec3<f32>* param_0, const JGeometry::TVec3<f32>& param_1,
const JGeometry::TVec3<f32>* param_2) {
param_0->set(param_1);
@@ -30,8 +26,6 @@ void Z2AudibleAbsPos::init(JGeometry::TVec3<f32>* param_0, const JGeometry::TVec
}
}
/* 802BBD94-802BBE74 2B66D4 00E0+00 1/1 0/0 0/0 .text
* __ct__9Z2AudibleFRCQ29JGeometry8TVec3<f>PCQ29JGeometry8TVec3<f>Ulb */
Z2Audible::Z2Audible(const JGeometry::TVec3<f32>& pos, const JGeometry::TVec3<f32>* param_1,
u32 channel, bool param_3) {
mParam.field_0x0.raw = 0xFFFFFFFF;
@@ -48,25 +42,20 @@ Z2Audible::Z2Audible(const JGeometry::TVec3<f32>& pos, const JGeometry::TVec3<f3
}
}
/* 802BBE74-802BBE98 2B67B4 0024+00 1/1 0/0 0/0 .text __ct__16Z2AudibleChannelFv */
Z2AudibleChannel::Z2AudibleChannel() {}
/* 802BBE98-802BBED0 2B67D8 0038+00 1/0 0/0 0/0 .text calc__9Z2AudibleFv */
void Z2Audible::calc() {
if (isDoppler()) {
mAbsPos.calc(mPos);
}
}
/* 802BBED0-802BBEE4 2B6810 0014+00 1/0 0/0 0/0 .text getOuterParams__9Z2AudibleFi */
JASSoundParams* Z2Audible::getOuterParams(int index) {
JUT_ASSERT(80, index >= 0);
JUT_ASSERT(81, index < 1);
return &mChannel[index].mParams;
}
/* 802BBEE4-802BC204 2B6824 0320+00 1/1 0/0 0/0 .text
* setOuterParams__9Z2AudibleFRC14JASSoundParamsRC14JASSoundParamsi */
void Z2Audible::setOuterParams(const JASSoundParams& outParams, const JASSoundParams& inParams,
int index) {
JUT_ASSERT(89, index >= 0);
@@ -145,14 +134,12 @@ void Z2Audible::setOuterParams(const JASSoundParams& outParams, const JASSoundPa
channel->mDolby = params.mDolby;
}
/* 802BC204-802BC218 2B6B44 0014+00 4/4 0/0 0/0 .text getChannel__9Z2AudibleFi */
Z2AudibleChannel* Z2Audible::getChannel(int index) {
JUT_ASSERT(220, index >= 0);
JUT_ASSERT(221, index < 1);
return &mChannel[index];
}
/* 802BC218-802BC248 2B6B58 0030+00 3/3 0/0 0/0 .text getDistVolBit__9Z2AudibleFv */
u32 Z2Audible::getDistVolBit() {
u16 uVar1 = getAudibleParam()->field_0x0.half.f1;
if (uVar1 != 0) {
@@ -167,14 +154,12 @@ u32 Z2Audible::getDistVolBit() {
return 0;
}
/* 802BC248-802BC284 2B6B88 003C+00 1/1 0/0 0/0 .text __ct__19Z2Audience3DSettingFv */
Z2Audience3DSetting::Z2Audience3DSetting() {
mVolumeDistInit = false;
mDolbyDistInit = false;
init();
}
/* 802BC284-802BC308 2B6BC4 0084+00 1/1 0/0 0/0 .text init__19Z2Audience3DSettingFv */
void Z2Audience3DSetting::init() {
field_0x40 = Z2Param::MIN_DISTANCE_VOLUME;
field_0x48 = Z2Param::DOLBY_BEHIND_DISTANCE_MAX;
@@ -191,7 +176,6 @@ void Z2Audience3DSetting::init() {
initDolbyDist();
}
/* 802BC308-802BC4D0 2B6C48 01C8+00 2/2 0/0 0/0 .text initVolumeDist__19Z2Audience3DSettingFv */
void Z2Audience3DSetting::initVolumeDist() {
if (mVolumeDistInit) return;
@@ -205,10 +189,8 @@ void Z2Audience3DSetting::initVolumeDist() {
mVolumeDistInit = true;
}
/* 80451350-80451354 000850 0004+00 2/2 0/0 0/0 .sbss cNearFarRatio */
static f32 cNearFarRatio = Z2Param::MAX_VOLUME_DISTANCE / Z2Param::DISTANCE_MAX;
/* 802BC4D0-802BC6A4 2B6E10 01D4+00 1/1 0/0 0/0 .text updateVolumeDist__19Z2Audience3DSettingFf */
void Z2Audience3DSetting::updateVolumeDist(f32 param_0) {
field_0x0[0] = param_0;
@@ -225,7 +207,6 @@ void Z2Audience3DSetting::updateVolumeDist(f32 param_0) {
mVolumeDistInit = false;
}
/* 802BC6A4-802BC6F8 2B6FE4 0054+00 1/1 0/0 0/0 .text initDolbyDist__19Z2Audience3DSettingFv */
void Z2Audience3DSetting::initDolbyDist() {
if (!mDolbyDistInit) {
field_0x44 = Z2Param::DOLBY_FLONT_DISTANCE_MAX;
@@ -236,7 +217,6 @@ void Z2Audience3DSetting::initDolbyDist() {
}
}
/* 802BC6F8-802BC758 2B7038 0060+00 1/1 0/0 0/0 .text updateDolbyDist__19Z2Audience3DSettingFff */
void Z2Audience3DSetting::updateDolbyDist(f32 param_0, f32 param_1) {
if (param_0 > -1.0f * Z2Param::DOLBY_FLONT_DISTANCE_MAX) {
field_0x44 = -1.0f * param_0;
@@ -257,7 +237,6 @@ void Z2Audience3DSetting::updateDolbyDist(f32 param_0, f32 param_1) {
mDolbyDistInit = false;
}
/* 802BC758-802BC788 2B7098 0030+00 1/1 0/0 0/0 .text __ct__13Z2AudioCameraFv */
Z2AudioCamera::Z2AudioCamera() {
mFovySin = 1.0f;
mVolCenterZ = 0.0f;
@@ -269,7 +248,6 @@ Z2AudioCamera::Z2AudioCamera() {
mSetMainCamera = 0;
}
/* 802BC788-802BC7DC 2B70C8 0054+00 1/1 0/0 0/0 .text init__13Z2AudioCameraFv */
void Z2AudioCamera::init() {
JGeometry::TPosition3f32 aTStack_38;
aTStack_38.identity();
@@ -278,8 +256,6 @@ void Z2AudioCamera::init() {
setCameraState(aTStack_38, *(Vec*)&VStack_44, true);
}
/* 802BC7DC-802BC8AC 2B711C 00D0+00 2/2 0/0 0/0 .text setCameraState__13Z2AudioCameraFPA4_CfR3Vecb
*/
void Z2AudioCamera::setCameraState(f32 const (*param_0)[4], Vec& pos, bool param_2) {
field_0x0.set(param_0);
if (param_2) {
@@ -293,8 +269,6 @@ void Z2AudioCamera::setCameraState(f32 const (*param_0)[4], Vec& pos, bool param
}
}
/* 802BC8AC-802BCBEC 2B71EC 0340+00 1/1 0/0 0/0 .text
* setCameraState__13Z2AudioCameraFPA4_fR3VecR3Vecffbb */
void Z2AudioCamera::setCameraState(f32 (*param_0)[4], Vec& pos, Vec& param_2, f32 param_3,
f32 param_4, bool param_5, bool param_6) {
JGeometry::TVec3<f32> aTStack_c0;
@@ -348,8 +322,6 @@ void Z2AudioCamera::setCameraState(f32 (*param_0)[4], Vec& pos, Vec& param_2, f3
setCameraState(param_0, pos, param_6);
}
/* 802BCBEC-802BCC7C 2B752C 0090+00 2/2 0/0 0/0 .text
* convertAbsToRel__13Z2AudioCameraFP9Z2Audiblei */
void Z2AudioCamera::convertAbsToRel(Z2Audible* audible, int channelNum) {
JUT_ASSERT(508, audible);
JUT_ASSERT(509, channelNum >= 0);
@@ -369,15 +341,11 @@ void Z2AudioCamera::convertAbsToRel(Z2Audible* audible, int channelNum) {
relPos->field_0x10 = aTStack_38.length();
}
/* 802BCC7C-802BCCC0 2B75BC 0044+00 2/2 0/0 0/0 .text convertAbsToRel__13Z2AudioCameraCFR3VecP3Vec
*/
bool Z2AudioCamera::convertAbsToRel(Vec& src, Vec* dst) const {
MTXMultVec(field_0x0, &src, dst);
return isInSight(*dst);
}
/* 802BCCC0-802BCD28 2B7600 0068+00 1/1 0/0 0/0 .text isInSight__13Z2AudioCameraCFR3Vec
*/
bool Z2AudioCamera::isInSight(Vec& param_0) const {
if (param_0.z >= 0.0f) {
return false;
@@ -394,7 +362,6 @@ bool Z2AudioCamera::isInSight(Vec& param_0) const {
return true;
}
/* 802BCD28-802BCDA8 2B7668 0080+00 1/1 0/0 0/0 .text __ct__9Z2SpotMicFv */
Z2SpotMic::Z2SpotMic() {
field_0x0 = 200.0f;
field_0x4 = 400.0f;
@@ -410,7 +377,6 @@ Z2SpotMic::Z2SpotMic() {
}
}
/* 802BCDA8-802BCDE8 2B76E8 0040+00 2/2 0/0 0/0 .text clearMicState__9Z2SpotMicFi */
void Z2SpotMic::clearMicState(int camID) {
field_0x10[camID] = NULL;
field_0x18[camID] = field_0xc;
@@ -418,12 +384,10 @@ void Z2SpotMic::clearMicState(int camID) {
calcVolumeFactor(camID);
}
/* 802BCDE8-802BCE14 2B7728 002C+00 2/2 0/0 0/0 .text calcVolumeFactor__9Z2SpotMicFi */
void Z2SpotMic::calcVolumeFactor(int camID) {
field_0x20[camID] = (field_0x8 - field_0x18[camID]) / (field_0x4 - field_0x0);
}
/* 802BCE14-802BCF5C 2B7754 0148+00 1/1 0/0 0/0 .text setMicState__9Z2SpotMicFP13Z2AudioCamerai */
void Z2SpotMic::setMicState(Z2AudioCamera* camera, int camID) {
JUT_ASSERT(622, camID >= 0);
JUT_ASSERT(623, camID < 1);
@@ -456,8 +420,6 @@ void Z2SpotMic::setMicState(Z2AudioCamera* camera, int camID) {
}
}
/* 802BCF5C-802BCFE4 2B789C 0088+00 2/2 0/0 0/0 .text calcMicDist__9Z2SpotMicFP9Z2Audible
*/
f32 Z2SpotMic::calcMicDist(Z2Audible* audible) {
if (!mMicOn) {
return 0.0f;
@@ -476,7 +438,6 @@ f32 Z2SpotMic::calcMicDist(Z2Audible* audible) {
return aTStack_1c.length();
}
/* 802BCFE4-802BD03C 2B7924 0058+00 1/1 0/0 0/0 .text calcMicPriority__9Z2SpotMicFf */
u32 Z2SpotMic::calcMicPriority(f32 param_0) {
if (param_0 > field_0x4) {
return Z2GetAudience()->getSetting()->field_0x64;
@@ -489,7 +450,6 @@ u32 Z2SpotMic::calcMicPriority(f32 param_0) {
return field_0x1c * (param_0 - field_0x0);
}
/* 802BD03C-802BD130 2B797C 00F4+00 1/1 0/0 0/0 .text calcMicVolume__9Z2SpotMicFfif */
f32 Z2SpotMic::calcMicVolume(f32 param_0, int camID, f32 param_2) {
JUT_ASSERT(687, camID >= 0);
JUT_ASSERT(688, camID < 1);
@@ -531,7 +491,6 @@ f32 Z2SpotMic::calcMicVolume(f32 param_0, int camID, f32 param_2) {
return param_2;
}
/* 802BD130-802BD1FC 2B7A70 00CC+00 0/0 1/1 0/0 .text __ct__10Z2AudienceFv */
Z2Audience::Z2Audience() : JASGlobalInstance<Z2Audience>(true), field_0x4(1.0f), field_0x8(0x7f) {
mNumPlayers = 1;
mUsingOffMicVol = false;
@@ -540,13 +499,10 @@ Z2Audience::Z2Audience() : JASGlobalInstance<Z2Audience>(true), field_0x4(1.0f),
mLinkMic = mSpotMic;
}
/* 802BD1FC-802BD288 2B7B3C 008C+00 1/0 1/1 0/0 .text __dt__10Z2AudienceFv */
Z2Audience::~Z2Audience() {
// JUT_ASSERT(751, !isActive()); // TODO: need to setup rest of JASMemPool stuff
}
/* 802BD2DC-802BD338 2B7C1C 005C+00 0/0 1/1 0/0 .text
* setAudioCamera__10Z2AudienceFPA4_fR3VecR3Vecffbib */
void Z2Audience::setAudioCamera(f32 (*param_0)[4], Vec& pos, Vec& param_2, f32 param_3,
f32 param_4, bool param_5, int camID, bool param_7) {
JUT_ASSERT(687, camID >= 0);
@@ -555,8 +511,6 @@ void Z2Audience::setAudioCamera(f32 (*param_0)[4], Vec& pos, Vec& param_2, f32 p
mLinkMic->setMicState(&mAudioCamera[camID], camID);
}
/* 802BD338-802BD4D4 2B7C78 019C+00 1/0 0/0 0/0 .text
* newAudible__10Z2AudienceFRCQ29JGeometry8TVec3<f>10JAISoundIDPCQ29JGeometry8TVec3<f>Ul */
JAIAudible* Z2Audience::newAudible(const JGeometry::TVec3<f32>& pos, JAISoundID soundID,
const JGeometry::TVec3<f32>* param_2, u32 param_3) {
u32 channelNum = param_3 | ~((1 << mNumPlayers) + -1);
@@ -593,15 +547,12 @@ JAIAudible* Z2Audience::newAudible(const JGeometry::TVec3<f32>& pos, JAISoundID
return audible;
}
/* 802BD4D4-802BD510 2B7E14 003C+00 1/0 0/0 0/0 .text deleteAudible__10Z2AudienceFP10JAIAudible */
void Z2Audience::deleteAudible(JAIAudible* audible) {
delete audible;
}
/* 802BD510-802BD5B8 2B7E50 00A8+00 1/0 0/0 0/0 .text __dt__9Z2AudibleFv */
Z2Audible::~Z2Audible() {}
/* 802BD5B8-802BD704 2B7EF8 014C+00 1/0 0/0 0/0 .text calcPriority__10Z2AudienceFP10JAIAudible */
u32 Z2Audience::calcPriority(JAIAudible* audible) {
Z2Audible* Z2audible = (Z2Audible*)audible;
@@ -640,7 +591,6 @@ u32 Z2Audience::calcPriority(JAIAudible* audible) {
return rv;
}
/* 802BD704-802BD71C 2B8044 0018+00 1/1 1/1 0/0 .text calcOffMicSound__10Z2AudienceFf */
f32 Z2Audience::calcOffMicSound(f32 param_0) {
if (mUsingOffMicVol == 0) {
return param_0;
@@ -649,8 +599,6 @@ f32 Z2Audience::calcOffMicSound(f32 param_0) {
return param_0 * field_0x4;
}
/* 802BD71C-802BD90C 2B805C 01F0+00 1/0 0/0 0/0 .text
* mixChannelOut__10Z2AudienceFRC14JASSoundParamsP10JAIAudiblei */
void Z2Audience::mixChannelOut(const JASSoundParams& outParams, JAIAudible* audible, int channelNum) {
Z2Audible* Z2audible = (Z2Audible*)audible;
Z2AudibleChannel* channel = Z2audible->getChannel(channelNum);
@@ -711,19 +659,16 @@ void Z2Audience::mixChannelOut(const JASSoundParams& outParams, JAIAudible* audi
}
/* 802BD90C-802BD92C 2B824C 0020+00 0/0 1/1 0/0 .text setTargetVolume__10Z2AudienceFfi */
void Z2Audience::setTargetVolume(f32 volume, int index) {
mAudioCamera[index].setTargetVolume(volume);
}
/* 802BD92C-802BD95C 2B826C 0030+00 0/0 4/4 0/0 .text convertAbsToRel__10Z2AudienceFR3VecP3Veci */
bool Z2Audience::convertAbsToRel(Vec& src, Vec* dst, int camID) {
JUT_ASSERT(1036, camID >= 0);
JUT_ASSERT(1037, camID < mNumPlayers);
return getAudioCamera(camID)->convertAbsToRel(src, dst);
}
/* 802BD95C-802BDA44 2B829C 00E8+00 0/0 3/3 0/0 .text calcRelPosVolume__10Z2AudienceFRC3Vecfi */
f32 Z2Audience::calcRelPosVolume(const Vec& param_0, f32 param_1, int camID) {
JGeometry::TVec3<f32> aTStack_3c(param_0);
aTStack_3c.z += mAudioCamera[camID].getVolCenterZ();
@@ -745,8 +690,6 @@ f32 Z2Audience::calcRelPosVolume(const Vec& param_0, f32 param_1, int camID) {
0.0f, 1.0f);
}
/* 802BDA44-802BDB44 2B8384 0100+00 1/1 3/3 0/0 .text calcRelPosPan__10Z2AudienceFRC3Veci
*/
f32 Z2Audience::calcRelPosPan(const Vec& param_0, int camID) {
Vec local_54 = param_0;
local_54.y = 0.0f;
@@ -781,7 +724,6 @@ f32 Z2Audience::calcRelPosPan(const Vec& param_0, int camID) {
return dVar6;
}
/* 802BDB44-802BDBDC 2B8484 0098+00 1/1 3/3 0/0 .text calcRelPosDolby__10Z2AudienceFRC3Veci */
f32 Z2Audience::calcRelPosDolby(const Vec& param_0, int camID) {
f32 fVar1 = param_0.z + mAudioCamera[camID].getDolbyCenterZ();
if (fVar1 > mSetting.field_0x48) {
@@ -805,7 +747,6 @@ f32 Z2Audience::calcRelPosDolby(const Vec& param_0, int camID) {
1.0f, Z2Calc::CURVE_NEGATIVE);
}
/* 802BDBDC-802BDC44 2B851C 0068+00 1/1 0/0 0/0 .text calcVolume___10Z2AudienceCFfi */
f32 Z2Audience::calcVolume_(f32 param_0, int distVolBit) const {
if (param_0 > mSetting.field_0x0[distVolBit]) {
return mSetting.field_0x40;
@@ -818,7 +759,6 @@ f32 Z2Audience::calcVolume_(f32 param_0, int distVolBit) const {
return JGeometry::TUtil<f32>::clamp((mSetting.field_0x70[distVolBit] * (param_0 - mSetting.field_0x3c)) + 1.0f, 0.0f, 1.0f);
}
/* 802BDC44-802BDCB0 2B8584 006C+00 2/2 0/0 0/0 .text calcDeltaPriority___10Z2AudienceCFfib */
u32 Z2Audience::calcDeltaPriority_(f32 param_0, int distVolBit, bool param_2) const {
if (param_0 > mSetting.field_0x0[distVolBit]) {
if (param_2) {
@@ -845,7 +785,6 @@ f32 Z2Audience::calcPitchDoppler_(const JGeometry::TVec3<f32>& param_0,
return (mSetting.field_0x5c + param_3 * dVar8) / (mSetting.field_0x5c + param_3 * dVar7);
}
/* 802BDD00-802BDD48 2B8640 0048+00 1/1 0/0 0/0 .text calcFxMix___10Z2AudienceCFfi */
f32 Z2Audience::calcFxMix_(f32 param_0, int distVolBit) const {
if (param_0 > mSetting.field_0x0[distVolBit]) {
return mSetting.field_0x54;
@@ -856,8 +795,6 @@ f32 Z2Audience::calcFxMix_(f32 param_0, int distVolBit) const {
return mSetting.field_0x50 + mSetting.field_0xe8[distVolBit] * (param_0 - mSetting.field_0x3c);
}
/* 802BDD48-802BDED4 2B8688 018C+00 1/1 0/0 0/0 .text
* calcPitch___10Z2AudienceCFP16Z2AudibleChannelPC9Z2AudiblePC13Z2AudioCamera */
f32 Z2Audience::calcPitch_(Z2AudibleChannel* channel, const Z2Audible* audible, const Z2AudioCamera* camera) const {
JAUAudibleParam audParam = *audible->getAudibleParam();
if ((*(u8*)&audParam.field_0x0.raw >> 4) & 0xf) {
@@ -890,7 +827,6 @@ f32 Z2Audience::calcPitch_(Z2AudibleChannel* channel, const Z2Audible* audible,
return 1.0f;
}
/* 802BDED4-802BDEDC 2B8814 0008+00 1/0 0/0 0/0 .text getMaxChannels__10Z2AudienceFv */
int Z2Audience::getMaxChannels() {
return mNumPlayers;
}
src/Z2AudioLib/Z2AudioArcLoader.cpp
-5
View File
@@ -6,10 +6,8 @@
#include "Z2AudioLib/Z2FxLineMgr.h"
#include "m_Do/m_Do_ext.h"
/* 802A9A34-802A9A70 2A4374 003C+00 0/0 1/1 0/0 .text __ct__16Z2AudioArcLoaderFP10JAUSection */
Z2AudioArcLoader::Z2AudioArcLoader(JAUSection* section) : JAUAudioArcLoader(section) {}
/* 802A9A70-802A9AC8 2A43B0 0058+00 1/0 0/0 0/0 .text readCommandMore__16Z2AudioArcLoaderFUl */
bool Z2AudioArcLoader::readCommandMore(u32 command) {
bool rv = false;
u32 read = 0;
@@ -25,7 +23,6 @@ bool Z2AudioArcLoader::readCommandMore(u32 command) {
return rv;
}
/* 802A9AC8-802A9B54 2A4408 008C+00 1/1 0/0 0/0 .text readBFCA__16Z2AudioArcLoaderFPCv */
void Z2AudioArcLoader::readBFCA(const void* addr) {
JUT_ASSERT(76, addr);
@@ -38,8 +35,6 @@ void Z2AudioArcLoader::readBFCA(const void* addr) {
JKRUnmountArchive(archive);
}
/* 802A9B54-802A9B58 2A4494 0004+00 1/0 0/0 0/0 .text readBSTN__16Z2AudioArcLoaderFPCvUl
*/
void Z2AudioArcLoader::readBSTN(const void* addr, u32 param_1) {
#if VERSION == VERSION_SHIELD_DEBUG
JAUSectionHeap* sectionHeap = JASGlobalInstance<JAUSectionHeap>::getInstance();
src/Z2AudioLib/Z2AudioMgr.cpp
-13
View File
@@ -16,19 +16,14 @@
#include "Z2AudioLib/Z2AudioCS.h"
#endif
/* 80451368-80451370 000868 0004+04 1/1 251/251 900/900 .sbss mAudioMgrPtr__10Z2AudioMgr
*/
Z2AudioMgr* Z2AudioMgr::mAudioMgrPtr;
/* 802CD248-802CD34C 2C7B88 0104+00 0/0 1/1 0/0 .text __ct__10Z2AudioMgrFv */
Z2AudioMgr::Z2AudioMgr() : mSoundStarter(true) {
mAudioMgrPtr = this;
mResettingFlag = false;
field_0x519 = false;
}
/* 802CD34C-802CD7F8 2C7C8C 04AC+00 0/0 1/1 0/0 .text
* init__10Z2AudioMgrFP12JKRSolidHeapUlPvP10JKRArchive */
// NONMATCHING JASPoolAllocObject<_> locations
void Z2AudioMgr::init(JKRSolidHeap* heap, u32 memSize, void* baaData, JKRArchive* seqArc) {
JAU_JASInitializer JASInitializer;
@@ -139,14 +134,12 @@ void Z2AudioMgr::init(JKRSolidHeap* heap, u32 memSize, void* baaData, JKRArchive
#endif
}
/* 802CD888-802CD8B4 2C81C8 002C+00 0/0 5/5 0/0 .text setOutputMode__10Z2AudioMgrFUl */
void Z2AudioMgr::setOutputMode(u32 mode) {
if (mode <= 2) {
JAISetOutputMode(mode);
}
}
/* 802CD8B4-802CD904 2C81F4 0050+00 1/1 0/0 0/0 .text zeldaGFrameWork__10Z2AudioMgrFv */
void Z2AudioMgr::zeldaGFrameWork() {
processTime();
mSpeechMgr.framework();
@@ -159,7 +152,6 @@ void Z2AudioMgr::zeldaGFrameWork() {
#endif
}
/* 802CD904-802CD974 2C8244 0070+00 0/0 1/1 0/0 .text gframeProcess__10Z2AudioMgrFv */
void Z2AudioMgr::gframeProcess() {
zeldaGFrameWork();
@@ -173,7 +165,6 @@ void Z2AudioMgr::gframeProcess() {
}
}
/* 802CD974-802CD9CC 2C82B4 0058+00 0/0 3/3 0/0 .text resetProcess__10Z2AudioMgrFUlb */
void Z2AudioMgr::resetProcess(u32 param_0, bool param_1) {
JUT_ASSERT(413, !mResettingFlag);
@@ -182,7 +173,6 @@ void Z2AudioMgr::resetProcess(u32 param_0, bool param_1) {
mResettingFlag = true;
}
/* 802CD9CC-802CDA6C 2C830C 00A0+00 0/0 1/1 0/0 .text resetRecover__10Z2AudioMgrFv */
void Z2AudioMgr::resetRecover() {
JUT_ASSERT(427, mResettingFlag);
JUT_ASSERT(428, mAudioReseter.checkDone());
@@ -199,14 +189,11 @@ void Z2AudioMgr::resetRecover() {
}
/* 802CDA6C-802CDB1C 2C83AC 00B0+00 0/0 2/2 0/0 .text hasReset__10Z2AudioMgrCFv */
bool Z2AudioMgr::hasReset() const {
return mResettingFlag && mAudioReseter.checkDone() &&
(field_0x519 || (mSoundMgr.getSeMgr()->getNumActiveSe() == 0 && mSoundMgr.getSeqMgr()->getNumActiveSeqs() == 0));
}
/* 802CDB1C-802CDB68 2C845C 004C+00 1/0 1/0 0/0 .text
* startSound__10Z2AudioMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f> */
bool Z2AudioMgr::startSound(JAISoundID soundID, JAISoundHandle* handle,
const JGeometry::TVec3<f32>* posPtr) {
if (mResettingFlag) {
src/Z2AudioLib/Z2Calc.cpp
-12
View File
@@ -2,8 +2,6 @@
#include "JSystem/JMath/random.h"
#include <math.h>
/* 802A968C-802A96F4 2A3FCC 0068+00 1/1 16/16 0/0 .text linearTransform__6Z2CalcFfffffb
*/
f32 Z2Calc::linearTransform(f32 inValue, f32 inMin, f32 inMax, f32 outMin, f32 outMax, bool noClamp) {
f32 transformed = outMin + ((inValue - inMin) * ((outMax - outMin) / (inMax - inMin)));
if (noClamp) {
@@ -21,14 +19,10 @@ f32 Z2Calc::linearTransform(f32 inValue, f32 inMin, f32 inMax, f32 outMin, f32 o
}
}
/* 80455820-80455824 003E20 0004+00 0/0 1/1 0/0 .sdata2 cEqualCSlope__6Z2Calc */
const f32 Z2Calc::cEqualCSlope = 1.0f;
/* 80455824-80455828 003E24 0004+00 0/0 1/1 0/0 .sdata2 cEqualPSlope__6Z2Calc */
const f32 Z2Calc::cEqualPSlope = 0.5f;
/* 802A96F4-802A9814 2A4034 0120+00 0/0 29/29 0/0 .text
* getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign */
f32 Z2Calc::getParamByExp(f32 value, f32 inMin, f32 inMax, f32 exponent, f32 outMin, f32 outMax, Z2Calc::CurveSign curveSign) {
if (curveSign == Z2Calc::CURVE_POSITIVE) {
value = linearTransform(value, inMin, inMax, 0.0f, exponent, true);
@@ -47,7 +41,6 @@ f32 Z2Calc::getParamByExp(f32 value, f32 inMin, f32 inMax, f32 exponent, f32 out
value;
}
/* 802A9814-802A98D4 2A4154 00C0+00 0/0 2/2 0/0 .text getRandom__6Z2CalcFfff */
f32 Z2Calc::getRandom(f32 magnitude, f32 exponent, f32 bias) {
f32 posBias = 2.0f * bias;
f32 negBias = (1.0f - bias) * -2.0f;
@@ -57,13 +50,11 @@ f32 Z2Calc::getRandom(f32 magnitude, f32 exponent, f32 bias) {
return exprnd * magnitude;
}
/* 802A98D4-802A9944 2A4214 0070+00 1/1 1/1 0/0 .text getRandom_0_1__6Z2CalcFv */
f32 Z2Calc::getRandom_0_1() {
static JMath::TRandom_<JMath::TRandom_fast_> oRandom(0);
return oRandom.get_ufloat_1();
}
/* 802A9944-802A9958 2A4284 0014+00 0/0 1/1 0/0 .text setParam__Q26Z2Calc8FNoise1fFfff */
void Z2Calc::FNoise1f::setParam(f32 value, f32 threshold, f32 step) {
value_ = value;
targetValue_ = value;
@@ -71,7 +62,6 @@ void Z2Calc::FNoise1f::setParam(f32 value, f32 threshold, f32 step) {
step_ = step;
}
/* 802A9958-802A99A0 2A4298 0048+00 1/1 0/0 0/0 .text tau__Q26Z2Calc8FNoise1fFf */
f32 Z2Calc::FNoise1f::tau(f32 input) {
f32 var_f30 = 1.0f;
@@ -91,8 +81,6 @@ f32 Z2Calc::FNoise1f::tau(f32 input) {
return result;
}
/* 802A99A0-802A9A34 2A42E0 0094+00 0/0 5/5 0/0 .text calcNoise1f__Q26Z2Calc8FNoise1fFv
*/
f32 Z2Calc::FNoise1f::calcNoise1f() {
if (value_ < targetValue_) {
value_ += step_;
src/Z2AudioLib/Z2Creature.cpp
-101
View File
@@ -8,29 +8,21 @@ static void Z2_E_ms_modVol(Z2SoundHandlePool*, u32);
static void Z2_E_mm_modPitch(Z2SoundHandlePool*, u32);
static void Z2_B_zan_modPitch(Z2SoundHandlePool*, u32);
/* ############################################################################################## */
/* 80451358-80451360 -00001 0008+00 0/0 1/1 0/0 .sbss None */
/* 80451358 0001+00 data_80451358 None */
/* 80451359 0007+00 data_80451359 None */
s8 data_80451358;
s8 data_80451359;
/* 80455BD8-80455BDC 0041D8 0004+00 1/1 0/0 0/0 .sdata2 sAreaDefault */
static Z2EnemyArea const sAreaDefault = {true, 700, 1100, 1500};
/* 80455BE0-80455BE4 0041E0 0004+00 1/1 0/0 0/0 .sdata2 sAreaFloating */
static Z2EnemyArea const sAreaFloating = {false, 700, 1100, 1500};
/* 80455BE8-80455BEC 0041E8 0004+00 1/1 0/0 0/0 .sdata2 sAreaWide */
static Z2EnemyArea const sAreaWide = {true, 700, 1500, 3300};
/* 80455BF0-80455BF4 0041F0 0004+00 1/1 0/0 0/0 .sdata2 sAreaWideFloating */
static Z2EnemyArea const sAreaWideFloating = {false, 700, 1500, 3300};
/* 80455BF8-80455BFC 0041F8 0004+00 1/1 0/0 0/0 .sdata2 sAreaSmall */
static Z2EnemyArea const sAreaSmall = {true, 300, 700, 1000};
/* 80455C00-80455C04 004200 0004+00 1/1 0/0 0/0 .sdata2 sAreaSmallFloating */
static Z2EnemyArea const sAreaSmallFloating = {false, 500, 800, 1200};
struct EnemyInfo {
@@ -38,7 +30,6 @@ struct EnemyInfo {
Z2EnemyArea mEnemyArea;
};
/* 803CB230-803CB630 028350 0400+00 1/1 0/0 0/0 .data mEnemyInfo */
static EnemyInfo mEnemyInfo[64] = {
{"Dummy", sAreaDefault},
{"E_s1", {true, 700, 1200, 2000}},
@@ -106,17 +97,14 @@ static EnemyInfo mEnemyInfo[64] = {
{"B_tn", sAreaDefault},
};
/* 802C03C8-802C0420 2BAD08 0058+00 3/3 3/3 129/129 .text __ct__10Z2CreatureFv */
Z2Creature::Z2Creature() {
mpPos = NULL;
}
/* 802C0420-802C04E8 2BAD60 00C8+00 1/1 4/4 91/91 .text __dt__10Z2CreatureFv */
Z2Creature::~Z2Creature() {
deleteObject();
}
/* 802C04E8-802C0530 2BAE28 0048+00 4/2 2/2 0/0 .text deleteObject__10Z2CreatureFv */
void Z2Creature::deleteObject() {
mSoundObjAnime.stopAnime();
mSoundObjAnime.deleteObject();
@@ -124,7 +112,6 @@ void Z2Creature::deleteObject() {
mSoundObjSimple2.deleteObject();
}
/* 802C0530-802C05B0 2BAE70 0080+00 5/5 1/1 125/125 .text init__10Z2CreatureFP3VecP3VecUcUc */
void Z2Creature::init(Vec* animePosPtr, Vec* simplePosPtr, u8 animeHandleNum, u8 simpleHandleNum) {
if (animePosPtr) {
mSoundObjAnime.init(animePosPtr, animeHandleNum);
@@ -136,7 +123,6 @@ void Z2Creature::init(Vec* animePosPtr, Vec* simplePosPtr, u8 animeHandleNum, u8
}
}
/* 802C05B0-802C0618 2BAEF0 0068+00 2/2 1/1 0/0 .text init__10Z2CreatureFP3VecP3VecP3VecUcUcUc */
void Z2Creature::init(Vec* animePosPtr, Vec* simplePosPtr, Vec* simple2PosPtr, u8 animeHandleNum, u8 simpleHandleNum,
u8 simple2HandleNum) {
init(animePosPtr, simplePosPtr, animeHandleNum, simpleHandleNum);
@@ -146,38 +132,30 @@ void Z2Creature::init(Vec* animePosPtr, Vec* simplePosPtr, Vec* simple2PosPtr, u
}
}
/* 802C0618-802C0628 2BAF58 0010+00 7/0 2/0 0/0 .text
* setSoundStarter__10Z2CreatureFP14Z2SoundStarter */
void Z2Creature::setSoundStarter(Z2SoundStarter* soundStarter) {
mSoundObjAnime.setSoundStarter(soundStarter);
mSoundObjSimple1.setSoundStarter(soundStarter);
mSoundObjSimple2.setSoundStarter(soundStarter);
}
/* 802C0628-802C064C 2BAF68 0024+00 0/0 4/4 2/2 .text initAnime__10Z2CreatureFPvbff */
void Z2Creature::initAnime(void* animation, bool param_1, f32 startFrame, f32 param_3) {
mSoundObjAnime.initAnime(animation, param_1, startFrame, param_3);
}
/* 802C064C-802C06D0 2BAF8C 0084+00 7/3 2/1 0/0 .text framework__10Z2CreatureFUlSc */
void Z2Creature::framework(u32 mapinfo, s8 reverb) {
mSoundObjAnime.framework(mapinfo, reverb);
mSoundObjSimple1.framework(mapinfo, reverb);
mSoundObjSimple2.framework(mapinfo, reverb);
}
/* 802C06D0-802C06F4 2BB010 0024+00 0/0 3/3 2/2 .text updateAnime__10Z2CreatureFff */
void Z2Creature::updateAnime(f32 param_0, f32 param_1) {
mSoundObjAnime.updateAnime(param_0, param_1);
}
/* 802C06F4-802C0720 2BB034 002C+00 0/0 0/0 7/7 .text stopAnime__10Z2CreatureFv */
void Z2Creature::stopAnime() {
deleteObject();
}
/* 802C0720-802C087C 2BB060 015C+00 4/0 2/0 0/0 .text
* startCreatureSound__10Z2CreatureF10JAISoundIDUlSc */
Z2SoundHandlePool* Z2Creature::startCreatureSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
switch (soundID) {
case Z2SE_KOSARU_V_KAGO_WAIT:
@@ -199,8 +177,6 @@ Z2SoundHandlePool* Z2Creature::startCreatureSound(JAISoundID soundID, u32 mapinf
}
}
/* 802C087C-802C0A4C 2BB1BC 01D0+00 4/0 2/0 0/0 .text
* startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc */
Z2SoundHandlePool* Z2Creature::startCreatureSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb) {
switch (soundID) {
case Z2SE_FAIRY_S_LV:
@@ -229,8 +205,6 @@ Z2SoundHandlePool* Z2Creature::startCreatureSoundLevel(JAISoundID soundID, u32 m
}
}
/* 802C0A4C-802C0AF8 2BB38C 00AC+00 4/1 2/0 0/0 .text
* startCreatureVoice__10Z2CreatureF10JAISoundIDSc */
Z2SoundHandlePool* Z2Creature::startCreatureVoice(JAISoundID soundID, s8 reverb) {
switch (soundID) {
case Z2SE_MDN_V_FLY_OUT:
@@ -263,8 +237,6 @@ Z2SoundHandlePool* Z2Creature::startCreatureVoice(JAISoundID soundID, s8 reverb)
return mSoundObjSimple1.startSound(soundID, 0, reverb);
}
/* 802C0AF8-802C0B70 2BB438 0078+00 3/0 2/0 0/0 .text
* startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc */
Z2SoundHandlePool* Z2Creature::startCreatureVoiceLevel(JAISoundID soundID, s8 reverb) {
if (soundID == Z2SE_MDN_V_WAITD) {
if (Z2GetStatusMgr()->getDemoStatus() == 2 || !Z2GetSceneMgr()->isInGame()) {
@@ -275,24 +247,18 @@ Z2SoundHandlePool* Z2Creature::startCreatureVoiceLevel(JAISoundID soundID, s8 re
return mSoundObjSimple1.startLevelSound((u32)soundID, 0, reverb);
}
/* 802C0B70-802C0BAC 2BB4B0 003C+00 4/0 2/0 0/0 .text
* startCreatureExtraSound__10Z2CreatureF10JAISoundIDUlSc */
Z2SoundHandlePool* Z2Creature::startCreatureExtraSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
return mSoundObjSimple2.startSound(soundID, mapinfo, reverb);
}
/* 802C0BAC-802C0BE8 2BB4EC 003C+00 4/0 2/0 0/0 .text
* startCreatureExtraSoundLevel__10Z2CreatureF10JAISoundIDUlSc */
Z2SoundHandlePool* Z2Creature::startCreatureExtraSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb) {
return mSoundObjSimple2.startLevelSound(soundID, mapinfo, reverb);
}
/* 802C0BE8-802C0C10 2BB528 0028+00 4/0 2/0 0/0 .text startCollisionSE__10Z2CreatureFUlUl */
Z2SoundHandlePool* Z2Creature::startCollisionSE(u32 hitID, u32 mapinfo) {
return mSoundObjAnime.startCollisionSE(hitID, mapinfo, NULL);
}
/* 802C0C10-802C0C6C 2BB550 005C+00 0/0 0/0 12/12 .text __ct__17Z2CreatureCitizenFv */
Z2CreatureCitizen::Z2CreatureCitizen() :
JSULink<Z2CreatureCitizen>(this),
mCitizenID(-1),
@@ -300,15 +266,12 @@ Z2CreatureCitizen::Z2CreatureCitizen() :
mLinkSearch(false)
{}
/* 802C0C6C-802C0CE4 2BB5AC 0078+00 0/0 0/0 12/12 .text __dt__17Z2CreatureCitizenFv */
Z2CreatureCitizen::~Z2CreatureCitizen() {}
/* 802C0CE4-802C0D04 2BB624 0020+00 0/0 2/2 7/7 .text init__17Z2CreatureCitizenFP3VecP3VecUcUc */
void Z2CreatureCitizen::init(Vec* animePosPtr, Vec* simplePosPtr, u8 animeHandleNum, u8 simpleHandleNum) {
Z2Creature::init(animePosPtr, simplePosPtr, animeHandleNum, simpleHandleNum);
}
/* 802C0D04-802C0D48 2BB644 0044+00 1/0 0/0 0/0 .text deleteObject__17Z2CreatureCitizenFv */
void Z2CreatureCitizen::deleteObject() {
if (mLinkSearch == false) {
Z2GetSeMgr()->decrCrowdSize();
@@ -317,7 +280,6 @@ void Z2CreatureCitizen::deleteObject() {
Z2Creature::deleteObject();
}
/* 802C0D48-802C0E18 2BB688 00D0+00 0/0 2/2 4/4 .text setMdlType__17Z2CreatureCitizenFScbb */
void Z2CreatureCitizen::setMdlType(s8 param_0, bool param_1, bool param_2) {
s8 a = param_0 & 0x3f;
s8 b = param_1 ? 0x40 : 0;
@@ -337,8 +299,6 @@ void Z2CreatureCitizen::setMdlType(s8 param_0, bool param_1, bool param_2) {
}
}
/* 802C0E18-802C0ED8 2BB758 00C0+00 0/0 0/0 21/21 .text playVoice__17Z2CreatureCitizenFi
*/
void Z2CreatureCitizen::playVoice(int i_sound) {
u32 sound_id = Z2SE_MAN_A1_V_AWAY + 6 * (s8)mCitizenID + i_sound;
switch (mCitizenID) {
@@ -357,8 +317,6 @@ void Z2CreatureCitizen::playVoice(int i_sound) {
}
}
/* 802C0ED8-802C0F64 2BB818 008C+00 1/0 0/0 0/0 .text
* startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc */
Z2SoundHandlePool* Z2CreatureCitizen::startCreatureVoice(JAISoundID soundID, s8 reverb) {
switch (soundID) {
case Z2SE_KIU_V_FEAR:
@@ -374,7 +332,6 @@ Z2SoundHandlePool* Z2CreatureCitizen::startCreatureVoice(JAISoundID soundID, s8
return Z2Creature::startCreatureVoice(soundID, -1);
}
/* 802C0F64-802C0FC4 2BB8A4 0060+00 2/2 0/0 100/100 .text __ct__15Z2CreatureEnemyFv */
Z2CreatureEnemy::Z2CreatureEnemy() :
JSULink<Z2CreatureEnemy>(this),
mEnemyID(0),
@@ -383,8 +340,6 @@ Z2CreatureEnemy::Z2CreatureEnemy() :
field_0xa3(0)
{}
/* 802C0FC4-802C1094 2BB904 00D0+00 3/2 0/0 0/0 .text deleteObject__15Z2CreatureEnemyFv
*/
void Z2CreatureEnemy::deleteObject() {
if (mEnemyID == Z2_ENEMY_GB) {
Z2GetSeqMgr()->unMuteSceneBgm(33);
@@ -400,19 +355,15 @@ void Z2CreatureEnemy::deleteObject() {
mSoundObjSimple2.deleteObject();
}
/* 802C1094-802C10B4 2BB9D4 0020+00 0/0 0/0 98/98 .text init__15Z2CreatureEnemyFP3VecP3VecUcUc */
void Z2CreatureEnemy::init(Vec* animePosPtr, Vec* simplePosPtr, u8 animeHandleNum, u8 simpleHandleNum) {
Z2Creature::init(animePosPtr, simplePosPtr, animeHandleNum, simpleHandleNum);
}
/* 802C10B4-802C10D4 2BB9F4 0020+00 0/0 0/0 3/3 .text init__15Z2CreatureEnemyFP3VecP3VecP3VecUcUcUc
*/
void Z2CreatureEnemy::init(Vec* animePosPtr, Vec* simplePosPtr, Vec* simple2PosPtr, u8 animeHandleNum, u8 simpleHandleNum,
u8 simple2HandleNum) {
Z2Creature::init(animePosPtr, simplePosPtr, simple2PosPtr, animeHandleNum, simpleHandleNum, simple2HandleNum);
}
/* 802C10D4-802C110C 2BBA14 0038+00 1/0 0/0 0/0 .text framework__15Z2CreatureEnemyFUlSc */
void Z2CreatureEnemy::framework(u32 mapinfo, s8 reverb) {
if (field_0xa1 < 1) {
field_0xa1++;
@@ -421,8 +372,6 @@ void Z2CreatureEnemy::framework(u32 mapinfo, s8 reverb) {
Z2Creature::framework(mapinfo, reverb);
}
/* 802C110C-802C136C 2BBA4C 0260+00 4/0 0/0 0/0 .text
* startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc */
Z2SoundHandlePool* Z2CreatureEnemy::startCreatureSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
Z2SoundHandlePool* handle = mSoundObjAnime.startSound(soundID, mapinfo, reverb);
@@ -482,8 +431,6 @@ Z2SoundHandlePool* Z2CreatureEnemy::startCreatureSound(JAISoundID soundID, u32 m
return handle;
}
/* 802C136C-802C168C 2BBCAC 0320+00 2/0 0/0 0/0 .text
* startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc */
Z2SoundHandlePool* Z2CreatureEnemy::startCreatureSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb) {
if (soundID == 0x7FFFF) {
Vec pos;
@@ -535,8 +482,6 @@ Z2SoundHandlePool* Z2CreatureEnemy::startCreatureSoundLevel(JAISoundID soundID,
return handle;
}
/* 802C168C-802C1948 2BBFCC 02BC+00 4/0 0/0 0/0 .text
* startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc */
Z2SoundHandlePool* Z2CreatureEnemy::startCreatureVoice(JAISoundID soundID, s8 reverb) {
if (Z2GetSeqMgr()->getMainBgmID() == Z2BGM_BOSS_ZANT) {
switch (Z2GetSeqMgr()->mBgmStatus) {
@@ -639,8 +584,6 @@ Z2SoundHandlePool* Z2CreatureEnemy::startCreatureVoice(JAISoundID soundID, s8 re
return handle;
}
/* 802C1948-802C199C 2BC288 0054+00 3/0 0/0 0/0 .text
* startCreatureVoiceLevel__15Z2CreatureEnemyF10JAISoundIDSc */
Z2SoundHandlePool* Z2CreatureEnemy::startCreatureVoiceLevel(JAISoundID soundID, s8 reverb) {
u32 mapinfo = 0;
if (mEnemyID == Z2_ENEMY_RDY) {
@@ -649,19 +592,14 @@ Z2SoundHandlePool* Z2CreatureEnemy::startCreatureVoiceLevel(JAISoundID soundID,
return mSoundObjSimple1.startLevelSound(soundID, mapinfo, reverb);
}
/* 802C199C-802C19D8 2BC2DC 003C+00 3/0 0/0 0/0 .text
* startCreatureExtraSound__15Z2CreatureEnemyF10JAISoundIDUlSc */
Z2SoundHandlePool* Z2CreatureEnemy::startCreatureExtraSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
return mSoundObjSimple2.startSound(soundID, mapinfo, reverb);
}
/* 802C19D8-802C1A14 2BC318 003C+00 3/0 0/0 0/0 .text
* startCreatureExtraSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc */
Z2SoundHandlePool* Z2CreatureEnemy::startCreatureExtraSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb) {
return mSoundObjSimple2.startLevelSound(soundID, mapinfo, reverb);
}
/* 802C1A14-802C1B7C 2BC354 0168+00 4/0 0/0 0/0 .text startCollisionSE__15Z2CreatureEnemyFUlUl */
Z2SoundHandlePool* Z2CreatureEnemy::startCollisionSE(u32 hitID, u32 mapinfo) {
u8 var1;
switch (mEnemyID) {
@@ -711,14 +649,12 @@ Z2SoundHandlePool* Z2CreatureEnemy::startCollisionSE(u32 hitID, u32 mapinfo) {
}
}
/* 802C1B7C-802C1B90 2BC4BC 0014+00 0/0 0/0 55/55 .text setLinkSearch__15Z2CreatureEnemyFb */
void Z2CreatureEnemy::setLinkSearch(bool isLinkSearch) {
if (field_0xa3 == 0) {
mLinkSearch = isLinkSearch;
}
}
/* 802C1B90-802C1BE8 2BC4D0 0058+00 0/0 0/0 72/72 .text setEnemyName__15Z2CreatureEnemyFPCc */
void Z2CreatureEnemy::setEnemyName(const char* enemyName) {
if (enemyName == NULL) {
field_0xa1 = -1;
@@ -727,10 +663,8 @@ void Z2CreatureEnemy::setEnemyName(const char* enemyName) {
}
}
/* 802C1BE8-802C1C24 2BC528 003C+00 0/0 0/0 1/1 .text __ct__16Z2CreatureSumomoFv */
Z2CreatureSumomo::Z2CreatureSumomo() {}
/* 802C1C24-802C1CA0 2BC564 007C+00 0/0 0/0 8/8 .text playSumomoBgm__16Z2CreatureSumomoFUl */
void Z2CreatureSumomo::playSumomoBgm(u32 dist) {
if (Z2GetSeqMgr()->getSubBgmID() != Z2BGM_SUMOMO) {
if (dist < 700) {
@@ -743,8 +677,6 @@ void Z2CreatureSumomo::playSumomoBgm(u32 dist) {
}
}
/* 802C1CA0-802C1D10 2BC5E0 0070+00 1/0 0/0 0/0 .text deleteObject__16Z2CreatureSumomoFv
*/
void Z2CreatureSumomo::deleteObject() {
if (Z2GetSeqMgr()->getSubBgmID() == Z2BGM_SUMOMO && Z2GetStatusMgr()->getDemoStatus() != 6) {
Z2GetSeqMgr()->subBgmStop();
@@ -754,17 +686,12 @@ void Z2CreatureSumomo::deleteObject() {
Z2Creature::deleteObject();
}
/* 802C1D10-802C1D4C 2BC650 003C+00 0/0 0/0 3/3 .text __ct__18Z2SoundObjBeeGroupFv */
Z2SoundObjBeeGroup::Z2SoundObjBeeGroup() {}
/* 802C1D4C-802C1D6C 2BC68C 0020+00 1/0 0/0 0/0 .text init__18Z2SoundObjBeeGroupFP3VecUc
*/
void Z2SoundObjBeeGroup::init(Vec* posPtr, u8 handleNum) {
Z2SoundObjBase::init(posPtr, handleNum);
}
/* 802C1D6C-802C1F54 2BC6AC 01E8+00 0/0 0/0 2/2 .text
* playBeeGroupSound__18Z2SoundObjBeeGroupF10JAISoundIDUc */
void Z2SoundObjBeeGroup::playBeeGroupSound(JAISoundID soundID, u8 param_1) {
if (param_1 == 0) {
return;
@@ -803,10 +730,8 @@ void Z2SoundObjBeeGroup::playBeeGroupSound(JAISoundID soundID, u8 param_1) {
}
}
/* 802C1F54-802C1FB0 2BC894 005C+00 0/0 0/0 1/1 .text __ct__12Z2CreatureFMFv */
Z2CreatureFM::Z2CreatureFM() {}
/* 802C1FB0-802C1FFC 2BC8F0 004C+00 1/0 0/0 0/0 .text deleteObject__12Z2CreatureFMFv */
void Z2CreatureFM::deleteObject() {
Z2CreatureEnemy::deleteObject();
field_0xa4.deleteObject();
@@ -815,8 +740,6 @@ void Z2CreatureFM::deleteObject() {
field_0x104.deleteObject();
}
/* 802C1FFC-802C20E8 2BC93C 00EC+00 0/0 0/0 1/1 .text
* init__12Z2CreatureFMFP3VecP3VecP3VecP3VecP3VecP3VecUcUcUcUcUcUc */
void Z2CreatureFM::init(Vec* animePosPtr, Vec* simplePosPtr, Vec* param_2, Vec* param_3, Vec* param_4,
Vec* param_5, u8 animeHandleNum, u8 simpleHandleNum, u8 param_8, u8 param_9,
u8 param_10, u8 param_11) {
@@ -835,7 +758,6 @@ void Z2CreatureFM::init(Vec* animePosPtr, Vec* simplePosPtr, Vec* param_2, Vec*
}
}
/* 802C20E8-802C2194 2BCA28 00AC+00 1/0 0/0 0/0 .text framework__12Z2CreatureFMFUlSc */
void Z2CreatureFM::framework(u32 mapinfo, s8 reverb) {
Z2Creature::framework(mapinfo, reverb);
field_0xa4.framework(mapinfo, reverb);
@@ -844,8 +766,6 @@ void Z2CreatureFM::framework(u32 mapinfo, s8 reverb) {
field_0x104.framework(mapinfo, reverb);
}
/* 802C2194-802C2290 2BCAD4 00FC+00 0/0 0/0 1/1 .text
* startChainSound__12Z2CreatureFMF10JAISoundIDUcfUlSc */
Z2SoundHandlePool* Z2CreatureFM::startChainSound(JAISoundID soundID, u8 param_1, f32 param_2,
u32 mapinfo, s8 reverb) {
switch (param_1) {
@@ -862,8 +782,6 @@ Z2SoundHandlePool* Z2CreatureFM::startChainSound(JAISoundID soundID, u8 param_1,
}
}
/* 802C2290-802C24B0 2BCBD0 0220+00 0/0 0/0 1/1 .text
* startChainSoundLevel__12Z2CreatureFMF10JAISoundIDUcfUlSc */
Z2SoundHandlePool* Z2CreatureFM::startChainSoundLevel(JAISoundID soundID, u8 param_1, f32 param_2,
u32 mapinfo, s8 reverb) {
Z2SoundHandlePool* handle;
@@ -910,15 +828,11 @@ Z2SoundHandlePool* Z2CreatureFM::startChainSoundLevel(JAISoundID soundID, u8 par
}
}
/* 802C24B0-802C24D0 2BCDF0 0020+00 0/0 0/0 1/1 .text init__13Z2CreatureGobFP3VecP3VecP3VecUcUcUc
*/
void Z2CreatureGob::init(Vec* animePosPtr, Vec* simplePosPtr, Vec* simple2PosPtr, u8 animeHandleNum, u8 simpleHandleNum,
u8 simple2HandleNum) {
Z2Creature::init(animePosPtr, simplePosPtr, simple2PosPtr, animeHandleNum, simpleHandleNum, simple2HandleNum);
}
/* 802C24D0-802C2578 2BCE10 00A8+00 1/0 0/0 0/0 .text
* startCreatureVoiceLevel__13Z2CreatureGobF10JAISoundIDSc */
Z2SoundHandlePool* Z2CreatureGob::startCreatureVoiceLevel(JAISoundID soundID, s8 reverb) {
if (mSoundObjSimple1.getHandleSoundID(Z2SE_EN_GOB_V_DAMAGE) != NULL ||
mSoundObjSimple1.getHandleSoundID(Z2SE_EN_GOB_V_STOMACH) != NULL)
@@ -929,10 +843,8 @@ Z2SoundHandlePool* Z2CreatureGob::startCreatureVoiceLevel(JAISoundID soundID, s8
return mSoundObjSimple1.startLevelSound(soundID, 0, reverb);
}
/* 802C2578-802C25EC 2BCEB8 0074+00 0/0 0/0 1/1 .text __ct__12Z2CreatureOIFv */
Z2CreatureOI::Z2CreatureOI() {}
/* 802C25EC-802C2670 2BCF2C 0084+00 1/0 0/0 0/0 .text deleteObject__12Z2CreatureOIFv */
void Z2CreatureOI::deleteObject() {
Z2CreatureEnemy::deleteObject();
field_0xa4.deleteObject();
@@ -948,8 +860,6 @@ void Z2CreatureOI::deleteObject() {
mTentacleSounds[7].deleteObject();
}
/* 802C2670-802C2864 2BCFB0 01F4+00 0/0 0/0 1/1 .text
* init__12Z2CreatureOIFP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3Vec */
void Z2CreatureOI::init(Vec* param_0, Vec* param_1, Vec* param_2, Vec* param_3, Vec* param_4,
Vec* param_5, Vec* param_6, Vec* param_7, Vec* param_8, Vec* param_9,
Vec* param_10, Vec* param_11, Vec* param_12) {
@@ -989,7 +899,6 @@ void Z2CreatureOI::init(Vec* param_0, Vec* param_1, Vec* param_2, Vec* param_3,
}
}
/* 802C2864-802C29D4 2BD1A4 0170+00 1/0 0/0 0/0 .text framework__12Z2CreatureOIFUlSc */
void Z2CreatureOI::framework(u32 mapinfo, s8 reverb) {
Z2Creature::framework(mapinfo, reverb);
field_0xa4.framework(mapinfo, reverb);
@@ -1005,8 +914,6 @@ void Z2CreatureOI::framework(u32 mapinfo, s8 reverb) {
mTentacleSounds[7].framework(mapinfo, reverb);
}
/* 802C29D4-802C2C84 2BD314 02B0+00 1/0 0/0 0/0 .text
* startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc */
Z2SoundHandlePool* Z2CreatureOI::startCreatureSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb) {
if (soundID == Z2SE_EN_OI_MOVE) {
Z2SoundHandlePool* handle1 = mSoundObjAnime.startLevelSound(soundID, mapinfo, reverb);
@@ -1052,14 +959,10 @@ Z2SoundHandlePool* Z2CreatureOI::startCreatureSoundLevel(JAISoundID soundID, u32
}
}
/* 802C2C84-802C2CD4 2BD5C4 0050+00 0/0 0/0 1/1 .text
* startTentacleSound__12Z2CreatureOIF10JAISoundIDUcUlSc */
Z2SoundHandlePool* Z2CreatureOI::startTentacleSound(JAISoundID soundID, u8 tentacleIndex, u32 mapinfo, s8 reverb) {
return mTentacleSounds[tentacleIndex].startSound(soundID, mapinfo, reverb);
}
/* 802C2CD4-802C2DE0 2BD614 010C+00 0/0 0/0 1/1 .text
* startTentacleSoundLevel__12Z2CreatureOIF10JAISoundIDUcfUlSc */
Z2SoundHandlePool* Z2CreatureOI::startTentacleSoundLevel(JAISoundID soundID, u8 tentacleIndex,
f32 param_2, u32 mapinfo, s8 reverb) {
Z2SoundHandlePool* handle = NULL;
@@ -1077,7 +980,6 @@ Z2SoundHandlePool* Z2CreatureOI::startTentacleSoundLevel(JAISoundID soundID, u8
}
}
/* 802C2DE0-802C2E54 2BD720 0074+00 3/3 0/0 0/0 .text Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl */
static void Z2_E_sw_modPitch(Z2SoundHandlePool* handle, u32 mapinfo) {
if (handle != NULL && *handle != NULL) {
f32 pitch = 1.0f;
@@ -1093,7 +995,6 @@ static void Z2_E_sw_modPitch(Z2SoundHandlePool* handle, u32 mapinfo) {
}
}
/* 802C2E54-802C2E9C 2BD794 0048+00 2/2 0/0 0/0 .text Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl */
static void Z2_E_ms_modVol(Z2SoundHandlePool* handle, u32 mapinfo) {
if (handle != NULL && *handle != NULL) {
f32 var_f31 = 0.2f;
@@ -1103,7 +1004,6 @@ static void Z2_E_ms_modVol(Z2SoundHandlePool* handle, u32 mapinfo) {
}
}
/* 802C2E9C-802C2EE4 2BD7DC 0048+00 2/2 0/0 0/0 .text Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl */
static void Z2_E_mm_modPitch(Z2SoundHandlePool* handle, u32 mapinfo) {
if (handle != NULL && *handle != NULL) {
f32 var_f31 = 0.7f;
@@ -1113,7 +1013,6 @@ static void Z2_E_mm_modPitch(Z2SoundHandlePool* handle, u32 mapinfo) {
}
}
/* 802C2EE4-802C3040 2BD824 015C+00 2/2 0/0 0/0 .text Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl */
static void Z2_B_zan_modPitch(Z2SoundHandlePool* handle, u32 mapinfo) {
if (handle != NULL && *handle != NULL) {
f32 pitch = 1.0f;
src/Z2AudioLib/Z2EnvSeMgr.cpp
-64
View File
@@ -90,16 +90,12 @@ static const char* sSpotName[] = {
};
#endif
/* 802C589C-802C58AC 2C01DC 0010+00 3/3 0/0 0/0 .text __ct__11Z2EnvSeBaseFP3Vec */
Z2EnvSeBase::Z2EnvSeBase(Vec* posPtr) {
mPos = posPtr;
}
/* 802C58AC-802C5908 2C01EC 005C+00 3/3 0/0 0/0 .text __dt__11Z2EnvSeBaseFv */
Z2EnvSeBase::~Z2EnvSeBase() {}
/* 802C5908-802C5AB4 2C0248 01AC+00 2/2 0/0 0/0 .text
* startEnvSe__11Z2EnvSeBaseF10JAISoundIDfffffUl */
bool Z2EnvSeBase::startEnvSe(JAISoundID soundID, f32 fxMix, f32 volume, f32 pan, f32 dolby, f32 pitch, u32 moveSteps) {
if (Z2GetStatusMgr()->isPaused()) {
volume *= 0.33f;
@@ -127,8 +123,6 @@ bool Z2EnvSeBase::startEnvSe(JAISoundID soundID, f32 fxMix, f32 volume, f32 pan,
return rv;
}
/* 802C5AB4-802C5C9C 2C03F4 01E8+00 9/9 0/0 0/0 .text
* startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl */
bool Z2EnvSeBase::startEnvSeLevel(JAISoundID soundID, f32 fxMix, f32 volume, f32 pan,
f32 dolby, f32 pitch, u32 moveSteps) {
if (Z2GetStatusMgr()->isPaused()) {
@@ -163,7 +157,6 @@ bool Z2EnvSeBase::startEnvSeLevel(JAISoundID soundID, f32 fxMix, f32 volume, f32
return rv;
}
/* 802C5C9C-802C5D1C 2C05DC 0080+00 1/1 0/0 0/0 .text __ct__10Z2EnvSeDirFP3Vec */
Z2EnvSeDir::Z2EnvSeDir(Vec* dir) {
mPan = 0.5f;
mDolby = 0.5f;
@@ -175,10 +168,8 @@ Z2EnvSeDir::Z2EnvSeDir(Vec* dir) {
}
}
/* 802C5D1C-802C5D70 2C065C 0054+00 1/1 0/0 0/0 .text __dt__10Z2EnvSeDirFv */
Z2EnvSeDir::~Z2EnvSeDir() {}
/* 802C5D70-802C5D9C 2C06B0 002C+00 2/2 0/0 0/0 .text setPanDir__10Z2EnvSeDirFP3Vec */
void Z2EnvSeDir::setPanDir(Vec* dir) {
JUT_ASSERT(249, dir);
mPanDir.x = dir->x * -1000.0f;
@@ -186,7 +177,6 @@ void Z2EnvSeDir::setPanDir(Vec* dir) {
mPanDir.z = dir->z * -1000.0f;
}
/* 802C5D9C-802C5E90 2C06DC 00F4+00 1/1 0/0 0/0 .text calcPan__10Z2EnvSeDirFf */
void Z2EnvSeDir::calcPan(f32 param_0) {
if (*getHandle()) {
if (0.0f == mPanDir.x && 0.0f == mPanDir.y && 0.0f == mPanDir.z) {
@@ -205,14 +195,11 @@ void Z2EnvSeDir::calcPan(f32 param_0) {
}
}
/* 802C5E90-802C5ECC 2C07D0 003C+00 1/1 0/0 0/0 .text
* startEnvSeDirLevel__10Z2EnvSeDirF10JAISoundIDff */
bool Z2EnvSeDir::startEnvSeDirLevel(JAISoundID soundID, f32 fxMix, f32 volume) {
f32 var_f31 = mDolby;
return Z2EnvSeBase::startEnvSeLevel(soundID, fxMix, volume, mPan, mDolby, 1.0f, 0);
}
/* 802C5ECC-802C5F28 2C080C 005C+00 1/1 0/0 0/0 .text __ct__14Z2EnvSeAutoPanFv */
Z2EnvSeAutoPan::Z2EnvSeAutoPan() {
mPan = 0.5f;
mDolby = 0.5f;
@@ -222,10 +209,8 @@ Z2EnvSeAutoPan::Z2EnvSeAutoPan() {
field_0x19 = 1;
}
/* 802C5F28-802C5F7C 2C0868 0054+00 1/1 0/0 0/0 .text __dt__14Z2EnvSeAutoPanFv */
Z2EnvSeAutoPan::~Z2EnvSeAutoPan() {}
/* 802C5F7C-802C5F98 2C08BC 001C+00 2/2 0/0 0/0 .text setPanParam__14Z2EnvSeAutoPanFffbbff */
void Z2EnvSeAutoPan::setPanParam(f32 pan, f32 dolby, bool param_3, bool param_4, f32 param_5,
f32 param_6) {
mPan = pan;
@@ -236,7 +221,6 @@ void Z2EnvSeAutoPan::setPanParam(f32 pan, f32 dolby, bool param_3, bool param_4,
field_0x19 = param_4;
}
/* 802C5F98-802C60E0 2C08D8 0148+00 2/2 0/0 0/0 .text calcPan__14Z2EnvSeAutoPanFv */
void Z2EnvSeAutoPan::calcPan() {
if (field_0x18) {
mPan += field_0x10;
@@ -272,15 +256,12 @@ void Z2EnvSeAutoPan::calcPan() {
}
}
/* 802C60E0-802C611C 2C0A20 003C+00 2/2 0/0 0/0 .text
* startEnvSeAutoPanLevel__14Z2EnvSeAutoPanF10JAISoundIDfff */
bool Z2EnvSeAutoPan::startEnvSeAutoPanLevel(JAISoundID soundID, f32 fxMix, f32 volume,
f32 pitch) {
f32 var_f31 = mDolby;
return Z2EnvSeBase::startEnvSeLevel(soundID, fxMix, volume, mPan, mDolby, pitch, 0);
}
/* 802C611C-802C6540 2C0A5C 0424+00 0/0 1/1 0/0 .text __ct__10Z2EnvSeMgrFv */
Z2EnvSeMgr::Z2EnvSeMgr()
: JASGlobalInstance<Z2EnvSeMgr>(true), field_0x38(), field_0x48(1.0f), field_0x4c(1.0f),
field_0x50(1.0f), field_0x140(), mSnowPower(), mWindType(), field_0x188(), field_0x1ac(1.0f),
@@ -315,10 +296,8 @@ Z2EnvSeMgr::Z2EnvSeMgr()
field_0x130.setParam(0.1f, 0.0037908785f, 0.005f);
}
/* 802C6540-802C66B0 2C0E80 0170+00 0/0 1/1 0/0 .text __dt__10Z2EnvSeMgrFv */
Z2EnvSeMgr::~Z2EnvSeMgr() {}
/* 802C66B0-802C6998 2C0FF0 02E8+00 0/0 1/1 0/0 .text framework__10Z2EnvSeMgrFv */
void Z2EnvSeMgr::framework() {
int sceneNum = Z2GetSceneMgr()->getCurrentSceneNum();
if (field_0x64.getPosCount() >= 0) {
@@ -396,10 +375,8 @@ void Z2EnvSeMgr::framework() {
}
}
/* 802C6998-802C699C 2C12D8 0004+00 0/0 1/1 0/0 .text resetScene__10Z2EnvSeMgrFv */
void Z2EnvSeMgr::resetScene() {}
/* 802C699C-802C6AC0 2C12DC 0124+00 0/0 1/1 0/0 .text resetSceneInner__10Z2EnvSeMgrFv */
void Z2EnvSeMgr::resetSceneInner() {
if (-1.0f == field_0x60) {
field_0x38 = 0;
@@ -453,8 +430,6 @@ void Z2EnvSeMgr::resetSceneInner() {
field_0x64.resetMultiSePos();
}
/* 802C6AC0-802C6C1C 2C1400 015C+00 0/0 1/1 0/0 .text initSceneEnvSe__10Z2EnvSeMgrFlScf
*/
void Z2EnvSeMgr::initSceneEnvSe(s32 sceneID, s8 room, f32 param_3) {
field_0x60 = -1.0f;
if (-1.0f == param_3) {
@@ -509,7 +484,6 @@ void Z2EnvSeMgr::initSceneEnvSe(s32 sceneID, s8 room, f32 param_3) {
field_0x60 = param_3;
}
/* 802C6C1C-802C6C84 2C155C 0068+00 1/1 0/0 0/0 .text playSceneEnvSe__10Z2EnvSeMgrFv */
void Z2EnvSeMgr::playSceneEnvSe() {
if (-1.0f != field_0x60) {
if (field_0x1b8 != 100) {
@@ -519,8 +493,6 @@ void Z2EnvSeMgr::playSceneEnvSe() {
}
}
/* 802C6C84-802C70C8 2C15C4 0444+00 2/1 1/1 0/0 .text initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec
*/
void Z2EnvSeMgr::initStaticEnvSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4, Vec* param_5) {
f32 dVar7;
f32 dVar6;
@@ -669,8 +641,6 @@ void Z2EnvSeMgr::initStaticEnvSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4,
}
}
/* 802C70C8-802C780C 2C1A08 0744+00 2/1 1/1 0/0 .text startStaticEnvSe__10Z2EnvSeMgrFSc
*/
bool Z2EnvSeMgr::startStaticEnvSe(s8 reverb) {
field_0x1b8 = 100;
@@ -857,13 +827,10 @@ bool Z2EnvSeMgr::startStaticEnvSe(s8 reverb) {
return iVar9 && iVar11;
}
/* 802C780C-802C7830 2C214C 0024+00 0/0 1/1 0/0 .text registWindowPos__10Z2EnvSeMgrFP3Vec
*/
void Z2EnvSeMgr::registWindowPos(Vec* posPtr) {
field_0x64.registMultiSePos(posPtr);
}
/* 802C7830-802C7CF4 2C2170 04C4+00 1/1 1/1 0/0 .text startRainSe__10Z2EnvSeMgrFlSc */
bool Z2EnvSeMgr::startRainSe(s32 param_1, s8 param_2) {
if (mSnowPower > 0) {
return false;
@@ -951,8 +918,6 @@ bool Z2EnvSeMgr::startRainSe(s32 param_1, s8 param_2) {
0);
}
/* 802C7CF4-802C7E68 2C2634 0174+00 0/0 1/1 0/0 .text startNearThunderSe__10Z2EnvSeMgrFSc
*/
void Z2EnvSeMgr::startNearThunderSe(s8 param_1) {
if (field_0x64.getPosCount() < 0) {
f32 dVar10 = Z2Calc::getRandom(0.25f, Z2Calc::cEqualCSlope, Z2Calc::cEqualPSlope);
@@ -967,7 +932,6 @@ void Z2EnvSeMgr::startNearThunderSe(s8 param_1) {
}
}
/* 802C7E68-802C7FB4 2C27A8 014C+00 0/0 2/2 0/0 .text startFarThunderSe__10Z2EnvSeMgrFP3VecSc */
void Z2EnvSeMgr::startFarThunderSe(Vec* posPtr, s8 reverb) {
if (field_0x64.getPosCount() < 0) {
field_0x110.setPos(posPtr);
@@ -979,17 +943,14 @@ void Z2EnvSeMgr::startFarThunderSe(Vec* posPtr, s8 reverb) {
}
}
/* 802C7FB4-802C7FBC -00001 0008+00 0/0 0/0 0/0 .text setSnowPower__10Z2EnvSeMgrFSc */
void Z2EnvSeMgr::setSnowPower(s8 power) {
mSnowPower = power;
}
/* 802C7FBC-802C7FC8 2C28FC 000C+00 0/0 1/1 1/1 .text initStrongWindSe__10Z2EnvSeMgrFv */
void Z2EnvSeMgr::initStrongWindSe() {
mWindType = WIND_TYPE_3;
}
/* 802C7FC8-802C800C 2C2908 0044+00 0/0 1/1 1/1 .text setWindDirection__10Z2EnvSeMgrFP3Vec */
void Z2EnvSeMgr::setWindDirection(Vec* dir) {
if (mWindType == WIND_TYPE_3) {
field_0x144.setPanDir(const_cast<Vec*>(&Z2Calc::cNullVec));
@@ -998,8 +959,6 @@ void Z2EnvSeMgr::setWindDirection(Vec* dir) {
}
}
/* 802C800C-802C80F8 2C294C 00EC+00 0/0 1/1 1/1 .text startStrongWindSe__10Z2EnvSeMgrFSc
*/
bool Z2EnvSeMgr::startStrongWindSe(s8 reverb) {
field_0x144.calcPan(1.0f);
@@ -1022,8 +981,6 @@ bool Z2EnvSeMgr::startStrongWindSe(s8 reverb) {
return field_0x144.startEnvSeDirLevel(aJStack_24, fxMix, 1.0f);
}
/* 802C80F8-802C8234 2C2A38 013C+00 0/0 1/1 0/0 .text initRiverSe__10Z2EnvSeMgrFUcUcUcUc
*/
void Z2EnvSeMgr::initRiverSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
field_0x188 = param_1;
if (param_2 >= 100) {
@@ -1060,7 +1017,6 @@ void Z2EnvSeMgr::initRiverSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
}
}
/* 802C8234-802C8258 2C2B74 0024+00 1/1 1/1 0/0 .text registRiverSePos__10Z2EnvSeMgrFP3Vec */
void Z2EnvSeMgr::registRiverSePos(Vec* posPtr) {
f32 var_f31;
if (posPtr != NULL) {
@@ -1072,8 +1028,6 @@ void Z2EnvSeMgr::registRiverSePos(Vec* posPtr) {
mRiverSeMgr.registMultiSePos(posPtr);
}
/* 802C8258-802C8300 2C2B98 00A8+00 0/0 0/0 1/1 .text setHyrulSewerOpen__10Z2EnvSeMgrFb
*/
void Z2EnvSeMgr::setHyrulSewerOpen(bool isSewerOpen) {
if (isSewerOpen) {
field_0x1b8 = 1;
@@ -1084,7 +1038,6 @@ void Z2EnvSeMgr::setHyrulSewerOpen(bool isSewerOpen) {
}
}
/* 802C8300-802C8730 2C2C40 0430+00 2/1 1/1 0/0 .text startRiverSe__10Z2EnvSeMgrFSc */
bool Z2EnvSeMgr::startRiverSe(s8 param_1) {
#ifdef DEBUG
const char** spotName = sSpotName;
@@ -1184,8 +1137,6 @@ bool Z2EnvSeMgr::startRiverSe(s8 param_1) {
return r30;
}
/* 802C8730-802C886C 2C3070 013C+00 1/1 1/1 0/0 .text initFallSe__10Z2EnvSeMgrFUcUcUcUc
*/
void Z2EnvSeMgr::initFallSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
field_0x1e0 = param_1;
if (param_2 >= 100) {
@@ -1222,8 +1173,6 @@ void Z2EnvSeMgr::initFallSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
}
}
/* 802C886C-802C8890 2C31AC 0024+00 0/0 1/1 0/0 .text registFallSePos__10Z2EnvSeMgrFP3Vec
*/
void Z2EnvSeMgr::registFallSePos(Vec* posPtr) {
f32 var_f31;
if (posPtr != NULL) {
@@ -1235,7 +1184,6 @@ void Z2EnvSeMgr::registFallSePos(Vec* posPtr) {
mFallSeMgr.registMultiSePos(posPtr);
}
/* 802C8890-802C8A90 2C31D0 0200+00 1/1 1/1 0/0 .text startFallSe__10Z2EnvSeMgrFSc */
bool Z2EnvSeMgr::startFallSe(s8 reverb) {
if (mFallSeMgr.getPosCount() < 0) {
return false;
@@ -1271,7 +1219,6 @@ bool Z2EnvSeMgr::startFallSe(s8 reverb) {
return rv;
}
/* 802C8A90-802C8C24 2C33D0 0194+00 2/1 1/1 0/0 .text initEtcSe__10Z2EnvSeMgrFUcUcUcUc */
void Z2EnvSeMgr::initEtcSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
field_0x214 = param_1;
if (param_2 >= 100) {
@@ -1319,13 +1266,10 @@ void Z2EnvSeMgr::initEtcSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
}
}
/* 802C8C24-802C8C48 2C3564 0024+00 1/1 1/1 0/0 .text registEtcSePos__10Z2EnvSeMgrFP3Vec
*/
void Z2EnvSeMgr::registEtcSePos(Vec* posPtr) {
mEtcSeMgr.registMultiSePos(posPtr);
}
/* 802C8C48-802C92C8 2C3588 0680+00 2/1 1/1 0/0 .text startEtcSe__10Z2EnvSeMgrFSc */
bool Z2EnvSeMgr::startEtcSe(s8 reverb) {
#ifdef DEBUG
const char** spotName = sSpotName;
@@ -1440,12 +1384,10 @@ bool Z2EnvSeMgr::startEtcSe(s8 reverb) {
return rv;
}
/* 802C92C8-802C92EC 2C3C08 0024+00 0/0 0/0 1/1 .text registWolfSmellSePos__10Z2EnvSeMgrFP3Vec */
void Z2EnvSeMgr::registWolfSmellSePos(Vec* posPtr) {
mWolfSmellSeMgr.registMultiSePos(posPtr);
}
/* 802C92EC-802C93A0 2C3C2C 00B4+00 0/0 0/0 1/1 .text startFogWipeTrigger__10Z2EnvSeMgrFP3Vec */
void Z2EnvSeMgr::startFogWipeTrigger(Vec* pos) {
JUT_ASSERT(1919, pos);
@@ -1458,12 +1400,10 @@ void Z2EnvSeMgr::startFogWipeTrigger(Vec* pos) {
}
}
/* 802C93A0-802C93E4 2C3CE0 0044+00 0/0 0/0 1/1 .text setFogWipeWidth__10Z2EnvSeMgrFf */
void Z2EnvSeMgr::setFogWipeWidth(f32 width) {
mFogDensity = Z2Calc::linearTransform(width, 0.0f, 1.0f, 1.0f, 0.4f, true);
}
/* 802C93E4-802C9400 2C3D24 001C+00 3/3 2/2 0/0 .text getFogDensity__10Z2EnvSeMgrFv */
f32 Z2EnvSeMgr::getFogDensity() {
if (field_0x214 == 16) {
return mFogDensity;
@@ -1472,7 +1412,6 @@ f32 Z2EnvSeMgr::getFogDensity() {
return 0.0f;
}
/* 802C9400-802C950C 2C3D40 010C+00 0/0 0/0 1/1 .text startFogSe__10Z2EnvSeMgrFv */
bool Z2EnvSeMgr::startFogSe() {
bool iVar5 = false;
f32 dVar10 = field_0x2e8.calcNoise1f();
@@ -1496,7 +1435,6 @@ bool Z2EnvSeMgr::startFogSe() {
return (iVar6 && iVar5);
}
/* 802C950C-802C9F58 2C3E4C 0A4C+00 2/0 1/1 0/0 .text initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc */
void Z2EnvSeMgr::initLv3WaterSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
switch (param_1) {
case 110:
@@ -1746,7 +1684,6 @@ void Z2EnvSeMgr::initLv3WaterSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4)
}
}
/* 802C9F58-802CA794 2C4898 083C+00 2/0 1/1 0/0 .text registLv3WaterSePos__10Z2EnvSeMgrFUcP3Vec */
void Z2EnvSeMgr::registLv3WaterSePos(u8 param_1, Vec* posPtr) {
switch (param_1) {
case 110:
@@ -1890,7 +1827,6 @@ void Z2EnvSeMgr::registLv3WaterSePos(u8 param_1, Vec* posPtr) {
}
}
/* 802CA794-802CAAC0 2C50D4 032C+00 1/1 1/1 0/0 .text startLv3WaterSe__10Z2EnvSeMgrFSc */
void Z2EnvSeMgr::startLv3WaterSe(s8 reverb) {
if (Z2GetSceneMgr()->getCurrentSceneNum() == Z2SCENE_LAKEBED_TEMPLE) {
if (reverb >= 0) {
src/Z2AudioLib/Z2FxLineMgr.cpp
-9
View File
@@ -5,7 +5,6 @@
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JSupport/JSUMemoryStream.h"
/* 802BA7DC-802BA7FC 2B511C 0020+00 0/0 1/1 0/0 .text __ct__11Z2FxLineMgrFv */
Z2FxLineMgr::Z2FxLineMgr() : JASGlobalInstance<Z2FxLineMgr>(true) {
mConfig = NULL;
mLineID = -1;
@@ -17,8 +16,6 @@ Z2FxLineMgr::Z2FxLineMgr() : JASGlobalInstance<Z2FxLineMgr>(true) {
#endif
}
/* 802BA7FC-802BAC28 2B513C 042C+00 0/0 1/1 0/0 .text
* initDataArc__11Z2FxLineMgrFP10JKRArchiveP7JKRHeap */
void Z2FxLineMgr::initDataArc(JKRArchive* arc, JKRHeap* heap) {
JUT_ASSERT(44, arc);
JUT_ASSERT(45, heap);
@@ -76,7 +73,6 @@ void Z2FxLineMgr::initDataArc(JKRArchive* arc, JKRHeap* heap) {
setLineID(-1, true, false);
}
/* 802BAC28-802BAC74 2B5568 004C+00 4/4 0/0 0/0 .text setLineID__11Z2FxLineMgrFScbb */
void Z2FxLineMgr::setLineID(s8 fxID, bool param_1, bool param_2) {
JUT_ASSERT(109, fxID < mFxDataNum);
@@ -89,8 +85,6 @@ void Z2FxLineMgr::setLineID(s8 fxID, bool param_1, bool param_2) {
setLine(&mConfig[mLineID], param_1, param_2);
}
/* 802BAC74-802BAE1C 2B55B4 01A8+00 1/1 0/0 0/0 .text setLine__11Z2FxLineMgrFP14Z2FxLineConfigbb
*/
void Z2FxLineMgr::setLine(Z2FxLineConfig* config, bool param_1, bool param_2) {
JUT_ASSERT(121, config);
@@ -154,12 +148,10 @@ void Z2FxLineMgr::setLine(Z2FxLineConfig* config, bool param_1, bool param_2) {
JASDsp::setFXLine(buf2, (s16*)mFxLineBuffer[buf2], &dsp_config);
}
/* 802BAE1C-802BAE48 2B575C 002C+00 0/0 1/1 0/0 .text setFxForceOff__11Z2FxLineMgrFb */
void Z2FxLineMgr::setFxForceOff(bool param_0) {
setLineID(mLineID, true, param_0);
}
/* 802BAE48-802BAEB8 2B5788 0070+00 0/0 1/1 0/0 .text setUnderWaterFx__11Z2FxLineMgrFb */
void Z2FxLineMgr::setUnderWaterFx(bool isUnderWaterFx) {
if (mSetUnderWaterFx != isUnderWaterFx) {
if (isUnderWaterFx) {
@@ -173,7 +165,6 @@ void Z2FxLineMgr::setUnderWaterFx(bool isUnderWaterFx) {
}
}
/* 802BAEB8-802BB00C 2B57F8 0154+00 2/1 1/1 0/0 .text setSceneFx__11Z2FxLineMgrFl */
void Z2FxLineMgr::setSceneFx(s32 sceneNo) {
if (Z2GetSceneMgr()->isInDarkness()) {
setLineID(11, true, false);
src/Z2AudioLib/Z2LinkMgr.cpp
-58
View File
@@ -5,15 +5,12 @@
#include "Z2AudioLib/Z2AudioCS.h"
#endif
/* 802C321C-802C3220 2BDB5C 0004+00 0/0 1/1 0/0 .text setLinkGroupInfo__14Z2CreatureLinkFUc */
void Z2CreatureLink::setLinkGroupInfo(u8) {}
/* 802C3220-802C3228 -00001 0008+00 0/0 0/0 0/0 .text setLinkHp__14Z2CreatureLinkFll */
void Z2CreatureLink::setLinkHp(s32 linkHp, s32) {
mLinkHp = linkHp;
}
/* 802C3228-802C328C 2BDB68 0064+00 0/0 1/1 0/0 .text setLinkSwordType__14Z2CreatureLinkFll */
void Z2CreatureLink::setLinkSwordType(s32 swordType, s32 param_1) {
mLinkSwordType = swordType;
mFlag3 = param_1 == 1;
@@ -28,7 +25,6 @@ void Z2CreatureLink::setLinkSwordType(s32 swordType, s32 param_1) {
mFlag5 = false;
}
/* 802C328C-802C32F0 2BDBCC 0064+00 0/0 1/1 0/0 .text setLinkShieldType__14Z2CreatureLinkFll */
void Z2CreatureLink::setLinkShieldType(s32 shieldType, s32 param_1) {
mLinkShieldType = shieldType;
mFlag4 = param_1 == 1;
@@ -43,7 +39,6 @@ void Z2CreatureLink::setLinkShieldType(s32 shieldType, s32 param_1) {
mFlag5 = false;
}
/* 802C32F0-802C333C 2BDC30 004C+00 0/0 1/1 0/0 .text setLinkBootsType__14Z2CreatureLinkFl */
void Z2CreatureLink::setLinkBootsType(s32 bootsType) {
mLinkBootsType = bootsType;
@@ -52,10 +47,8 @@ void Z2CreatureLink::setLinkBootsType(s32 bootsType) {
}
}
/* 80451360-80451368 000860 0004+04 3/3 15/15 0/0 .sbss mLinkPtr__14Z2CreatureLink */
Z2CreatureLink* Z2CreatureLink::mLinkPtr;
/* 802C333C-802C3464 2BDC7C 0128+00 0/0 1/1 0/0 .text __ct__14Z2CreatureLinkFv */
Z2CreatureLink::Z2CreatureLink() {
mLinkState = 0;
mLinkPtr = this;
@@ -82,15 +75,12 @@ Z2CreatureLink::Z2CreatureLink() {
mUsingIronBall = false;
}
/* 802C3464-802C3500 2BDDA4 009C+00 1/0 0/0 0/0 .text __dt__18Z2LinkSoundStarterFv */
inline Z2LinkSoundStarter::~Z2LinkSoundStarter() {}
/* 802C3500-802C35F8 2BDE40 00F8+00 2/1 1/1 0/0 .text __dt__14Z2CreatureLinkFv */
Z2CreatureLink::~Z2CreatureLink() {
deleteObject();
}
/* 802C35F8-802C3638 2BDF38 0040+00 1/0 0/0 0/0 .text deleteObject__14Z2CreatureLinkFv */
void Z2CreatureLink::deleteObject() {
if (mKantera.isAlive()) {
deleteKantera();
@@ -99,7 +89,6 @@ void Z2CreatureLink::deleteObject() {
Z2Creature::deleteObject();
}
/* 802C3638-802C3710 2BDF78 00D8+00 0/0 1/1 0/0 .text init__14Z2CreatureLinkFP3VecP3VecP3Vec */
void Z2CreatureLink::init(Vec* animePosPtr, Vec* simplePosPtr, Vec* simple2PosPtr) {
OS_REPORT("[Z2CreatureLink::init]");
@@ -121,26 +110,20 @@ void Z2CreatureLink::init(Vec* animePosPtr, Vec* simplePosPtr, Vec* simple2PosPt
mSinkDepth = -1;
}
/* 802C3710-802C374C 2BE050 003C+00 0/0 1/1 0/0 .text initKantera__14Z2CreatureLinkFP3Vec
*/
void Z2CreatureLink::initKantera(Vec* posPtr) {
mKanteraState = 0;
mKantera.init(posPtr, 2);
}
/* 802C374C-802C3778 2BE08C 002C+00 1/1 1/1 0/0 .text deleteKantera__14Z2CreatureLinkFv
*/
void Z2CreatureLink::deleteKantera() {
mKanteraState = 0;
mKantera.deleteObject();
}
/* 802C3778-802C3780 -00001 0008+00 0/0 0/0 0/0 .text setKanteraState__14Z2CreatureLinkFUc */
void Z2CreatureLink::setKanteraState(u8 state) {
mKanteraState = state;
}
/* 802C3780-802C3A64 2BE0C0 02E4+00 1/0 0/0 0/0 .text framework__14Z2CreatureLinkFUlSc */
void Z2CreatureLink::framework(u32 mapinfo, s8 reverb) {
Z2Creature::framework(mapinfo, reverb);
@@ -190,13 +173,10 @@ void Z2CreatureLink::framework(u32 mapinfo, s8 reverb) {
}
}
/* 802C3A64-802C3A6C -00001 0008+00 0/0 0/0 0/0 .text setSinkDepth__14Z2CreatureLinkFSc
*/
void Z2CreatureLink::setSinkDepth(s8 sinkDepth) {
mSinkDepth = sinkDepth;
}
/* 802C3A6C-802C3AEC 2BE3AC 0080+00 0/0 4/4 0/0 .text setRiding__14Z2CreatureLinkFb */
void Z2CreatureLink::setRiding(bool isRiding) {
if (mRiding != isRiding) {
if (isRiding) {
@@ -211,14 +191,10 @@ void Z2CreatureLink::setRiding(bool isRiding) {
}
}
/* 802C3AEC-802C3AFC 2BE42C 0010+00 0/0 5/5 0/0 .text setMagnetized__14Z2CreatureLinkFb
*/
void Z2CreatureLink::setMagnetized(bool isMagnetized) {
mMagnetized = isMagnetized;
}
/* 802C3AFC-802C3BD4 2BE43C 00D8+00 0/0 2/2 0/0 .text setWolfEyeOpen__14Z2CreatureLinkFb
*/
void Z2CreatureLink::setWolfEyeOpen(bool wolfEyeOpen) {
mWolfEyeOpen = wolfEyeOpen;
@@ -245,8 +221,6 @@ void Z2CreatureLink::setWolfEyeOpen(bool wolfEyeOpen) {
}
}
/* 802C3BD4-802C3E68 2BE514 0294+00 3/3 3/3 0/0 .text
* startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc */
Z2SoundHandlePool* Z2CreatureLink::startLinkSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
Z2SoundHandlePool* handle = startCreatureSound(soundID, mapinfo, reverb);
@@ -282,8 +256,6 @@ Z2SoundHandlePool* Z2CreatureLink::startLinkSound(JAISoundID soundID, u32 mapinf
return handle;
}
/* 802C3E68-802C4320 2BE7A8 04B8+00 1/1 3/3 0/0 .text
* startLinkSoundLevel__14Z2CreatureLinkF10JAISoundIDUlSc */
JAISoundHandle* Z2CreatureLink::startLinkSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb) {
#if PLATFORM_WII || PLATFORM_SHIELD
if (Z2GetSceneMgr()->isSceneExist()) {
@@ -377,8 +349,6 @@ JAISoundHandle* Z2CreatureLink::startLinkSoundLevel(JAISoundID soundID, u32 mapi
return handle;
}
/* 802C4320-802C45B0 2BEC60 0290+00 1/1 1/1 0/0 .text
* startLinkVoice__14Z2CreatureLinkF10JAISoundIDSc */
Z2SoundHandlePool* Z2CreatureLink::startLinkVoice(JAISoundID soundID, s8 reverb) {
if (mLinkState == 1) {
switch (soundID) {
@@ -448,8 +418,6 @@ Z2SoundHandlePool* Z2CreatureLink::startLinkVoice(JAISoundID soundID, s8 reverb)
return startCreatureVoice(soundID, reverb);
}
/* 802C45B0-802C46F0 2BEEF0 0140+00 0/0 1/1 0/0 .text
* startLinkVoiceLevel__14Z2CreatureLinkF10JAISoundIDSc */
Z2SoundHandlePool* Z2CreatureLink::startLinkVoiceLevel(JAISoundID soundID, s8 reverb) {
if (mLinkState == 1) {
switch (soundID) {
@@ -487,8 +455,6 @@ Z2SoundHandlePool* Z2CreatureLink::startLinkVoiceLevel(JAISoundID soundID, s8 re
return startCreatureVoiceLevel(soundID, reverb);
}
/* 802C46F0-802C4784 2BF030 0094+00 0/0 2/2 0/0 .text
* startLinkSwordSound__14Z2CreatureLinkF10JAISoundIDUlSc */
void Z2CreatureLink::startLinkSwordSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
u32 sound_ID = soundID; // fakematch
@@ -515,7 +481,6 @@ void Z2CreatureLink::startLinkSwordSound(JAISoundID soundID, u32 mapinfo, s8 rev
}
}
/* 802C4784-802C4814 2BF0C4 0090+00 1/0 0/0 0/0 .text startCollisionSE__14Z2CreatureLinkFUlUl */
Z2SoundHandlePool* Z2CreatureLink::startCollisionSE(u32 hitID, u32 mapinfo) {
switch (mapinfo) {
case 0x28:
@@ -533,8 +498,6 @@ Z2SoundHandlePool* Z2CreatureLink::startCollisionSE(u32 hitID, u32 mapinfo) {
return mSoundObjAnime.startCollisionSE(hitID, mapinfo, NULL);
}
/* 802C4814-802C48D8 2BF154 00C4+00 0/0 4/4 2/2 .text
* startHitItemSE__14Z2CreatureLinkFUlUlP14Z2SoundObjBasef */
Z2SoundHandlePool* Z2CreatureLink::startHitItemSE(u32 soundID, u32 mapinfo, Z2SoundObjBase* other, f32 speed) {
if (other == NULL) {
other = &mSoundObjSimple2;
@@ -558,17 +521,12 @@ Z2SoundHandlePool* Z2CreatureLink::startHitItemSE(u32 soundID, u32 mapinfo, Z2So
return handle;
}
/* 802C48D8-802C48E8 2BF218 0010+00 0/0 1/1 0/0 .text setResumeAttack__14Z2CreatureLinkFb
*/
void Z2CreatureLink::setResumeAttack(bool resumeAttack) {
mResumeAttack = resumeAttack;
}
/* 802C48E8-802C4928 2BF228 0040+00 1/1 0/0 0/0 .text __ct__18Z2LinkSoundStarterFv */
Z2LinkSoundStarter::Z2LinkSoundStarter() : Z2SoundStarter(false) {}
/* 802C4928-802C4FFC 2BF268 06D4+00 2/0 0/0 0/0 .text
* startSound__18Z2LinkSoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f>UlfffffUl */
bool Z2LinkSoundStarter::startSound(JAISoundID soundID, JAISoundHandle* handle,
const JGeometry::TVec3<f32>* posPtr, u32 mapinfo,
f32 fxMix, f32 pitch, f32 volume, f32 pan,
@@ -718,43 +676,33 @@ bool Z2LinkSoundStarter::startSound(JAISoundID soundID, JAISoundHandle* handle,
return ret;
}
/* 802C4FFC-802C5078 2BF93C 007C+00 0/0 0/0 3/3 .text __ct__14Z2CreatureRideFv */
Z2CreatureRide::Z2CreatureRide() : Z2RideSoundStarter(this) {
mLinkRiding = false;
setSoundStarter(this);
}
/* 802C5114-802C51EC 2BFA54 00D8+00 2/1 0/0 2/2 .text __dt__14Z2CreatureRideFv */
Z2CreatureRide::~Z2CreatureRide() {
deleteObject();
}
/* 802C51EC-802C520C 2BFB2C 0020+00 1/0 0/0 0/0 .text deleteObject__14Z2CreatureRideFv */
void Z2CreatureRide::deleteObject() {
Z2Creature::deleteObject();
}
/* 802C520C-802C522C 2BFB4C 0020+00 0/0 0/0 3/3 .text init__14Z2CreatureRideFP3VecP3VecUcUc */
void Z2CreatureRide::init(Vec* animePosPtr, Vec* simplePosPtr, u8 animeHandleNum, u8 simpleHandleNum) {
Z2Creature::init(animePosPtr, simplePosPtr, animeHandleNum, simpleHandleNum);
}
/* 802C522C-802C5234 -00001 0008+00 0/0 0/0 0/0 .text setLinkRiding__14Z2CreatureRideFb
*/
void Z2CreatureRide::setLinkRiding(bool isRiding) {
mLinkRiding = isRiding;
}
/* 802C5234-802C5284 2BFB74 0050+00 1/1 0/0 0/0 .text __ct__18Z2RideSoundStarterFP14Z2CreatureRide
*/
Z2RideSoundStarter::Z2RideSoundStarter(Z2CreatureRide* ride) : Z2SoundStarter(false) {
mRide = ride;
JUT_ASSERT(1294, ride);
}
/* 802C5284-802C54B8 2BFBC4 0234+00 2/0 0/0 0/0 .text
* startSound__18Z2RideSoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f>UlfffffUl */
bool Z2RideSoundStarter::startSound(JAISoundID soundID, JAISoundHandle* handle,
const JGeometry::TVec3<f32>* posPtr, u32 mapinfo,
f32 fxMix, f32 pitch, f32 volume, f32 pan,
@@ -809,17 +757,14 @@ bool Z2RideSoundStarter::startSound(JAISoundID soundID, JAISoundHandle* handle,
return ret;
}
/* 802C54B8-802C54FC 2BFDF8 0044+00 0/0 0/0 1/1 .text __ct__15Z2SoundObjCoachFv */
Z2SoundObjCoach::Z2SoundObjCoach() {
field_0x20 = 0.0f;
}
/* 802C54FC-802C551C 2BFE3C 0020+00 1/0 0/0 0/0 .text init__15Z2SoundObjCoachFP3VecUc */
void Z2SoundObjCoach::init(Vec* posPtr, u8 handleNum) {
Z2SoundObjBase::init(posPtr, handleNum);
}
/* 802C551C-802C56C0 2BFE5C 01A4+00 0/0 0/0 1/1 .text startWheelSound__15Z2SoundObjCoachFf */
Z2SoundHandlePool* Z2SoundObjCoach::startWheelSound(f32 param_0) {
Z2SoundHandlePool* handle = NULL;
@@ -851,7 +796,6 @@ Z2SoundHandlePool* Z2SoundObjCoach::startWheelSound(f32 param_0) {
return handle;
}
/* 802C56C0-802C57C0 2C0000 0100+00 0/0 0/0 1/1 .text startFireSound__15Z2SoundObjCoachFUs */
Z2SoundHandlePool* Z2SoundObjCoach::startFireSound(u16 param_0) {
Z2SoundHandlePool* handle = startLevelSound(Z2SE_COACH_FIRE, 0, -1);
@@ -867,8 +811,6 @@ Z2SoundHandlePool* Z2SoundObjCoach::startFireSound(u16 param_0) {
return handle;
}
/* 802C57C0-802C588C 2C0100 00CC+00 1/0 0/0 0/0 .text
* startSound__15Z2SoundObjCoachF10JAISoundIDUlSc */
Z2SoundHandlePool* Z2SoundObjCoach::startSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
Z2SoundHandlePool* handle = Z2SoundObjBase::startSound(soundID, mapinfo, reverb);
src/Z2AudioLib/Z2Param.cpp
-56
View File
@@ -5,123 +5,74 @@
#include "Z2AudioLib/Z2Param.h"
/* 804507D8-804507DC 000258 0004+00 0/0 4/4 0/0 .sdata DISTANCE_MAX__7Z2Param */
f32 Z2Param::DISTANCE_MAX = 2000.0f;
/* 804507DC-804507E0 00025C 0004+00 0/0 3/3 0/0 .sdata MAX_VOLUME_DISTANCE__7Z2Param */
f32 Z2Param::MAX_VOLUME_DISTANCE = 300.0f;
/* 804507E0-804507E4 000260 0004+00 0/0 1/1 0/0 .sdata DOLBY_CENTER_VALUE__7Z2Param */
f32 Z2Param::DOLBY_CENTER_VALUE = 0.3f;
/* 804507E4-804507E8 000264 0004+00 0/0 3/3 0/0 .sdata DOLBY_FLONT_DISTANCE_MAX__7Z2Param
*/
f32 Z2Param::DOLBY_FLONT_DISTANCE_MAX = -300.0f;
/* 804507E8-804507EC 000268 0004+00 0/0 3/3 0/0 .sdata DOLBY_BEHIND_DISTANCE_MAX__7Z2Param
*/
f32 Z2Param::DOLBY_BEHIND_DISTANCE_MAX = 600.0f;
/* 804507EC-804507F0 00026C 0004+00 0/0 1/1 0/0 .sdata DISTANCE_FX_PARAM__7Z2Param */
f32 Z2Param::DISTANCE_FX_PARAM = 10.0f / 127.0f;
/* 804507F0-804507F4 000270 0004+00 0/0 1/1 0/0 .sdata SONIC_SPEED__7Z2Param */
f32 Z2Param::SONIC_SPEED = 360.0f;
/* 804507F4-804507F8 000274 0004+00 0/0 3/3 0/0 .sdata VOL_BGM_DEFAULT__7Z2Param */
f32 Z2Param::VOL_BGM_DEFAULT = 1.0f;
/* 804507F8-804507FC 000278 0004+00 0/0 2/2 0/0 .sdata VOL_SE_SYSTEM_DEFAULT__7Z2Param */
f32 Z2Param::VOL_SE_SYSTEM_DEFAULT = 120.0f / 127.0f;
/* 804507FC-80450800 00027C 0004+00 0/0 3/3 0/0 .sdata VOL_SE_LINK_VOICE_DEFAULT__7Z2Param
*/
f32 Z2Param::VOL_SE_LINK_VOICE_DEFAULT = 1.0f;
/* 80450800-80450804 000280 0004+00 0/0 3/3 0/0 .sdata VOL_SE_LINK_MOTION_DEFAULT__7Z2Param */
f32 Z2Param::VOL_SE_LINK_MOTION_DEFAULT = 120.0f / 127.0f;
/* 80450804-80450808 000284 0004+00 0/0 3/3 0/0 .sdata VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param */
f32 Z2Param::VOL_SE_LINK_FOOTNOTE_DEFAULT = 120.0f / 127.0f;
/* 80450808-8045080C 000288 0004+00 0/0 3/3 0/0 .sdata VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param
*/
f32 Z2Param::VOL_SE_CHAR_VOICE_DEFAULT = 120.0f / 127.0f;
/* 8045080C-80450810 00028C 0004+00 0/0 3/3 0/0 .sdata VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param
*/
f32 Z2Param::VOL_SE_CHAR_MOVE_DEFAULT = 120.0f / 127.0f;
/* 80450810-80450814 000290 0004+00 0/0 3/3 0/0 .sdata VOL_SE_OBJECT_DEFAULT__7Z2Param */
f32 Z2Param::VOL_SE_OBJECT_DEFAULT = 120.0f / 127.0f;
/* 80450814-80450818 000294 0004+00 0/0 3/3 0/0 .sdata VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param
*/
f32 Z2Param::VOL_SE_ATMOSPHERE_DEFAULT = 120.0f / 127.0f;
/* 80450818-8045081C 000298 0004+00 0/0 1/1 0/0 .sdata VOL_BGM_TALKING__7Z2Param */
f32 Z2Param::VOL_BGM_TALKING = 0.5f;
/* 8045081C-80450820 00029C 0004+00 0/0 1/1 0/0 .sdata VOL_SE_SYSTEM_TALKING__7Z2Param */
f32 Z2Param::VOL_SE_SYSTEM_TALKING = 112.0f / 127.0f;
/* 80450820-80450824 0002A0 0004+00 0/0 1/1 0/0 .sdata VOL_SE_LINK_VOICE_TALKING__7Z2Param
*/
f32 Z2Param::VOL_SE_LINK_VOICE_TALKING = 104.0f / 127.0f;
/* 80450824-80450828 0002A4 0004+00 0/0 1/1 0/0 .sdata VOL_SE_LINK_MOTION_TALKING__7Z2Param */
f32 Z2Param::VOL_SE_LINK_MOTION_TALKING = 96.0f / 127.0f;
/* 80450828-8045082C 0002A8 0004+00 0/0 1/1 0/0 .sdata VOL_SE_LINK_FOOTNOTE_TALKING__7Z2Param */
f32 Z2Param::VOL_SE_LINK_FOOTNOTE_TALKING = 96.0f / 127.0f;
/* 8045082C-80450830 0002AC 0004+00 0/0 1/1 0/0 .sdata VOL_SE_CHAR_VOICE_TALKING__7Z2Param
*/
f32 Z2Param::VOL_SE_CHAR_VOICE_TALKING = 120.0f / 127.0f;
/* 80450830-80450834 0002B0 0004+00 0/0 1/1 0/0 .sdata VOL_SE_CHAR_MOVE_TALKING__7Z2Param
*/
f32 Z2Param::VOL_SE_CHAR_MOVE_TALKING = 119.0f / 127.0f;
/* 80450834-80450838 0002B4 0004+00 0/0 1/1 0/0 .sdata VOL_SE_OBJECT_TALKING__7Z2Param */
f32 Z2Param::VOL_SE_OBJECT_TALKING = 96.0f / 127.0f;
/* 80450838-8045083C 0002B8 0004+00 0/0 1/1 0/0 .sdata VOL_SE_ATMOSPHERE_TALKING__7Z2Param
*/
f32 Z2Param::VOL_SE_ATMOSPHERE_TALKING = 96.0f / 127.0f;
/* 8045083C-80450840 0002BC 0004+00 0/0 1/1 0/0 .sdata VOL_BGM_PAUSING__7Z2Param */
f32 Z2Param::VOL_BGM_PAUSING = 0.3f;
/* 80450840-80450844 0002C0 0004+00 0/0 1/1 0/0 .sdata VOL_SE_SYSTEM_PAUSING__7Z2Param */
f32 Z2Param::VOL_SE_SYSTEM_PAUSING = 112.0f / 127.0f;
/* 80450844-80450848 0002C4 0004+00 0/0 1/1 0/0 .sdata VOL_SE_LINK_VOICE_PAUSING__7Z2Param
*/
f32 Z2Param::VOL_SE_LINK_VOICE_PAUSING = 80.0f / 127.0f;
/* 80450848-8045084C 0002C8 0004+00 0/0 1/1 0/0 .sdata VOL_SE_LINK_MOTION_PAUSING__7Z2Param */
f32 Z2Param::VOL_SE_LINK_MOTION_PAUSING = 72.0f / 127.0f;
/* 8045084C-80450850 0002CC 0004+00 0/0 1/1 0/0 .sdata VOL_SE_LINK_FOOTNOTE_PAUSING__7Z2Param */
f32 Z2Param::VOL_SE_LINK_FOOTNOTE_PAUSING = 72.0f / 127.0f;
/* 80450850-80450854 0002D0 0004+00 0/0 1/1 0/0 .sdata VOL_SE_CHAR_VOICE_PAUSING__7Z2Param
*/
f32 Z2Param::VOL_SE_CHAR_VOICE_PAUSING = 72.0f / 127.0f;
/* 80450854-80450858 0002D4 0004+00 0/0 1/1 0/0 .sdata VOL_SE_CHAR_MOVE_PAUSING__7Z2Param
*/
f32 Z2Param::VOL_SE_CHAR_MOVE_PAUSING = 72.0f / 127.0f;
/* 80450858-8045085C 0002D8 0004+00 0/0 1/1 0/0 .sdata VOL_SE_OBJECT_PAUSING__7Z2Param */
f32 Z2Param::VOL_SE_OBJECT_PAUSING = 72.0f / 127.0f;
/* 8045085C-80450860 0002DC 0004+00 0/0 1/1 0/0 .sdata VOL_SE_ATMOSPHERE_PAUSING__7Z2Param
*/
f32 Z2Param::VOL_SE_ATMOSPHERE_PAUSING = 72.0f / 127.0f;
/* 80450860-80450864 -00001 0004+00 0/0 15/15 0/0 .sdata None */
u8 Z2Param::SCENE_CHANGE_BGM_FADEOUT_TIME = 33;
u8 Z2Param::BGM_CROSS_FADEIN_TIME = 60;
@@ -130,7 +81,6 @@ u8 Z2Param::BGM_CROSS_FADEOUT_TIME = 60;
u8 Z2Param::BATTLE_BGM_WAIT_TIME = 30;
/* 80450864-80450868 -00001 0004+00 0/0 2/2 0/0 .sdata None */
u8 Z2Param::FOUND_TRACK_FI_TIME = 20;
u8 Z2Param::FOUND_TRACK_FO_TIME = 30;
@@ -139,7 +89,6 @@ u8 Z2Param::CLOSE_BATTLE_TRACK_FI_TIME = 10;
u8 Z2Param::CLOSE_BATTLE_TRACK_FO_TIME = 30;
/* 80450868-8045086C -00001 0004+00 0/0 5/5 0/0 .sdata None */
u8 Z2Param::ENDING_BLOW_VOL_DOWN_TIME = 1;
u8 Z2Param::ENDING_BLOW_VOL_LOWER_TIME = 10;
@@ -148,17 +97,12 @@ u8 Z2Param::ENDING_BLOW_VOL_LOWER_RECOVER_TIME = 30;
u8 Z2Param::ENDING_BLOW_MIN_FINISH_TIME = 20;
/* 8045086C-80450870 0002EC 0004+00 0/0 3/3 0/0 .sdata None */
u8 data_8045086C = 1;
/* 80451338-8045133C 000838 0004+00 0/0 1/1 0/0 .sbss MIN_DISTANCE_VOLUME__7Z2Param */
f32 Z2Param::MIN_DISTANCE_VOLUME;
/* 8045133C-80451340 00083C 0004+00 0/0 1/1 0/0 .sbss ENEMY_LASTHIT_MUTE_VOLUME__7Z2Param
*/
f32 Z2Param::ENEMY_LASTHIT_MUTE_VOLUME;
/* 80451340-80451348 -00001 0008+00 0/0 2/2 0/0 .sbss None */
/* 80451340 0001+00 data_80451340 None */
u8 Z2Param::DARK_SE_FILTER_ON;
src/Z2AudioLib/Z2SceneMgr.cpp
-26
View File
@@ -10,7 +10,6 @@
#include "Z2AudioLib/Z2StatusMgr.h"
#include "d/d_com_inf_game.h"
/* 802B6840-802B68B0 2B1180 0070+00 0/0 1/1 0/0 .text __ct__10Z2SceneMgrFv */
Z2SceneMgr::Z2SceneMgr() : JASGlobalInstance<Z2SceneMgr>(true) {
sceneNum = -1;
BGM_ID = -1;
@@ -35,7 +34,6 @@ Z2SceneMgr::Z2SceneMgr() : JASGlobalInstance<Z2SceneMgr>(true) {
load1stWait = 0;
}
/* 802B68B0-802B68E0 2B11F0 0030+00 0/0 1/1 0/0 .text setInDarkness__10Z2SceneMgrFb */
void Z2SceneMgr::setInDarkness(bool inDarkness) {
OS_REPORT("[Z2SceneMgr::setInDarkness] inDarkness = %d\n", inDarkness);
@@ -129,7 +127,6 @@ static char* sSpotName[81] = {
"D_SB10",
};
/* 802B68E0-802B697C 2B1220 009C+00 3/3 2/2 2/2 .text setSceneExist__10Z2SceneMgrFb */
void Z2SceneMgr::setSceneExist(bool isSceneExist) {
sceneExist = isSceneExist;
timer = 0;
@@ -151,7 +148,6 @@ void Z2SceneMgr::setSceneExist(bool isSceneExist) {
}
}
/* 802B697C-802B6A18 2B12BC 009C+00 0/0 1/1 0/0 .text setFadeOutStart__10Z2SceneMgrFUc */
void Z2SceneMgr::setFadeOutStart(u8 fadeType) {
OS_REPORT("[Z2SceneMgr::setFadeOutStart] fadeType = %d\n", fadeType);
@@ -163,7 +159,6 @@ void Z2SceneMgr::setFadeOutStart(u8 fadeType) {
timer = -1;
}
/* 802B6A18-802B6AF8 2B1358 00E0+00 0/0 1/1 0/0 .text setFadeInStart__10Z2SceneMgrFUc */
void Z2SceneMgr::setFadeInStart(u8 fadeType) {
OS_REPORT("[Z2SceneMgr::setFadeInStart] fadeType = %d\n", fadeType);
@@ -187,7 +182,6 @@ void Z2SceneMgr::setFadeInStart(u8 fadeType) {
inGame = true;
}
/* 802B6AF8-802B995C 2B1438 2E64+00 8/0 1/1 0/0 .text setSceneName__10Z2SceneMgrFPcll */
// NONMATCHING JSULink<JAIStream>::getNext() inlining
void Z2SceneMgr::setSceneName(char* spot, s32 room, s32 layer) {
OS_REPORT("[Z2SceneMgr::setSceneName] spot = %s, room = %d, layer = %d\n", spot, room, layer);
@@ -1747,8 +1741,6 @@ void Z2SceneMgr::setSceneName(char* spot, s32 room, s32 layer) {
roomNum = room;
}
/* 802B9B68-802B9C50 2B44A8 00E8+00 1/1 0/0 0/0 .text
* sceneChange__10Z2SceneMgrF10JAISoundIDUcUcUcUcUcb */
void Z2SceneMgr::sceneChange(JAISoundID bgm, u8 seWave1, u8 seWave2, u8 bgmWave1, u8 bgmWave2,
u8 demoWave, bool param_6) {
OS_REPORT("[Z2SceneMgr::sceneChange] bgm:0x%08x, SeWave1:%d, SeWave2:%d BgmWave1:%d BgmWave2:%d demoWave:%d (%d)\n",
@@ -1781,7 +1773,6 @@ void Z2SceneMgr::sceneChange(JAISoundID bgm, u8 seWave1, u8 seWave2, u8 bgmWave1
Z2GetFxLineMgr()->setSceneFx(sceneNum);
}
/* 802B9C50-802B9D40 2B4590 00F0+00 0/0 1/1 0/0 .text framework__10Z2SceneMgrFv */
void Z2SceneMgr::framework() {
if (load1stWait > 0) {
load1stWait--;
@@ -1807,8 +1798,6 @@ void Z2SceneMgr::framework() {
}
}
/* 802B9D40-802B9D98 2B4680 0058+00 0/0 1/1 0/0 .text load1stDynamicWave__10Z2SceneMgrFv
*/
void Z2SceneMgr::load1stDynamicWave() {
OS_REPORT("[Z2SceneMgr::load1stDynamicWave] load1stWait:%d\n", load1stWait);
@@ -1820,7 +1809,6 @@ void Z2SceneMgr::load1stDynamicWave() {
}
}
/* 802B9D98-802B9FC8 2B46D8 0230+00 2/2 0/0 0/0 .text _load1stWaveInner_1__10Z2SceneMgrFv */
void Z2SceneMgr::_load1stWaveInner_1() {
OS_REPORT("[Z2SceneMgr::_load1stWaveInner_1] requestSe:%d loadedSe:%d\n", requestSeWave_1, loadedSeWave_1);
@@ -1871,8 +1859,6 @@ void Z2SceneMgr::_load1stWaveInner_1() {
}
}
/* 802B9FC8-802BA09C 2B4908 00D4+00 2/2 0/0 0/0 .text _load1stWaveInner_2__10Z2SceneMgrFv
*/
void Z2SceneMgr::_load1stWaveInner_2() {
OS_REPORT("[Z2SceneMgr::_load1stWaveInner_2] requestBgm:%d loadedBgm:%d\n", requestBgmWave_1, loadedBgmWave_1);
@@ -1896,14 +1882,10 @@ void Z2SceneMgr::_load1stWaveInner_2() {
}
}
/* 802BA09C-802BA120 2B49DC 0084+00 0/0 1/1 0/0 .text check1stDynamicWave__10Z2SceneMgrFv
*/
bool Z2SceneMgr::check1stDynamicWave() {
return load1stWait != 0 || getSeLoadStatus(requestSeWave_1) == 1 || getBgmLoadStatus(requestBgmWave_1) == 1;
}
/* 802BA120-802BA294 2B4A60 0174+00 0/0 2/2 0/0 .text load2ndDynamicWave__10Z2SceneMgrFv
*/
void Z2SceneMgr::load2ndDynamicWave() {
OS_REPORT("[Z2SceneMgr::load2ndDynamicWave] requestSe:%d, loadedSe:%d requestBgm:%d loadedBgm:%d requestDemo:%d loadedDemo:%d\n",
requestSeWave_2, loadedSeWave_2, requestBgmWave_2, loadedBgmWave_2, requestDemoWave, loadedDemoWave);
@@ -1945,7 +1927,6 @@ void Z2SceneMgr::load2ndDynamicWave() {
}
}
/* 802BA294-802BA56C 2B4BD4 02D8+00 1/0 2/2 0/0 .text sceneBgmStart__10Z2SceneMgrFv */
// NONMATCHING - extra BGM_ID load
void Z2SceneMgr::sceneBgmStart() {
OS_REPORT("[Z2SceneMgr::sceneBgmStart] %08x\n", *(u32*)&BGM_ID);
@@ -2039,7 +2020,6 @@ void Z2SceneMgr::sceneBgmStart() {
field_0x1a = false;
}
/* 802BA56C-802BA5C0 2B4EAC 0054+00 0/0 1/1 0/0 .text loadStaticWaves__10Z2SceneMgrFv */
void Z2SceneMgr::loadStaticWaves() {
OS_REPORT("[Z2SceneMgr::loadStaticWaves] 常駐シーン波形を読み込みます\n");
#if PLATFORM_SHIELD
@@ -2052,12 +2032,10 @@ void Z2SceneMgr::loadStaticWaves() {
field_0x19 = 0x58;
}
/* 802BA5C0-802BA5C8 2B4F00 0008+00 0/0 1/1 0/0 .text checkFirstWaves__10Z2SceneMgrFv */
BOOL Z2SceneMgr::checkFirstWaves() {
return false;
}
/* 802BA5C8-802BA630 2B4F08 0068+00 2/2 0/0 0/0 .text eraseSeWave__10Z2SceneMgrFUl */
bool Z2SceneMgr::eraseSeWave(u32 wave) {
JAUSectionHeap* sectionHeap = JASGlobalInstance<JAUSectionHeap>::getInstance();
JUT_ASSERT(2976, sectionHeap);
@@ -2072,7 +2050,6 @@ bool Z2SceneMgr::eraseSeWave(u32 wave) {
return false;
}
/* 802BA630-802BA698 2B4F70 0068+00 2/2 0/0 0/0 .text eraseBgmWave__10Z2SceneMgrFUl */
bool Z2SceneMgr::eraseBgmWave(u32 wave) {
JAUSectionHeap* sectionHeap = JASGlobalInstance<JAUSectionHeap>::getInstance();
JUT_ASSERT(2988, sectionHeap);
@@ -2087,7 +2064,6 @@ bool Z2SceneMgr::eraseBgmWave(u32 wave) {
return false;
}
/* 802BA698-802BA704 2B4FD8 006C+00 1/1 0/0 0/0 .text getWaveLoadStatus__10Z2SceneMgrFUlUl */
s32 Z2SceneMgr::getWaveLoadStatus(u32 wave, u32 bank) {
JAUSectionHeap* sectionHeap = JASGlobalInstance<JAUSectionHeap>::getInstance();
JUT_ASSERT(3001, sectionHeap);
@@ -2118,7 +2094,6 @@ bool Z2SceneMgr::loadSceneWave(u32 wave, u32 bank) {
}
#endif
/* 802BA704-802BA770 2B5044 006C+00 3/3 0/0 0/0 .text loadSeWave__10Z2SceneMgrFUl */
bool Z2SceneMgr::loadSeWave(u32 wave) {
JAUSectionHeap* sectionHeap = JASGlobalInstance<JAUSectionHeap>::getInstance();
JUT_ASSERT(3030, sectionHeap);
@@ -2135,7 +2110,6 @@ bool Z2SceneMgr::loadSeWave(u32 wave) {
return false;
}
/* 802BA770-802BA7DC 2B50B0 006C+00 3/3 0/0 0/0 .text loadBgmWave__10Z2SceneMgrFUl */
bool Z2SceneMgr::loadBgmWave(u32 wave) {
JAUSectionHeap* sectionHeap = JASGlobalInstance<JAUSectionHeap>::getInstance();
JUT_ASSERT(3047, sectionHeap);
src/Z2AudioLib/Z2SeMgr.cpp
-24
View File
@@ -10,7 +10,6 @@
#include "Z2AudioLib/Z2SeqMgr.h"
#include "JSystem/J3DU/J3DUD.h"
/* 802AB64C-802AB710 2A5F8C 00C4+00 0/0 1/1 0/0 .text __ct__7Z2SeMgrFv */
Z2SeMgr::Z2SeMgr() : JASGlobalInstance(true), mSoundHandles(mSoundHandle, 24) {
field_0x3c0 = 0;
field_0x3c1 = 0;
@@ -30,7 +29,6 @@ Z2MultiSeObj::Z2MultiSeObj() {
reverb_ = 0;
}
/* 802AB750-802AB80C 2A6090 00BC+00 0/0 1/1 0/0 .text initSe__7Z2SeMgrFv */
void Z2SeMgr::initSe() {
#if VERSION == VERSION_SHIELD_DEBUG
dbg_field_0x68.releaseSound();
@@ -64,8 +62,6 @@ void Z2SeMgr::resetModY() {
}
}
/* 802AB830-802AB93C 2A6170 010C+00 1/1 0/0 0/0 .text modHeightAtCamera__7Z2SeMgrFPPC3Vec
*/
void Z2SeMgr::modHeightAtCamera(const Vec** param_0) {
if (*param_0 != NULL) {
int idx = 9999;
@@ -118,8 +114,6 @@ void Z2SeMgr::decrCrowdSize() {
mCrowdSize = 0;
}
/* 802AB984-802AC50C 2A62C4 0B88+00 1/1 196/196 549/549 .text
* seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc */
bool Z2SeMgr::seStart(JAISoundID soundID, const Vec* posPtr, u32 param_2, s8 reverb,
f32 pitch, f32 volume, f32 pan, f32 dolby, u8 param_8) {
if (soundID == 0xFFFFFFFF) {
@@ -353,8 +347,6 @@ bool Z2SeMgr::seStart(JAISoundID soundID, const Vec* posPtr, u32 param_2, s8 rev
pitch, volume, pan, dolby, 0);
}
/* 802AC50C-802AD8B0 2A6E4C 13A4+00 3/2 19/19 199/199 .text
* seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc */
bool Z2SeMgr::seStartLevel(JAISoundID soundID, const Vec* posPtr, u32 param_2, s8 reverb,
f32 pitch, f32 volume, f32 pan, f32 dolby, u8 param_8) {
if (param_8 != 1) {
@@ -710,7 +702,6 @@ bool Z2SeMgr::seStartLevel(JAISoundID soundID, const Vec* posPtr, u32 param_2, s
return ret;
}
/* 802AD8B0-802AD94C 2A81F0 009C+00 1/1 0/0 4/4 .text seStop__7Z2SeMgrF10JAISoundIDUl */
void Z2SeMgr::seStop(JAISoundID soundID, u32 fadeTime) {
if (soundID != -1) {
for (u8 i = 0; i < 24; i++) {
@@ -722,7 +713,6 @@ void Z2SeMgr::seStop(JAISoundID soundID, u32 fadeTime) {
}
}
/* 802AD94C-802AD9F4 2A828C 00A8+00 0/0 1/1 0/0 .text seStopAll__7Z2SeMgrFUl */
void Z2SeMgr::seStopAll(u32 fadeTime) {
JAISeMgr* seMgr = Z2GetSoundMgr()->getSeMgr();
seMgr->getCategory(0)->stop(fadeTime);
@@ -737,7 +727,6 @@ void Z2SeMgr::seStopAll(u32 fadeTime) {
seMgr->getCategory(9)->stop(fadeTime);
}
/* 802AD9F4-802ADB14 2A8334 0120+00 3/3 5/5 1/1 .text seMoveVolumeAll__7Z2SeMgrFfUl */
void Z2SeMgr::seMoveVolumeAll(f32 volume, u32 moveTime) {
if (Z2GetStatusMgr()->getDemoStatus() == 13) {
volume = 0.0f;
@@ -758,13 +747,10 @@ void Z2SeMgr::seMoveVolumeAll(f32 volume, u32 moveTime) {
}
}
/* 802ADB14-802ADB50 2A8454 003C+00 0/0 1/1 0/0 .text messageSePlay__7Z2SeMgrFUsP3VecSc
*/
void Z2SeMgr::messageSePlay(u16 param_0, Vec* param_1, s8 param_2) {
Z2GetSpeechMgr2()->playOneShotVoice(0, param_0, param_1, param_2);
}
/* 802ADB50-802ADC54 2A8490 0104+00 0/0 1/1 0/0 .text talkInSe__7Z2SeMgrFv */
void Z2SeMgr::talkInSe() {
if (Z2GetSceneMgr()->isInGame()) {
if (Z2GetStatusMgr()->getDemoStatus() == 13) {
@@ -788,7 +774,6 @@ void Z2SeMgr::talkInSe() {
}
}
/* 802ADC54-802ADD58 2A8594 0104+00 0/0 2/2 0/0 .text talkOutSe__7Z2SeMgrFv */
void Z2SeMgr::talkOutSe() {
if (Z2GetSceneMgr()->isInGame()) {
if (Z2GetStatusMgr()->getDemoStatus() == 13) {
@@ -812,7 +797,6 @@ void Z2SeMgr::talkOutSe() {
}
}
/* 802ADD58-802ADE5C 2A8698 0104+00 0/0 1/1 0/0 .text menuInSe__7Z2SeMgrFv */
void Z2SeMgr::menuInSe() {
if (Z2GetSceneMgr()->isInGame()) {
if (Z2GetStatusMgr()->getDemoStatus() == 13) {
@@ -836,7 +820,6 @@ void Z2SeMgr::menuInSe() {
}
}
/* 802ADE5C-802ADFF4 2A879C 0198+00 1/1 0/0 0/0 .text setLevObjSE__7Z2SeMgrFUlP3VecSc */
void Z2SeMgr::setLevObjSE(u32 soundID, Vec* posPtr, s8 reverb) {
u8 i = 0;
for (; i < mLevelObjectSeCount; i++) {
@@ -880,7 +863,6 @@ void Z2SeMgr::setLevObjSE(u32 soundID, Vec* posPtr, s8 reverb) {
}
}
/* 802ADFF4-802AE184 2A8934 0190+00 1/1 0/0 0/0 .text setMultiTriggerSE__7Z2SeMgrFUlP3VecSc */
void Z2SeMgr::setMultiTriggerSE(u32 soundID, Vec* posPtr, s8 reverb) {
u8 i = 0;
for (; i < mMultiTriggerSeCount; i++) {
@@ -926,7 +908,6 @@ void Z2SeMgr::setMultiTriggerSE(u32 soundID, Vec* posPtr, s8 reverb) {
}
}
/* 802AE184-802AE524 2A8AC4 03A0+00 0/0 1/1 0/0 .text processSeFramework__7Z2SeMgrFv */
void Z2SeMgr::processSeFramework() {
if (Z2GetSceneMgr()->isSceneExist() && mCrowdSize != 0) {
seStartLevel(Z2SE_ENV_PEOPLE_CROWD, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
@@ -1019,7 +1000,6 @@ void Z2SeMgr::processSeFramework() {
}
/* 802AE524-802AE5B0 2A8E64 008C+00 1/1 0/0 0/0 .text isLevelSe__7Z2SeMgrF10JAISoundID */
bool Z2SeMgr::isLevelSe(JAISoundID soundID) {
switch (soundID) {
case JA_SE_LK_MOVE_ROCK:
@@ -1036,7 +1016,6 @@ bool Z2SeMgr::isLevelSe(JAISoundID soundID) {
}
}
/* 802AE5B0-802AEB04 2A8EF0 0554+00 2/2 3/3 0/0 .text isSoundCulling__7Z2SeMgrF10JAISoundID */
bool Z2SeMgr::isSoundCulling(JAISoundID soundID) {
if (Z2GetSeqMgr()->isItemGetDemo()) {
switch (soundID) {
@@ -1192,7 +1171,6 @@ Z2MultiSeMgr::Z2MultiSeMgr() {
Z2MultiSeMgr::~Z2MultiSeMgr() {}
/* 802AEB70-802AECBC 2A94B0 014C+00 2/2 6/6 0/0 .text registMultiSePos__12Z2MultiSeMgrFP3Vec */
s8 Z2MultiSeMgr::registMultiSePos(Vec* posPtr) {
if (posPtr == NULL) {
return 0;
@@ -1246,7 +1224,6 @@ void Z2MultiSeMgr::resetMultiSePos() {
maxVolume_ = 0.0f;
}
/* 802AECE0-802AEDC0 2A9620 00E0+00 1/1 8/8 0/0 .text getPanPower__12Z2MultiSeMgrFv */
f32 Z2MultiSeMgr::getPanPower() {
f32 pow_r = getMaxPowR();
f32 pow_l = getMaxPowL();
@@ -1259,7 +1236,6 @@ f32 Z2MultiSeMgr::getPanPower() {
}
}
/* 802AEDC0-802AEEA0 2A9700 00E0+00 1/1 8/8 0/0 .text getDolbyPower__12Z2MultiSeMgrFv */
f32 Z2MultiSeMgr::getDolbyPower() {
f32 pow_b = getMaxPowB();
f32 pow_f = getMaxPowF();
src/Z2AudioLib/Z2SeqMgr.cpp
-54
View File
@@ -93,7 +93,6 @@ static const char* sSpotName[] = {
"D_SB10",
};
/* 802AEEA0-802AF010 2A97E0 0170+00 0/0 1/1 0/0 .text __ct__8Z2SeqMgrFv */
Z2SeqMgr::Z2SeqMgr() : JASGlobalInstance<Z2SeqMgr>(true) {
mMainBgmMaster.forceIn();
mSubBgmMaster.forceIn();
@@ -130,7 +129,6 @@ Z2SeqMgr::Z2SeqMgr() : JASGlobalInstance<Z2SeqMgr>(true) {
mFlags.mTimeProcVolMod = false;
}
/* 802AF010-802AF408 2A9950 03F8+00 3/3 5/5 38/38 .text bgmStart__8Z2SeqMgrFUlUll */
void Z2SeqMgr::bgmStart(u32 bgmID, u32 fadeTime, s32 param_2) {
switch (bgmID) {
case -1:
@@ -229,7 +227,6 @@ void Z2SeqMgr::bgmStart(u32 bgmID, u32 fadeTime, s32 param_2) {
#endif
}
/* 802AF408-802AF49C 2A9D48 0094+00 3/3 5/5 30/30 .text bgmStop__8Z2SeqMgrFUll */
void Z2SeqMgr::bgmStop(u32 fadeTime, s32 param_1) {
if (mMainBgmHandle) {
mMainBgmHandle->stop(fadeTime);
@@ -247,7 +244,6 @@ void Z2SeqMgr::bgmStop(u32 fadeTime, s32 param_1) {
}
}
/* 802AF49C-802AF884 2A9DDC 03E8+00 3/2 6/6 65/65 .text subBgmStart__8Z2SeqMgrFUl */
void Z2SeqMgr::subBgmStart(u32 bgmID) {
#if DEBUG
const char** spotName = sSpotName;
@@ -453,7 +449,6 @@ void Z2SeqMgr::subBgmStart(u32 bgmID) {
#endif
}
/* 802AF884-802AF9D0 2AA1C4 014C+00 4/3 4/4 42/42 .text subBgmStop__8Z2SeqMgrFv */
void Z2SeqMgr::subBgmStop() {
switch (getSubBgmID()) {
case Z2BGM_ITEM_GET:
@@ -548,7 +543,6 @@ void Z2SeqMgr::subBgmStop() {
#endif
}
/* 802AF9D0-802AFB94 2AA310 01C4+00 2/2 0/0 0/0 .text subBgmStopInner__8Z2SeqMgrFv */
void Z2SeqMgr::subBgmStopInner() {
if (field_0xb8 == -1) {
return;
@@ -589,7 +583,6 @@ void Z2SeqMgr::subBgmStopInner() {
field_0xb8 = -1;
}
/* 802AFB94-802AFDEC 2AA4D4 0258+00 1/1 3/3 46/46 .text bgmStreamPrepare__8Z2SeqMgrFUl */
void Z2SeqMgr::bgmStreamPrepare(u32 bgmID) {
if (mStreamBgmHandle) {
bgmStreamStop(0);
@@ -635,7 +628,6 @@ void Z2SeqMgr::bgmStreamPrepare(u32 bgmID) {
}
/* 802AFDEC-802AFE18 2AA72C 002C+00 0/0 1/1 0/0 .text bgmStreamCheckReady__8Z2SeqMgrFv */
bool Z2SeqMgr::bgmStreamCheckReady() {
if (mStreamBgmHandle) {
return mStreamBgmHandle->isPrepared();
@@ -644,7 +636,6 @@ bool Z2SeqMgr::bgmStreamCheckReady() {
}
}
/* 802AFE18-802AFEDC 2AA758 00C4+00 1/1 4/4 46/46 .text bgmStreamPlay__8Z2SeqMgrFv */
void Z2SeqMgr::bgmStreamPlay() {
if (mStreamBgmHandle) {
mStreamBgmHandle->unlockIfLocked();
@@ -666,7 +657,6 @@ void Z2SeqMgr::bgmStreamPlay() {
#endif
}
/* 802AFEDC-802AFF8C 2AA81C 00B0+00 2/2 1/1 27/27 .text bgmStreamStop__8Z2SeqMgrFUl */
void Z2SeqMgr::bgmStreamStop(u32 fadeTime) {
if (getStreamBgmID() == 0x200003f || getStreamBgmID() == 0x200005c) {
Z2GetStatusMgr()->setDemoName("force_end");
@@ -679,7 +669,6 @@ void Z2SeqMgr::bgmStreamStop(u32 fadeTime) {
mStreamBgmHandle.releaseSound();
}
/* 802AFF8C-802B1DF4 2AA8CC 1E68+00 5/4 8/7 26/26 .text changeBgmStatus__8Z2SeqMgrFl */
void Z2SeqMgr::changeBgmStatus(s32 status) {
if (!mMainBgmHandle) {
return;
@@ -1130,8 +1119,6 @@ void Z2SeqMgr::changeBgmStatus(s32 status) {
mBgmStatus = status & 0xff;
}
/* 802B1DF4-802B299C 2AC734 0BA8+00 2/2 3/3 31/31 .text changeSubBgmStatus__8Z2SeqMgrFl
*/
void Z2SeqMgr::changeSubBgmStatus(s32 status) {
if (!mSubBgmHandle) {
return;
@@ -1309,7 +1296,6 @@ void Z2SeqMgr::changeSubBgmStatus(s32 status) {
mSubBgmStatus = status & 0xff;
}
/* 802B299C-802B2A88 2AD2DC 00EC+00 0/0 1/1 0/0 .text onVariantBgmJumpEnd__8Z2SeqMgrFb */
void Z2SeqMgr::onVariantBgmJumpEnd(bool param_0) {
if (param_0) {
u32 moveTime = 0;
@@ -1328,7 +1314,6 @@ void Z2SeqMgr::onVariantBgmJumpEnd(bool param_0) {
Z2GetSoundMgr()->getSeqMgr()->mixOut();
}
/* 802B2A88-802B2CA4 2AD3C8 021C+00 1/1 0/0 9/9 .text changeFishingBgm__8Z2SeqMgrFl */
void Z2SeqMgr::changeFishingBgm(s32 param_0) {
switch (param_0) {
case 0:
@@ -1356,7 +1341,6 @@ void Z2SeqMgr::changeFishingBgm(s32 param_0) {
}
}
/* 802B2CA4-802B2D64 2AD5E4 00C0+00 0/0 1/1 0/0 .text talkInBgm__8Z2SeqMgrFv */
void Z2SeqMgr::talkInBgm() {
if (getStreamBgmID() == 0x2000038 || getStreamBgmID() == 0x200007c || getMainBgmID() == Z2BGM_WCS_D01) {
return;
@@ -1365,22 +1349,18 @@ void Z2SeqMgr::talkInBgm() {
mBgmPause.move(Z2Param::VOL_BGM_TALKING, 2);
}
/* 802B2D64-802B2DAC 2AD6A4 0048+00 0/0 1/1 0/0 .text talkOutBgm__8Z2SeqMgrFv */
void Z2SeqMgr::talkOutBgm() {
mBgmPause.move(Z2Param::VOL_BGM_DEFAULT, 2);
}
/* 802B2DAC-802B2DF4 2AD6EC 0048+00 0/0 1/1 0/0 .text menuInBgm__8Z2SeqMgrFv */
void Z2SeqMgr::menuInBgm() {
mBgmPause.move(Z2Param::VOL_BGM_PAUSING, 2);
}
/* 802B2DF4-802B2E3C 2AD734 0048+00 0/0 1/1 0/0 .text menuOutBgm__8Z2SeqMgrFv */
void Z2SeqMgr::menuOutBgm() {
mBgmPause.move(Z2Param::VOL_BGM_DEFAULT, 2);
}
/* 802B2E3C-802B327C 2AD77C 0440+00 1/1 0/0 0/0 .text fanfareFramework__8Z2SeqMgrFv */
void Z2SeqMgr::fanfareFramework() {
switch (mFanfareID) {
case Z2BGM_OPEN_BOX:
@@ -1454,7 +1434,6 @@ void Z2SeqMgr::fanfareFramework() {
}
}
/* 802B327C-802B3318 2ADBBC 009C+00 2/0 1/1 0/0 .text stopWolfHowlSong__8Z2SeqMgrFv */
void Z2SeqMgr::stopWolfHowlSong() {
switch (mFanfareID) {
case Z2BGM_HOWL_TOBIKUSA:
@@ -1499,7 +1478,6 @@ void Z2SeqMgr::stopWolfHowlSong() {
}
}
/* 802B3318-802B3398 2ADC58 0080+00 0/0 1/1 0/0 .text setHeightVolMod__8Z2SeqMgrFbUl */
void Z2SeqMgr::setHeightVolMod(bool isVolMod, u32 fadeTime) {
mFlags.mHeightVolMod = isVolMod;
if (!isVolMod) {
@@ -1507,21 +1485,16 @@ void Z2SeqMgr::setHeightVolMod(bool isVolMod, u32 fadeTime) {
}
}
/* 802B3398-802B33A8 2ADCD8 0010+00 0/0 1/1 0/0 .text setTimeProcVolMod__8Z2SeqMgrFbUl */
void Z2SeqMgr::setTimeProcVolMod(bool isVolMod, u32 fadeTime) {
mFlags.mTimeProcVolMod = isVolMod;
}
/* 80450870-80450874 0002F0 0004+00 1/1 0/0 0/0 .sdata sDeathMtBottom */
static f32 sDeathMtBottom = -1000.0f;
/* 80450874-80450878 0002F4 0004+00 1/1 0/0 0/0 .sdata sDeathMtTop */
static f32 sDeathMtTop = 3650.0f;
/* 80450878-80450880 0002F8 0004+04 1/1 0/0 0/0 .sdata sUnderWaterDepthMax */
static f32 sUnderWaterDepthMax = 3500.0f;
/* 802B33A8-802B3EAC 2ADCE8 0B04+00 0/0 1/1 0/0 .text processBgmFramework__8Z2SeqMgrFv */
void Z2SeqMgr::processBgmFramework() {
fanfareFramework();
battleBgmFramework();
@@ -1673,7 +1646,6 @@ void Z2SeqMgr::processBgmFramework() {
setWindStoneVol(1.0f, 30);
}
/* 802B3EAC-802B3F40 2AE7EC 0094+00 0/0 2/2 0/0 .text checkBgmIDPlaying__8Z2SeqMgrFUl */
bool Z2SeqMgr::checkBgmIDPlaying(u32 bgmID) {
if (getMainBgmID() == bgmID) {
return true;
@@ -1690,8 +1662,6 @@ bool Z2SeqMgr::checkBgmIDPlaying(u32 bgmID) {
return false;
}
/* 802B3F40-802B3FEC 2AE880 00AC+00 1/1 0/0 0/0 .text
* getChildTrackVolume__8Z2SeqMgrFP14JAISoundHandlei */
f32 Z2SeqMgr::getChildTrackVolume(JAISoundHandle* handle, int trackId) {
f32 volume = 0.0f;
if (*handle) {
@@ -1707,8 +1677,6 @@ f32 Z2SeqMgr::getChildTrackVolume(JAISoundHandle* handle, int trackId) {
return volume;
}
/* 802B3FEC-802B4128 2AE92C 013C+00 9/9 2/2 0/0 .text
* setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff */
void Z2SeqMgr::setChildTrackVolume(JAISoundHandle* handle, int trackId, f32 volume,
u32 moveTime, f32 pan, f32 dolby) {
if (!*handle) {
@@ -1745,15 +1713,12 @@ void Z2SeqMgr::setChildTrackVolume(JAISoundHandle* handle, int trackId, f32 volu
}
}
/* 802B4128-802B4164 2AEA68 003C+00 1/1 1/1 0/0 .text resetBattleBgmParams__8Z2SeqMgrFv
*/
void Z2SeqMgr::resetBattleBgmParams() {
if (Z2GetSoundObjMgr() != NULL) {
Z2GetSoundObjMgr()->setForceBattleArea(false, 700, 1100, 1500);
}
}
/* 802B4164-802B421C 2AEAA4 00B8+00 4/4 3/3 10/10 .text setBattleBgmOff__8Z2SeqMgrFb */
void Z2SeqMgr::setBattleBgmOff(bool isBgmOff) {
if (mFlags.mBattleBgmOff != isBgmOff && isBgmOff &&
(getSubBgmID() == Z2BGM_BATTLE_NORMAL || getSubBgmID() == Z2BGM_BATTLE_TWILIGHT))
@@ -1764,7 +1729,6 @@ void Z2SeqMgr::setBattleBgmOff(bool isBgmOff) {
mFlags.mBattleBgmOff = isBgmOff;
}
/* 802B421C-802B43D0 2AEB5C 01B4+00 0/0 1/1 0/0 .text setBattleSearched__8Z2SeqMgrFb */
void Z2SeqMgr::setBattleSearched(bool isBattleSearched) {
if (!mFlags.mBattleBgmOff && Z2GetSceneMgr()->isSceneExist()
&& mFlags.mBattleSearched != isBattleSearched && mBattleSeqState != 3)
@@ -1786,12 +1750,10 @@ void Z2SeqMgr::setBattleSearched(bool isBattleSearched) {
}
}
/* 802B43D0-802B43E0 2AED10 0010+00 3/3 0/0 0/0 .text setBattleDistIgnore__8Z2SeqMgrFb */
void Z2SeqMgr::setBattleDistIgnore(bool isBattleDistIgnore) {
mFlags.mBattleDistIgnore = isBattleDistIgnore;
}
/* 802B43E0-802B4498 2AED20 00B8+00 0/0 2/2 0/0 .text setBattleGhostMute__8Z2SeqMgrFb */
void Z2SeqMgr::setBattleGhostMute(bool isBattleGhostMute) {
if (getSubBgmID() == Z2BGM_BATTLE_NORMAL) {
if (isBattleGhostMute) {
@@ -1802,7 +1764,6 @@ void Z2SeqMgr::setBattleGhostMute(bool isBattleGhostMute) {
}
}
/* 802B4498-802B4844 2AEDD8 03AC+00 0/0 1/1 0/0 .text setBattleDistState__8Z2SeqMgrFUc */
void Z2SeqMgr::setBattleDistState(u8 state) {
if (!mFlags.mBattleBgmOff && Z2GetSceneMgr()->isSceneExist()) {
if (!mFlags.mBattleDistIgnore) {
@@ -1873,7 +1834,6 @@ void Z2SeqMgr::setBattleDistState(u8 state) {
}
}
/* 802B4844-802B4AFC 2AF184 02B8+00 1/1 3/3 1/1 .text setBattleSeqState__8Z2SeqMgrFUc */
void Z2SeqMgr::setBattleSeqState(u8 state) {
if (!mFlags.mBattleBgmOff && Z2GetSceneMgr()->isSceneExist() && mBattleSeqState != state) {
if (state == 0) {
@@ -1913,7 +1873,6 @@ void Z2SeqMgr::setBattleSeqState(u8 state) {
}
}
/* 802B4AFC-802B4BD0 2AF43C 00D4+00 0/0 4/4 0/0 .text setBattleLastHit__8Z2SeqMgrFUc */
void Z2SeqMgr::setBattleLastHit(u8 lastHit) {
if (getSubBgmID() == Z2BGM_BATTLE_NORMAL) {
setBattleDistIgnore(true);
@@ -1923,7 +1882,6 @@ void Z2SeqMgr::setBattleLastHit(u8 lastHit) {
}
}
/* 802B4BD0-802B4EB0 2AF510 02E0+00 1/1 0/0 0/0 .text battleBgmFramework__8Z2SeqMgrFv */
void Z2SeqMgr::battleBgmFramework() {
if (getSubBgmID() == Z2BGM_BATTLE_NORMAL || getSubBgmID() == Z2BGM_BATTLE_TWILIGHT) {
if (mBattleSeqCount != 0) {
@@ -1971,7 +1929,6 @@ void Z2SeqMgr::battleBgmFramework() {
}
}
/* 802B4EB0-802B5204 2AF7F0 0354+00 1/1 0/0 0/0 .text startBattleBgm__8Z2SeqMgrFb */
void Z2SeqMgr::startBattleBgm(bool isFadeIn) {
if (!mFlags.mBattleBgmOff && Z2GetSceneMgr()->isSceneExist()
&& mBattleSeqState == 0 && (mFlags.mBattleDistIgnore || mBattleDistState <= 1))
@@ -2031,7 +1988,6 @@ void Z2SeqMgr::startBattleBgm(bool isFadeIn) {
}
}
/* 802B5204-802B545C 2AFB44 0258+00 3/3 1/1 0/0 .text stopBattleBgm__8Z2SeqMgrFUcUc */
void Z2SeqMgr::stopBattleBgm(u8 subFadeoutTime, u8 mainFadeinTime) {
if (mBattleSeqCount == 0) {
s16 ivar6 = 0;
@@ -2072,7 +2028,6 @@ void Z2SeqMgr::stopBattleBgm(u8 subFadeoutTime, u8 mainFadeinTime) {
}
}
/* 802B545C-802B556C 2AFD9C 0110+00 1/1 0/0 0/0 .text fieldBgmStart__8Z2SeqMgrFv */
void Z2SeqMgr::fieldBgmStart() {
if (Z2GetSceneMgr()->isSceneExist() && mFlags.mFieldBgmPlay) {
if (Z2GetStatusMgr()->checkDayTime()) {
@@ -2096,7 +2051,6 @@ void Z2SeqMgr::fieldBgmStart() {
}
}
/* 802B556C-802B5750 2AFEAC 01E4+00 3/3 0/0 0/0 .text fieldRidingMute__8Z2SeqMgrFv */
void Z2SeqMgr::fieldRidingMute() {
if (Z2GetSceneMgr()->isSceneExist() && mMainBgmHandle) {
f32 volume1, volume2;
@@ -2122,13 +2076,11 @@ void Z2SeqMgr::fieldRidingMute() {
}
}
/* 802B5750-802B579C 2B0090 004C+00 0/0 1/1 0/0 .text onFieldBgmJumpStart__8Z2SeqMgrFv */
void Z2SeqMgr::onFieldBgmJumpStart() {
field_0xc8 = getChildTrackVolume(&mMainBgmHandle, 5);
field_0xcc = getChildTrackVolume(&mMainBgmHandle, 12);
}
/* 802B579C-802B594C 2B00DC 01B0+00 0/0 1/1 0/0 .text onFieldBgmJumpEnd__8Z2SeqMgrFv */
void Z2SeqMgr::onFieldBgmJumpEnd() {
setChildTrackVolume(&mMainBgmHandle, 5, field_0xc8, 0, -1.0f, -1.0f);
setChildTrackVolume(&mMainBgmHandle, 6, field_0xc8, 0, -1.0f, -1.0f);
@@ -2150,7 +2102,6 @@ void Z2SeqMgr::onFieldBgmJumpEnd() {
}
}
/* 802B594C-802B5E80 2B028C 0534+00 2/1 0/0 0/0 .text fieldBgmFramework__8Z2SeqMgrFv */
void Z2SeqMgr::fieldBgmFramework() {
if (Z2GetSceneMgr()->isSceneExist() && !Z2GetSceneMgr()->isInDarkness()
&& (Z2GetSceneMgr()->getCurrentSceneNum() == Z2SCENE_HYRULE_FIELD || Z2GetSceneMgr()->getCurrentSceneNum() == Z2SCENE_CASTLE_TOWN_GATES)
@@ -2319,21 +2270,16 @@ void Z2SeqMgr::fieldBgmFramework() {
}
}
/* 802B5E80-802B5E84 2B07C0 0004+00 1/1 0/0 0/0 .text mbossBgmMuteProcess__8Z2SeqMgrFv */
void Z2SeqMgr::mbossBgmMuteProcess() {}
/* 802B5E84-802B5E88 2B07C4 0004+00 0/0 2/2 0/0 .text bgmSetSwordUsing__8Z2SeqMgrFl */
void Z2SeqMgr::bgmSetSwordUsing(s32 param_0) {}
/* 802B5E88-802B5E8C 2B07C8 0004+00 0/0 1/1 0/0 .text bgmNowBattle__8Z2SeqMgrFf */
void Z2SeqMgr::bgmNowBattle(f32 param_0) {}
/* 802B5E8C-802B5ED4 2B07CC 0048+00 0/0 1/1 0/0 .text taktModeMute__8Z2SeqMgrFv */
void Z2SeqMgr::taktModeMute() {
mBgmPause.move(0.3f, 10);
}
/* 802B5ED4-802B5F1C 2B0814 0048+00 0/0 1/1 0/0 .text taktModeMuteOff__8Z2SeqMgrFv */
void Z2SeqMgr::taktModeMuteOff() {
mBgmPause.fadeIn(10);
}
src/Z2AudioLib/Z2SoundHandles.cpp
-7
View File
@@ -13,7 +13,6 @@ void Z2SoundHandles::initHandlesPool(u8 handleNum) {
handleNum_ = handleNum;
}
/* 802AB120-802AB200 2A5A60 00E0+00 1/1 1/1 0/0 .text deleteHandlesPool__14Z2SoundHandlesFv */
void Z2SoundHandles::deleteHandlesPool() {
JSULink<Z2SoundHandlePool>* i;
while (i = getFirst(), i != NULL) {
@@ -55,8 +54,6 @@ Z2SoundHandlePool* Z2SoundHandles::getHandleUserData(u32 userData) {
return NULL;
}
/* 802AB2D8-802AB3D0 2A5C18 00F8+00 0/0 3/3 0/0 .text getFreeHandle__14Z2SoundHandlesFv
*/
Z2SoundHandlePool* Z2SoundHandles::getFreeHandle() {
JSULink<Z2SoundHandlePool>* i;
for (i = getFirst(); i != NULL; i = i->getNext()) {
@@ -80,8 +77,6 @@ Z2SoundHandlePool* Z2SoundHandles::getFreeHandle() {
return NULL;
}
/* 802AB3D0-802AB4A0 2A5D10 00D0+00 0/0 2/2 0/0 .text
* getLowPrioSound__14Z2SoundHandlesF10JAISoundID */
Z2SoundHandlePool* Z2SoundHandles::getLowPrioSound(JAISoundID soundID) {
JAISoundInfo* soundInfo = JASGlobalInstance<JAISoundInfo>::getInstance();
u32 low_prio = 0xFFFF;
@@ -135,8 +130,6 @@ bool Z2SoundHandles::isActive() const {
return false;
}
/* 802AB538-802AB64C 2A5E78 0114+00 0/0 1/1 0/0 .text
* setPos__14Z2SoundHandlesFRCQ29JGeometry8TVec3<f> */
void Z2SoundHandles::setPos(const JGeometry::TVec3<f32>& pos) {
JSULink<Z2SoundHandlePool>* i;
for (i = getFirst(); i != NULL; i = i->getNext()) {
src/Z2AudioLib/Z2SoundInfo.cpp
-22
View File
@@ -16,8 +16,6 @@ struct JAUStdSoundTableType {
};
};
/* 802BB00C-802BB090 2B594C 0084+00 2/1 0/0 0/0 .text
* getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID */
u16 Z2SoundInfo::getBgmSeqResourceID(JAISoundID soundID) const {
JUT_ASSERT(20, isValid());
JAUSoundTableItem* data = JASGlobalInstance<JAUSoundTable>::getInstance()->getData(soundID);
@@ -33,7 +31,6 @@ u16 Z2SoundInfo::getBgmSeqResourceID(JAISoundID soundID) const {
return 0xffff;
}
/* 802BB090-802BB0D8 2B59D0 0048+00 1/0 0/0 0/0 .text getSoundType__11Z2SoundInfoCF10JAISoundID */
int Z2SoundInfo::getSoundType(JAISoundID soundID) const {
switch (soundID.id_.info.type.parts.sectionID) {
case 0:
@@ -47,12 +44,10 @@ int Z2SoundInfo::getSoundType(JAISoundID soundID) const {
return -1;
}
/* 802BB0D8-802BB0E0 2B5A18 0008+00 1/0 0/0 0/0 .text getCategory__11Z2SoundInfoCF10JAISoundID */
int Z2SoundInfo::getCategory(JAISoundID soundID) const {
return soundID.id_.info.type.parts.groupID;
}
/* 802BB0E0-802BB158 2B5A20 0078+00 1/0 0/0 0/0 .text getPriority__11Z2SoundInfoCF10JAISoundID */
u32 Z2SoundInfo::getPriority(JAISoundID soundID) const {
JUT_ASSERT(63, isValid());
JAUSoundTableItem* data = JASGlobalInstance<JAUSoundTable>::getInstance()->getData(soundID);
@@ -65,8 +60,6 @@ u32 Z2SoundInfo::getPriority(JAISoundID soundID) const {
return 0;
}
/* 802BB158-802BB448 2B5A98 02F0+00 0/0 1/1 0/0 .text getAudibleSwFull__11Z2SoundInfoF10JAISoundID
*/
JAUAudibleParam Z2SoundInfo::getAudibleSwFull(JAISoundID soundID) {
JAUAudibleParam audibleParam;
JUT_ASSERT(82, isValid());
@@ -139,7 +132,6 @@ JAUAudibleParam Z2SoundInfo::getAudibleSwFull(JAISoundID soundID) {
return audibleParam;
}
/* 802BB448-802BB6DC 2B5D88 0294+00 2/1 0/0 0/0 .text getAudibleSw__11Z2SoundInfoCF10JAISoundID */
u16 Z2SoundInfo::getAudibleSw(JAISoundID soundID) const {
JAUAudibleParam audibleParam;
JUT_ASSERT(184, isValid());
@@ -205,8 +197,6 @@ u16 Z2SoundInfo::getAudibleSw(JAISoundID soundID) const {
return audibleParam.field_0x0.half.f0;
}
/* 802BB6DC-802BB8B4 2B601C 01D8+00 1/0 0/0 0/0 .text
* getSeInfo__11Z2SoundInfoCF10JAISoundIDP5JAISe */
void Z2SoundInfo::getSeInfo(JAISoundID soundID, JAISe* sePtr) const {
getSoundInfo_(soundID, sePtr);
JUT_ASSERT(292, isValid());
@@ -236,17 +226,12 @@ void Z2SoundInfo::getSeInfo(JAISoundID soundID, JAISe* sePtr) const {
}
}
/* 802BB8B4-802BB8E0 2B61F4 002C+00 1/0 0/0 0/0 .text
* getSeqInfo__11Z2SoundInfoCF10JAISoundIDP6JAISeq */
void Z2SoundInfo::getSeqInfo(JAISoundID soundID, JAISeq* seqPtr) const {
getSoundInfo_(soundID, seqPtr);
}
/* 80455A90-80455A94 004090 0004+00 1/1 0/0 0/0 .sdata2 STRM_CH_SHIFT__20JAUStdSoundTableType */
const u32 JAUStdSoundTableType::STRM_CH_SHIFT = 2;
/* 802BB8E0-802BBA10 2B6220 0130+00 1/0 0/0 0/0 .text
* getStreamInfo__11Z2SoundInfoCF10JAISoundIDP9JAIStream */
void Z2SoundInfo::getStreamInfo(JAISoundID soundID, JAIStream* streamPtr) const {
int numChild;
JAUSoundTableItem* data;
@@ -286,8 +271,6 @@ void Z2SoundInfo::getStreamInfo(JAISoundID soundID, JAIStream* streamPtr) const
}
}
/* 802BBA10-802BBA88 2B6350 0078+00 1/1 0/0 0/0 .text
* getStreamFilePath__11Z2SoundInfoF10JAISoundID */
const char* Z2SoundInfo::getStreamFilePath(JAISoundID soundID) {
JUT_ASSERT(387, isValid());
JAUSoundTableItem* data;
@@ -305,14 +288,11 @@ const char* Z2SoundInfo::getStreamFilePath(JAISoundID soundID) {
}
}
/* 802BBA88-802BBAC8 2B63C8 0040+00 2/1 0/0 0/0 .text
* getStreamFileEntry__11Z2SoundInfoF10JAISoundID */
s32 Z2SoundInfo::getStreamFileEntry(JAISoundID soundID) {
const char* path = getStreamFilePath(soundID);
return !path ? -1 : DVDConvertPathToEntrynum(path);
}
/* 802BBAC8-802BBB48 2B6408 0080+00 3/3 4/4 0/0 .text getSwBit__11Z2SoundInfoCF10JAISoundID */
int Z2SoundInfo::getSwBit(JAISoundID soundID) const {
JUT_ASSERT(418, isValid());
JAUSoundTableItem* data = JASGlobalInstance<JAUSoundTable>::getInstance()->getData(soundID);
@@ -328,8 +308,6 @@ int Z2SoundInfo::getSwBit(JAISoundID soundID) const {
return 0xFFFFFFFF;
}
/* 802BBB48-802BBBE0 2B6488 0098+00 3/3 0/0 0/0 .text
* getSoundInfo___11Z2SoundInfoCF10JAISoundIDP8JAISound */
void Z2SoundInfo::getSoundInfo_(JAISoundID soundID, JAISound* soundPtr) const {
JUT_ASSERT(440, isValid());
JAUSoundTableItem* data = JASGlobalInstance<JAUSoundTable>::getInstance()->getData(soundID);
src/Z2AudioLib/Z2SoundMgr.cpp
-22
View File
@@ -11,7 +11,6 @@
#include "JSystem/JAudio2/JAUSectionHeap.h"
#include "d/d_com_inf_game.h"
/* 802A9BC8-802A9E80 2A4508 02B8+00 1/0 1/1 0/0 .text seqCallback__FP8JASTrackUs */
u16 seqCallback(JASTrack* track, u16 command) {
switch (command) {
case 0x1000:
@@ -101,7 +100,6 @@ u16 seqCallback(JASTrack* track, u16 command) {
return 0;
}
/* 802A9E80-802A9EE8 2A47C0 0068+00 0/0 1/1 0/0 .text __ct__10Z2SoundMgrFv */
Z2SoundMgr::Z2SoundMgr() :
JASGlobalInstance<Z2SoundMgr>(true),
seMgr_(true),
@@ -111,8 +109,6 @@ Z2SoundMgr::Z2SoundMgr() :
soundID_.setAnonymous();
}
/* 802A9EE8-802AA1B0 2A4828 02C8+00 1/0 0/0 0/0 .text
* startSound__10Z2SoundMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f> */
bool Z2SoundMgr::startSound(JAISoundID soundID, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr) {
int soundType = Z2GetSoundInfo()->getSoundType(soundID);
switch (soundType) {
@@ -185,7 +181,6 @@ bool Z2SoundMgr::startSound(JAISoundID soundID, JAISoundHandle* handle, const JG
return false;
}
/* 802AA1B0-802AA270 2A4AF0 00C0+00 2/2 0/0 0/0 .text calc__10Z2SoundMgrFv */
void Z2SoundMgr::calc() {
seMgr_.calc();
if (!soundID_.isAnonymous() && !isPlayingSoundID(soundID_)) {
@@ -198,8 +193,6 @@ void Z2SoundMgr::calc() {
streamMgr_.calc();
}
/* 802AA270-802AA33C 2A4BB0 00CC+00 1/1 2/2 0/0 .text setIIR__10Z2SoundMgrFP8JAISoundPCs
*/
void Z2SoundMgr::setIIR(JAISound* sound, const s16* iir) {
if (sound != NULL) {
JASTrack* track = sound->getTrack();
@@ -219,12 +212,10 @@ void Z2SoundMgr::setIIR(JAISound* sound, const s16* iir) {
}
}
/* 8039B9C0-8039B9D0 028020 0010+00 1/1 0/0 0/0 .rodata cResetFilterTable */
static s16 const cResetFilterTable[8] = {
0x7FFF, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
};
/* 802AA33C-802AA430 2A4C7C 00F4+00 1/1 0/0 0/0 .text setFilterOff__10Z2SoundMgrFP8JAISound */
void Z2SoundMgr::setFilterOff(JAISound* sound) {
if (sound != NULL) {
JASTrack* track = sound->getTrack();
@@ -246,7 +237,6 @@ void Z2SoundMgr::setFilterOff(JAISound* sound) {
}
}
/* 802AA430-802AA528 2A4D70 00F8+00 0/0 1/1 0/0 .text resetFilterAll__10Z2SoundMgrFv */
void Z2SoundMgr::resetFilterAll() {
int i = 1;
if (Z2Param::SYSTEM_SE_USE_DARK_SE_SETTING) {
@@ -274,7 +264,6 @@ void Z2SoundMgr::resetFilterAll() {
}
}
/* 802AA528-802AA67C 2A4E68 0154+00 2/2 0/0 0/0 .text mixOut__10Z2SoundMgrFv */
void Z2SoundMgr::mixOut() {
if (Z2Param::DARK_SE_FILTER_ON && Z2GetSceneMgr()->isInDarkness()) {
int i = 1;
@@ -308,14 +297,11 @@ void Z2SoundMgr::mixOut() {
streamMgr_.mixOut();
}
/* 802AA67C-802AA6B0 2A4FBC 0034+00 0/0 1/1 0/0 .text framework__10Z2SoundMgrFv */
void Z2SoundMgr::framework() {
calc();
mixOut();
}
/* 802AA6B0-802AA7DC 2A4FF0 012C+00 0/0 1/1 0/0 .text pauseAllGameSound__10Z2SoundMgrFb
*/
void Z2SoundMgr::pauseAllGameSound(bool paused) {
seMgr_.getCategory(0)->pause(paused);
seMgr_.getCategory(1)->pause(paused);
@@ -341,14 +327,12 @@ void Z2SoundMgr::pauseAllGameSound(bool paused) {
}
}
/* 802AA7DC-802AA84C 2A511C 0070+00 0/0 1/1 0/0 .text stopSoundID__10Z2SoundMgrF10JAISoundID */
void Z2SoundMgr::stopSoundID(JAISoundID soundID) {
seMgr_.stopSoundID(soundID);
seqMgr_.stopSoundID(soundID);
streamMgr_.stopSoundID(soundID);
}
/* 802AA84C-802AA8C8 2A518C 007C+00 0/0 1/1 0/0 .text stopSync__10Z2SoundMgrFv */
void Z2SoundMgr::stopSync() {
stop();
while (seMgr_.getNumActiveSe() > 0 || seqMgr_.getNumActiveSeqs() > 0) {
@@ -361,14 +345,12 @@ void Z2SoundMgr::stopSync() {
}
}
/* 802AA8C8-802AA908 2A5208 0040+00 1/1 0/0 0/0 .text stop__10Z2SoundMgrFv */
void Z2SoundMgr::stop() {
seMgr_.stop();
seqMgr_.stop();
streamMgr_.stop();
}
/* 802AA908-802AA9E8 2A5248 00E0+00 0/0 1/1 0/0 .text initParams__10Z2SoundMgrFv */
void Z2SoundMgr::initParams() {
JUT_ASSERT(613, ! seMgr_.isActive());
JUT_ASSERT(614, ! seqMgr_.isActive());
@@ -378,8 +360,6 @@ void Z2SoundMgr::initParams() {
streamMgr_.getParams()->init();
}
/* 802AA9E8-802AAAC4 2A5328 00DC+00 0/0 1/1 0/0 .text
* multiVolumeSoundID__10Z2SoundMgrF10JAISoundIDf */
void Z2SoundMgr::multiVolumeSoundID(JAISoundID soundID, f32 volume) {
if (!soundID.isAnonymous() && Z2GetSoundInfo()->getSoundType(soundID) == 0) {
int category = Z2GetSoundInfo()->getCategory(soundID);
@@ -391,8 +371,6 @@ void Z2SoundMgr::multiVolumeSoundID(JAISoundID soundID, f32 volume) {
}
}
/* 802AAAC4-802AAB94 2A5404 00D0+00 1/1 0/0 0/0 .text isPlayingSoundID__10Z2SoundMgrF10JAISoundID
*/
bool Z2SoundMgr::isPlayingSoundID(JAISoundID soundID) {
if (soundID.isAnonymous()) {
return false;
src/Z2AudioLib/Z2SoundObjMgr.cpp
-21
View File
@@ -5,7 +5,6 @@
#include "Z2AudioLib/Z2SceneMgr.h"
#include "Z2AudioLib/Z2LinkMgr.h"
/* 802BF920-802BF980 2BA260 0060+00 0/0 1/1 0/0 .text __ct__13Z2SoundObjMgrFv */
Z2SoundObjMgr::Z2SoundObjMgr() : JASGlobalInstance<Z2SoundObjMgr>(true) {
ghostEnemyState_ = 0;
twilightBattle_ = 0;
@@ -13,8 +12,6 @@ Z2SoundObjMgr::Z2SoundObjMgr() : JASGlobalInstance<Z2SoundObjMgr>(true) {
setForceBattleArea(false, 700, 1100, 1500);
}
/* 802BF980-802BF994 2BA2C0 0014+00 1/1 3/3 3/3 .text setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
*/
void Z2SoundObjMgr::setForceBattleArea(bool forceBattle, u16 param_1, u16 param_2, u16 param_3) {
forceBattle_ = forceBattle;
enemyArea_.field_0x2 = param_1;
@@ -22,22 +19,16 @@ void Z2SoundObjMgr::setForceBattleArea(bool forceBattle, u16 param_1, u16 param_
enemyArea_.field_0x6 = param_3;
}
/* 80455B80-80455B84 004180 0004+00 1/1 0/0 0/0 .sdata2 sAreaDefault */
static Z2EnemyArea const sAreaDefault = {true, 700, 1100, 1500};
/* 80455B88-80455B8C 004188 0004+00 1/1 0/0 0/0 .sdata2 sAreaFloating */
static Z2EnemyArea const sAreaFloating = {false, 700, 1100, 1500};
/* 80455B90-80455B94 004190 0004+00 1/1 0/0 0/0 .sdata2 sAreaWide */
static Z2EnemyArea const sAreaWide = {true, 700, 1500, 3300};
/* 80455B98-80455B9C 004198 0004+00 1/1 0/0 0/0 .sdata2 sAreaWideFloating */
static Z2EnemyArea const sAreaWideFloating = {false, 700, 1500, 3300};
/* 80455BA0-80455BA4 0041A0 0004+00 1/1 0/0 0/0 .sdata2 sAreaSmall */
static Z2EnemyArea const sAreaSmall = {true, 300, 700, 1000};
/* 80455BA8-80455BAC 0041A8 0004+00 1/1 0/0 0/0 .sdata2 sAreaSmallFloating */
static Z2EnemyArea const sAreaSmallFloating = {false, 500, 800, 1200};
struct Z2EnemyInfo {
@@ -45,7 +36,6 @@ struct Z2EnemyInfo {
Z2EnemyArea mEnemyArea;
};
/* 803CAD70-803CB170 027E90 0400+00 3/3 0/0 0/0 .data mEnemyInfo */
static Z2EnemyInfo mEnemyInfo[64] = {
{"Dummy", sAreaDefault},
{"E_s1", {true, 700, 1200, 2000}},
@@ -113,7 +103,6 @@ static Z2EnemyInfo mEnemyInfo[64] = {
{"B_tn", sAreaDefault},
};
/* 802BF994-802BFFEC 2BA2D4 0658+00 1/0 1/1 0/0 .text searchEnemy__13Z2SoundObjMgrFv */
void Z2SoundObjMgr::searchEnemy() {
twilightBattle_ = 0;
@@ -356,8 +345,6 @@ void Z2SoundObjMgr::setGhostEnemyState(u8 state) {
ghostEnemyState_ = state + (ghostEnemyState_ & 1);
}
/* 802C0074-802C0100 2BA9B4 008C+00 0/0 1/1 0/0 .text
* getEnemyID__13Z2SoundObjMgrFPCcP26JSULink<15Z2CreatureEnemy> */
u8 Z2SoundObjMgr::getEnemyID(const char* enemyName, JSULink<Z2CreatureEnemy>* enemyLink) {
if (enemyName != NULL) {
for (u8 i = 0; i < ARRAY_SIZEU(mEnemyInfo); i++) {
@@ -371,7 +358,6 @@ u8 Z2SoundObjMgr::getEnemyID(const char* enemyName, JSULink<Z2CreatureEnemy>* en
return Z2_ENEMY_NULL;
}
/* 802C0100-802C0120 2BAA40 0020+00 1/1 1/1 0/0 .text setBattleInit__13Z2SoundObjMgrFv */
void Z2SoundObjMgr::setBattleInit() {
field_0x14 = 0;
enemuNumNear_ = 0;
@@ -381,7 +367,6 @@ void Z2SoundObjMgr::setBattleInit() {
field_0x1a = false;
}
/* 802C0120-802C013C 2BAA60 001C+00 0/0 1/1 0/0 .text checkBattleFinish__13Z2SoundObjMgrFv */
bool Z2SoundObjMgr::checkBattleFinish() {
if (enemuNumVeryFar_ - field_0x18 > 0) {
return false;
@@ -390,8 +375,6 @@ bool Z2SoundObjMgr::checkBattleFinish() {
}
}
/* 802C013C-802C0190 2BAA7C 0054+00 0/0 1/1 0/0 .text deleteEnemyAll__13Z2SoundObjMgrFv
*/
void Z2SoundObjMgr::deleteEnemyAll() {
JSULink<Z2CreatureEnemy>* i;
@@ -406,8 +389,6 @@ void Z2SoundObjMgr::deleteEnemyAll() {
}
}
/* 802C0190-802C01E4 2BAAD0 0054+00 0/0 2/2 0/0 .text
* removeEnemy__13Z2SoundObjMgrFP26JSULink<15Z2CreatureEnemy> */
bool Z2SoundObjMgr::removeEnemy(JSULink<Z2CreatureEnemy>* enemyLink) {
if (enemyLink == NULL) {
return false;
@@ -422,8 +403,6 @@ bool Z2SoundObjMgr::removeEnemy(JSULink<Z2CreatureEnemy>* enemyLink) {
return result;
}
/* 802C01E4-802C01EC 2BAB24 0008+00 0/0 4/4 0/0 .text isTwilightBattle__13Z2SoundObjMgrFv
*/
u8 Z2SoundObjMgr::isTwilightBattle() {
return twilightBattle_;
}
src/Z2AudioLib/Z2SoundObject.cpp
-41
View File
@@ -39,8 +39,6 @@ void Z2SoundObjBase::init(Vec* posPtr, u8 handleNum) {
alive_ = true;
}
/* 802BDFF8-802BE038 2B8938 0040+00 1/1 8/8 61/61 .text deleteObject__14Z2SoundObjBaseFv
*/
void Z2SoundObjBase::deleteObject() {
#if VERSION == VERSION_SHIELD_DEBUG
Z2GetSoundObjMgr()->getAllList()->remove(this);
@@ -58,7 +56,6 @@ void Z2SoundObjBase::framework(u32 param_0, s8 reverb) {
}
}
/* 802BE070-802BE104 2B89B0 0094+00 5/0 3/0 0/0 .text dispose__14Z2SoundObjBaseFv */
void Z2SoundObjBase::dispose() {
JAISoundHandle* handle;
JSULink<Z2SoundHandlePool>* i;
@@ -76,8 +73,6 @@ void Z2SoundObjBase::dispose() {
alive_ = false;
}
/* 802BE104-802BE144 2B8A44 0040+00 5/0 3/0 0/0 .text
* stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool */
bool Z2SoundObjBase::stopOK(Z2SoundHandlePool& handlePool) {
if ((Z2GetSoundInfo()->getSwBit(handlePool->getID()) & 0x8000) != 0) {
return false;
@@ -86,8 +81,6 @@ bool Z2SoundObjBase::stopOK(Z2SoundHandlePool& handlePool) {
}
}
/* 802BE144-802BE2D4 2B8A84 0190+00 5/3 3/1 0/0 .text
* startSound__14Z2SoundObjBaseF10JAISoundIDUlSc */
Z2SoundHandlePool* Z2SoundObjBase::startSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
if (!alive_) {
return NULL;
@@ -132,8 +125,6 @@ Z2SoundHandlePool* Z2SoundObjBase::startSound(JAISoundID soundID, u32 mapinfo, s
return handle;
}
/* 802BE2D4-802BE4A4 2B8C14 01D0+00 4/2 3/0 0/0 .text
* startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc */
Z2SoundHandlePool* Z2SoundObjBase::startLevelSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
if (!alive_) {
return NULL;
@@ -195,8 +186,6 @@ Z2SoundHandlePool* Z2SoundObjBase::startLevelSound(JAISoundID soundID, u32 mapin
return handle;
}
/* 802BE4A4-802BE5A0 2B8DE4 00FC+00 0/0 5/5 21/21 .text
* startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase */
Z2SoundHandlePool* Z2SoundObjBase::startCollisionSE(u32 hitID, u32 mapinfo, Z2SoundObjBase* other) {
if (other != NULL) {
return other->startCollisionSE(hitID, mapinfo, NULL);
@@ -229,16 +218,13 @@ Z2SoundHandlePool* Z2SoundObjBase::startCollisionSE(u32 hitID, u32 mapinfo, Z2So
return handle;
}
/* 802BE5A0-802BE5FC 2B8EE0 005C+00 1/1 0/0 0/0 .text __ct__21Z2DopplerSoundObjBaseFv */
Z2DopplerSoundObjBase::Z2DopplerSoundObjBase() : Z2SoundObjBase() {
field_0x20 = Z2Calc::cNullVec;
field_0x2c = Z2Calc::cNullVec;
}
/* 802BE5FC-802BE65C 2B8F3C 0060+00 0/0 0/0 1/1 .text __dt__21Z2DopplerSoundObjBaseFv */
Z2DopplerSoundObjBase::~Z2DopplerSoundObjBase() {}
/* 802BE65C-802BE6B8 2B8F9C 005C+00 1/0 0/0 0/0 .text init__21Z2DopplerSoundObjBaseFP3VecUc */
void Z2DopplerSoundObjBase::init(Vec* posPtr, u8 handleNum) {
Z2SoundObjBase::init(posPtr, handleNum);
if (pos_ != NULL) {
@@ -247,7 +233,6 @@ void Z2DopplerSoundObjBase::init(Vec* posPtr, u8 handleNum) {
}
}
/* 802BE6B8-802BE714 2B8FF8 005C+00 2/0 0/0 0/0 .text framework__21Z2DopplerSoundObjBaseFUlSc */
void Z2DopplerSoundObjBase::framework(u32 param_0, s8 reverb) {
Z2SoundObjBase::framework(param_0, reverb);
if (pos_ != NULL) {
@@ -256,8 +241,6 @@ void Z2DopplerSoundObjBase::framework(u32 param_0, s8 reverb) {
}
}
/* 802BE714-802BE7AC 2B9054 0098+00 2/0 0/0 0/0 .text
* startSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc */
Z2SoundHandlePool* Z2DopplerSoundObjBase::startSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
JGeometry::TVec3<f32>* pos = pos_;
pos_ = NULL;
@@ -273,8 +256,6 @@ Z2SoundHandlePool* Z2DopplerSoundObjBase::startSound(JAISoundID soundID, u32 map
return handle;
}
/* 802BE7AC-802BE844 2B90EC 0098+00 2/0 0/0 0/0 .text
* startLevelSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc */
Z2SoundHandlePool* Z2DopplerSoundObjBase::startLevelSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
JGeometry::TVec3<f32>* pos = pos_;
pos_ = NULL;
@@ -290,15 +271,12 @@ Z2SoundHandlePool* Z2DopplerSoundObjBase::startLevelSound(JAISoundID soundID, u3
return handle;
}
/* 802BE844-802BE880 2B9184 003C+00 0/0 8/8 65/65 .text __ct__16Z2SoundObjSimpleFv */
Z2SoundObjSimple::Z2SoundObjSimple() : Z2SoundObjBase() {}
void Z2SoundObjSimple::init(Vec* posPtr, u8 handleNum) {
Z2SoundObjBase::init(posPtr, handleNum);
}
/* 802BE8A0-802BE9B0 2B91E0 0110+00 1/0 0/0 0/0 .text
* startSound__16Z2SoundObjSimpleF10JAISoundIDUlSc */
Z2SoundHandlePool* Z2SoundObjSimple::startSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
Z2SoundHandlePool* handle = Z2SoundObjBase::startSound(soundID, mapinfo, reverb);
@@ -312,8 +290,6 @@ Z2SoundHandlePool* Z2SoundObjSimple::startSound(JAISoundID soundID, u32 mapinfo,
return handle;
}
/* 802BE9B0-802BEB38 2B92F0 0188+00 1/0 0/0 0/0 .text
* startLevelSound__16Z2SoundObjSimpleF10JAISoundIDUlSc */
Z2SoundHandlePool* Z2SoundObjSimple::startLevelSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
Z2SoundHandlePool* handle = Z2SoundObjBase::startLevelSound(soundID, mapinfo, reverb);
@@ -343,27 +319,21 @@ Z2SoundHandlePool* Z2SoundObjSimple::startLevelSound(JAISoundID soundID, u32 map
return handle;
}
/* 802BEB38-802BEB74 2B9478 003C+00 0/0 0/0 2/2 .text __ct__15Z2SoundObjArrowFv */
Z2SoundObjArrow::Z2SoundObjArrow() : Z2DopplerSoundObjBase() {}
/* 802BEB74-802BEB94 2B94B4 0020+00 1/0 0/0 0/0 .text init__15Z2SoundObjArrowFP3VecUc */
void Z2SoundObjArrow::init(Vec* posPtr, u8 handleNum) {
Z2SoundObjBase::init(posPtr, handleNum);
}
/* 802BEB94-802BEBDC 2B94D4 0048+00 0/0 2/2 0/0 .text __ct__15Z2SoundObjAnimeFv */
Z2SoundObjAnime::Z2SoundObjAnime() : Z2SoundObjBase() {
animation_ = NULL;
reverse_ = false;
}
/* 802BEBDC-802BEBFC 2B951C 0020+00 1/0 1/0 0/0 .text init__15Z2SoundObjAnimeFP3VecUc */
void Z2SoundObjAnime::init(Vec* posPtr, u8 handleNum) {
Z2SoundObjBase::init(posPtr, handleNum);
}
/* 802BEBFC-802BED68 2B953C 016C+00 0/0 2/2 0/0 .text initAnime__15Z2SoundObjAnimeFPvbff
*/
void Z2SoundObjAnime::initAnime(void* animation, bool param_1, f32 startFrame, f32 param_3) {
ageSounds_();
animation_ = (JAUSoundAnimation*)animation;
@@ -389,7 +359,6 @@ void Z2SoundObjAnime::initAnime(void* animation, bool param_1, f32 startFrame, f
}
}
/* 802BED68-802BEED4 2B96A8 016C+00 1/1 0/0 0/0 .text ageSounds___15Z2SoundObjAnimeFv */
void Z2SoundObjAnime::ageSounds_() {
for (int i = 0; i < getNumHandles(); i++) {
if ((*getHandle(i))) {
@@ -415,8 +384,6 @@ void Z2SoundObjAnime::ageSounds_() {
}
}
/* 802BEED4-802BF304 2B9814 0430+00 0/0 2/2 0/0 .text updateAnime__15Z2SoundObjAnimeFff
*/
void Z2SoundObjAnime::updateAnime(f32 param_0, f32 param_1) {
for (int i = 0; i < getNumHandles(); i++) {
if ((*getHandle(i)) && (*getHandle(i))->isAnimated()) {
@@ -467,8 +434,6 @@ void Z2SoundObjAnime::updateAnime(f32 param_0, f32 param_1) {
curSoundFrame_ = param_0;
}
/* 802BF304-802BF660 2B9C44 035C+00 1/1 0/0 0/0 .text updateSoundLifeTime___15Z2SoundObjAnimeFff
*/
void Z2SoundObjAnime::updateSoundLifeTime_(f32 param_0, f32 param_1) {
if (animation_ == NULL) {
return;
@@ -511,8 +476,6 @@ void Z2SoundObjAnime::updateSoundLifeTime_(f32 param_0, f32 param_1) {
}
}
/* 802BF660-802BF890 2B9FA0 0230+00 1/1 0/0 0/0 .text
* startSoundInner__15Z2SoundObjAnimeFRCQ29JGeometry8TVec3<f>fP14Z2SoundStarterUlSc */
void Z2SoundObjAnime::startSoundInner(const JGeometry::TVec3<f32>& pos, f32 param_1,
Z2SoundStarter* soundStarter, u32 mapinfo, s8 reverb) {
JUT_ASSERT(746, curSoundIndex_ >= 0);
@@ -558,15 +521,11 @@ void Z2SoundObjAnime::startSoundInner(const JGeometry::TVec3<f32>& pos, f32 para
}
}
/* 802BF890-802BF898 2BA1D0 0008+00 1/1 0/0 0/0 .text
* getSoundID__15Z2SoundObjAnimeFPC22JAUSoundAnimationSoundRCQ29JGeometry8TVec3<f>f */
u32 Z2SoundObjAnime::getSoundID(const JAUSoundAnimationSound* animationSound,
const JGeometry::TVec3<f32>& param_1, f32 param_2) {
return animationSound->mSoundId;
}
/* 802BF898-802BF920 2BA1D8 0088+00 1/1 0/0 0/0 .text
* playsSound__15Z2SoundObjAnimeFPC22JAUSoundAnimationSoundRCQ29JGeometry8TVec3<f>f */
bool Z2SoundObjAnime::playsSound(const JAUSoundAnimationSound* animationSound,
const JGeometry::TVec3<f32>& param_1, f32 param_2) {
(void)param_1;
src/Z2AudioLib/Z2SoundStarter.cpp
-9
View File
@@ -2,18 +2,13 @@
#include "Z2AudioLib/Z2EnvSeMgr.h"
#include "Z2AudioLib/Z2AudioMgr.h"
/* 802AAB94-802AABF4 2A54D4 0060+00 0/0 4/4 0/0 .text __ct__14Z2SoundStarterFb */
Z2SoundStarter::Z2SoundStarter(bool setInstance) :
JAISoundStarter(setInstance), JASGlobalInstance<Z2SoundStarter>(setInstance) {}
/* 802AABF4-802AAC3C 2A5534 0048+00 1/0 5/0 0/0 .text
* startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f> */
bool Z2SoundStarter::startSound(JAISoundID soundID, JAISoundHandle* handlePtr, const JGeometry::TVec3<f32>* posPtr) {
return Z2SoundStarter::startSound(soundID, handlePtr, posPtr, 0, 0.0f, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
/* 802AAC3C-802AAEDC 2A557C 02A0+00 2/1 2/2 0/0 .text
* startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f>UlfffffUl */
bool Z2SoundStarter::startSound(JAISoundID soundID, JAISoundHandle* handlePtr,
const JGeometry::TVec3<f32>* posPtr, u32 mapinfo, f32 fxMix,
f32 pitch, f32 volume, f32 pan, f32 dolby, u32 moveSteps) {
@@ -73,8 +68,6 @@ bool Z2SoundStarter::startSound(JAISoundID soundID, JAISoundHandle* handlePtr,
return startSoundRes;
}
/* 802AAEDC-802AAF74 2A581C 0098+00 1/1 10/10 0/0 .text
* setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc */
void Z2SoundStarter::setPortData(JAISoundHandle* handlePtr, u32 portNum, u16 data, s8 childIndex) {
if (handlePtr != NULL && *handlePtr) {
JASTrack* track = handlePtr->getSound()->getTrack();
@@ -90,8 +83,6 @@ void Z2SoundStarter::setPortData(JAISoundHandle* handlePtr, u32 portNum, u16 dat
}
}
/* 802AAF74-802AAFF0 2A58B4 007C+00 0/0 1/1 0/0 .text
* getPortData__14Z2SoundStarterFP14JAISoundHandleUlSc */
u16 Z2SoundStarter::getPortData(JAISoundHandle* handlePtr, u32 portNum, s8 childIndex) {
if (handlePtr != NULL && *handlePtr) {
JASTrack* track = NULL;
src/Z2AudioLib/Z2SpeechMgr2.cpp
-50
View File
@@ -73,7 +73,6 @@ struct Z2MdnPrm {
static Prm const sPrm[17];
};
/* 8039C260-8039C2C4 0288C0 0064+00 1/0 0/0 0/0 .rodata sReply__8Z2MdnPrm */
Z2MdnPrm::Unit const Z2MdnPrm::sReply[50] = {
0x6A, 0x8A, 0x50, 0x5F, 0x53, 0x37, 0x37, 0x4F, 0x4F, 0x5E, 0xAA, 0x46, 0x52, 0x5A, 0x5A,
0x4F, 0x4F, 0x45, 0x45, 0x56, 0x64, 0x79, 0x79, 0x79, 0x87, 0x95, 0x95, 0x89, 0x89, 0x4C,
@@ -84,12 +83,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sReply[50] = {
0x71, 0x85, 0x85, 0xA2, 0xA2, 0x52, 0x52, 0x5C, 0x5C, 0x75,
};
/* 8039C2C4-8039C2D0 028924 000A+02 1/0 0/0 0/0 .rodata sReplyTail__8Z2MdnPrm */
u8 const Z2MdnPrm::sReplyTail[10] = {
0x5E, 0x7F, 0x68, 0x39, 0x56, 0x75, 0x47, 0x71, 0x7D, 0x33,
};
/* 8039C2D0-8039C334 028930 0064+00 1/0 0/0 0/0 .rodata sJoke__8Z2MdnPrm */
Z2MdnPrm::Unit const Z2MdnPrm::sJoke[50] = {
0x68, 0x57, 0x57, 0x55, 0x55, 0x51, 0x5B, 0x64, 0x6B, 0x7B, 0x7B, 0x5C, 0x77, 0x97, 0x8D,
0x97, 0x97, 0x8D, 0x66, 0x69, 0xA2, 0x5C, 0x87, 0x4F, 0x69, 0x5F, 0x5F, 0x83, 0x83, 0x82,
@@ -100,12 +97,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sJoke[50] = {
0x45, 0x45, 0x29, 0x4C, 0x4B, 0x64, 0x64, 0x60, 0x5C, 0xB1,
};
/* 8039C334-8039C340 028994 000A+02 1/0 0/0 0/0 .rodata sJokeTail__8Z2MdnPrm */
u8 const Z2MdnPrm::sJokeTail[10] = {
0x51, 0x97, 0x60, 0xB0, 0x6F, 0x5E, 0x5A, 0xA6, 0x4F, 0x4F,
};
/* 8039C340-8039C3A4 0289A0 0064+00 1/0 0/0 0/0 .rodata sSexy__8Z2MdnPrm */
Z2MdnPrm::Unit const Z2MdnPrm::sSexy[50] = {
0x5E, 0x60, 0x5F, 0x63, 0x63, 0x72, 0x72, 0x78, 0x4D, 0x7A, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E,
0x59, 0x59, 0x7A, 0x7A, 0xA5, 0x90, 0x8D, 0x86, 0x62, 0x72, 0x79, 0x79, 0x86, 0x7F, 0x8B,
@@ -116,12 +111,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sSexy[50] = {
0x79, 0x65, 0x65, 0x4A, 0x5C, 0x78, 0x78, 0x8B, 0x8D, 0x7C,
};
/* 8039C3A4-8039C3B0 028A04 000A+02 1/0 0/0 0/0 .rodata sSexyTail__8Z2MdnPrm */
u8 const Z2MdnPrm::sSexyTail[10] = {
0x52, 0x79, 0x82, 0xA5, 0x62, 0x86, 0x3F, 0x7D, 0x57, 0x7C,
};
/* 8039C3B0-8039C414 028A10 0064+00 1/0 0/0 0/0 .rodata sRidicule__8Z2MdnPrm */
Z2MdnPrm::Unit const Z2MdnPrm::sRidicule[50] = {
0xA7, 0x5A, 0x5A, 0x52, 0x52, 0x85, 0x85, 0x8C, 0x63, 0x73, 0x73, 0x90, 0x50, 0x46, 0x74,
0x74, 0xA3, 0xA7, 0x41, 0x51, 0x58, 0x34, 0x34, 0x2A, 0x5A, 0x81, 0x5D, 0x42, 0x4B, 0x70,
@@ -132,12 +125,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sRidicule[50] = {
0x2D, 0x2D, 0x2D, 0x8C, 0x8C, 0x8B, 0x8B, 0x93, 0x93, 0x6E,
};
/* 8039C414-8039C420 028A74 000A+02 1/0 0/0 0/0 .rodata sRidiculeTail__8Z2MdnPrm */
u8 const Z2MdnPrm::sRidiculeTail[10] = {
0x81, 0x67, 0x6D, 0x8C, 0x90, 0x85, 0xB1, 0x4D, 0x4F, 0x6E,
};
/* 8039C420-8039C48C 028A80 006C+00 1/0 0/0 0/0 .rodata sBoring__8Z2MdnPrm */
Z2MdnPrm::Unit const Z2MdnPrm::sBoring[54] = {
0x8E, 0x9C, 0x9C, 0x5A, 0x5A, 0x52, 0x52, 0x5B, 0x5C, 0x56, 0x5C, 0x52, 0x52, 0x2D, 0x2D, 0x5B,
0x59, 0x56, 0x56, 0x56, 0x56, 0x6B, 0x6B, 0x58, 0x4C, 0x8E, 0x8E, 0x59, 0x61, 0x54, 0xA0, 0x4D,
@@ -148,12 +139,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sBoring[54] = {
0x5B, 0x5E, 0x70, 0x56, 0x56, 0x4C, 0x4C, 0x59, 0x59, 0x5B, 0x5B, 0x71,
};
/* 80455EE0-80455EE8 0044E0 0006+02 1/0 0/0 0/0 .sdata2 sBoringTail__8Z2MdnPrm */
u8 const Z2MdnPrm::sBoringTail[6] = {
0x92, 0x58, 0x59, 0x5B, 0x70, 0x71,
};
/* 8039C48C-8039C4EC 028AEC 005E+02 1/0 0/0 0/0 .rodata sIrritated__8Z2MdnPrm */
Z2MdnPrm::Unit const Z2MdnPrm::sIrritated[47] = {
0x6C, 0x91, 0x67, 0x8B, 0x8B, 0xA2, 0xA2, 0xAB, 0x48, 0x64, 0x73, 0x61, 0x61, 0x64, 0x64, 0x6D,
0x60, 0x7E, 0x4A, 0x55, 0x6A, 0x63, 0x66, 0x78, 0x5C, 0x5A, 0x6E, 0x79, 0x75, 0x62, 0x62, 0x57,
@@ -163,12 +152,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sIrritated[47] = {
0xAD, 0x6E, 0x72, 0x82, 0x83, 0x87, 0x85, 0x85, 0x85, 0x8E, 0x60, 0x6D, 0x80, 0x80,
};
/* 8039C4EC-8039C4F8 028B4C 000A+02 1/0 0/0 0/0 .rodata sIrritatedTail__8Z2MdnPrm */
u8 const Z2MdnPrm::sIrritatedTail[10] = {
0x64, 0x61, 0x4E, 0x91, 0xA0, 0x85, 0x9B, 0x67, 0x6F, 0x64,
};
/* 8039C4F8-8039C56C 028B58 0072+02 1/0 0/0 0/0 .rodata sOrder__8Z2MdnPrm */
Z2MdnPrm::Unit const Z2MdnPrm::sOrder[57] = {
0x77, 0x5F, 0x5F, 0x73, 0x73, 0x66, 0x66, 0x6B, 0x6B, 0x7A, 0x7A, 0x60, 0x54, 0x5F, 0x5F,
0x69, 0x69, 0x5A, 0x86, 0x84, 0x84, 0x96, 0x96, 0x94, 0x94, 0x8A, 0x87, 0x84, 0x5A, 0x2C,
@@ -180,12 +167,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sOrder[57] = {
0x48, 0x48, 0x69, 0x69, 0x6D, 0x6D, 0x94, 0x94, 0x97,
};
/* 80455EE8-80455EF0 0044E8 0006+02 1/0 0/0 0/0 .sdata2 sOrderTail__8Z2MdnPrm */
u8 const Z2MdnPrm::sOrderTail[6] = {
0x60, 0xA8, 0x5B, 0x4E, 0x5D, 0x87,
};
/* 8039C56C-8039C5D8 028BCC 006A+02 1/0 0/0 0/0 .rodata sResent__8Z2MdnPrm */
Z2MdnPrm::Unit const Z2MdnPrm::sResent[53] = {
0x6F, 0x5F, 0x5F, 0x66, 0x66, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x4B, 0x4B, 0x6B, 0x6B, 0x86,
0x86, 0x4A, 0x4A, 0x6D, 0x6D, 0x6D, 0x6D, 0x8C, 0x8C, 0x84, 0x84, 0x64, 0x64, 0x6C, 0x6C, 0x92,
@@ -196,12 +181,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sResent[53] = {
0x5E, 0xAA, 0xAA, 0x9E, 0x9E, 0x5A, 0x5A, 0x57, 0x57, 0x57,
};
/* 80455EF0-80455EF8 0044F0 0005+03 1/0 0/0 0/0 .sdata2 sResentTail__8Z2MdnPrm */
u8 const Z2MdnPrm::sResentTail[5] = {
0x4A, 0x98, 0x8A, 0x7E, 0x57,
};
/* 8039C5D8-8039C644 028C38 006A+02 1/0 0/0 0/0 .rodata sCheerful__8Z2MdnPrm */
Z2MdnPrm::Unit const Z2MdnPrm::sCheerful[53] = {
0x64, 0x6D, 0x6D, 0x6D, 0x99, 0x6D, 0x40, 0x51, 0x51, 0x6F, 0x6F, 0x66, 0x66, 0x60, 0xA7, 0xAF,
0xB3, 0x61, 0x61, 0xA7, 0xA7, 0x5E, 0x8B, 0x75, 0x77, 0x72, 0x72, 0x93, 0x93, 0x8B, 0x8B, 0x88,
@@ -212,12 +195,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sCheerful[53] = {
0x65, 0x70, 0x6B, 0x6B, 0x6B, 0x6D, 0x6D, 0x57, 0x57, 0x7B,
};
/* 80455EF8-80455F00 0044F8 0008+00 1/0 0/0 0/0 .sdata2 sCheerfulTail__8Z2MdnPrm */
u8 const Z2MdnPrm::sCheerfulTail[8] = {
0x60, 0x6D, 0x4D, 0x44, 0x9C, 0x54, 0x70, 0x7B,
};
/* 8039C644-8039C6B0 028CA4 006A+02 1/0 0/0 0/0 .rodata sConfused__8Z2MdnPrm */
Z2MdnPrm::Unit const Z2MdnPrm::sConfused[53] = {
0x83, 0x80, 0x80, 0x82, 0x82, 0x82, 0x82, 0x5B, 0x75, 0x84, 0x84, 0x84, 0x84, 0x75, 0x75, 0x62,
0x62, 0x62, 0x4D, 0x56, 0x56, 0x59, 0x59, 0x59, 0x59, 0x74, 0x74, 0x85, 0x7D, 0x8D, 0x8D, 0x70,
@@ -228,12 +209,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sConfused[53] = {
0x38, 0x38, 0x38, 0x83, 0x83, 0x8E, 0x8E, 0x4C, 0x56, 0x56,
};
/* 80455F00-80455F08 004500 0005+03 1/0 0/0 0/0 .sdata2 sConfusedTail__8Z2MdnPrm */
u8 const Z2MdnPrm::sConfusedTail[5] = {
0x2C, 0x42, 0x4C, 0x7C, 0x49,
};
/* 8039C6B0-8039C718 028D10 0068+00 1/0 0/0 0/0 .rodata sHostility__8Z2MdnPrm */
Z2MdnPrm::Unit const Z2MdnPrm::sHostility[52] = {
0x85, 0x71, 0x71, 0x73, 0x73, 0x3B, 0x62, 0x84, 0x94, 0x94, 0x94, 0xAF, 0x98, 0xAD, 0xAD,
0x5A, 0x5A, 0x63, 0x63, 0x97, 0x90, 0x90, 0x7B, 0x73, 0x73, 0x63, 0x63, 0x55, 0x55, 0x65,
@@ -244,12 +223,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sHostility[52] = {
0x62, 0x6A, 0x5F, 0x72, 0x72, 0x62, 0x62, 0x65, 0x5E, 0x69, 0x69, 0x63, 0x63, 0x7F,
};
/* 80455F08-80455F10 004508 0007+01 1/0 0/0 0/0 .sdata2 sHostilityTail__8Z2MdnPrm */
u8 const Z2MdnPrm::sHostilityTail[7] = {
0x97, 0x67, 0x94, 0x6A, 0x66, 0x4F, 0x6A,
};
/* 8039C718-8039C784 028D78 006A+02 1/0 0/0 0/0 .rodata sTired__8Z2MdnPrm */
Z2MdnPrm::Unit const Z2MdnPrm::sTired[53] = {
0x70, 0x70, 0x70, 0x5C, 0x5C, 0x5C, 0x6F, 0x6F, 0x6F, 0x93, 0x8C, 0x9A, 0x9D, 0x89, 0x99, 0x7A,
0x91, 0x8D, 0x8D, 0x8D, 0x8D, 0x69, 0x69, 0x72, 0x72, 0x65, 0x65, 0x65, 0x9E, 0x98, 0x98, 0x2A,
@@ -260,12 +237,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sTired[53] = {
0x84, 0x6D, 0x6D, 0x6A, 0x6A, 0x8D, 0x8D, 0x8D, 0x8D, 0x3B,
};
/* 80455F10-80455F18 004510 0008+00 1/0 0/0 0/0 .sdata2 sTiredTail__8Z2MdnPrm */
u8 const Z2MdnPrm::sTiredTail[8] = {
0x66, 0x6F, 0x3B, 0x7A, 0x49, 0x91, 0x5C, 0x6A,
};
/* 8039C784-8039C7F0 028DE4 006A+02 1/0 0/0 0/0 .rodata sSerious__8Z2MdnPrm */
Z2MdnPrm::Unit const Z2MdnPrm::sSerious[53] = {
0x52, 0x65, 0x65, 0x72, 0x5A, 0x61, 0x61, 0x7B, 0x80, 0x92, 0x93, 0x9D, 0x9D, 0x70, 0x79, 0x76,
0x62, 0x57, 0x5A, 0x53, 0x53, 0x59, 0x59, 0x65, 0x63, 0x60, 0x60, 0x6A, 0x83, 0x80, 0x7F, 0x5D,
@@ -276,12 +251,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sSerious[53] = {
0x70, 0x60, 0x3C, 0x81, 0x81, 0x92, 0x92, 0x8E, 0x98, 0x87,
};
/* 80455F18-80455F20 004518 0007+01 1/0 0/0 0/0 .sdata2 sSeriousTail__8Z2MdnPrm */
u8 const Z2MdnPrm::sSeriousTail[7] = {
0x7B, 0x69, 0x4B, 0x61, 0x52, 0x59, 0x87,
};
/* 8039C7F0-8039C844 028E50 0054+00 1/0 0/0 0/0 .rodata sReplyb__8Z2MdnPrm */
Z2MdnPrm::Unit const Z2MdnPrm::sReplyb[42] = {
0x5C, 0x45, 0x45, 0x71, 0x9F, 0x57, 0xB4, 0xB4, 0x56, 0x62, 0x8E, 0x61, 0x61, 0xB0,
0xB0, 0x3C, 0x59, 0x4A, 0x64, 0xA4, 0xA4, 0x5A, 0x5A, 0x5A, 0x5A, 0x72, 0x72, 0x4B,
@@ -291,12 +264,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sReplyb[42] = {
0x44, 0x4F, 0x52, 0x58, 0x5A, 0x6F, 0x6E, 0x8A, 0x8E, 0x8E, 0x8E, 0x8C, 0x8C, 0x9B,
};
/* 80455F20-80455F28 004520 0007+01 1/0 0/0 0/0 .sdata2 sReplybTail__8Z2MdnPrm */
u8 const Z2MdnPrm::sReplybTail[7] = {
0x4F, 0x4A, 0xA2, 0x4F, 0x65, 0x98, 0x5C,
};
/* 8039C844-8039C8A8 028EA4 0064+00 1/0 0/0 0/0 .rodata sApologize__8Z2MdnPrm */
Z2MdnPrm::Unit const Z2MdnPrm::sApologize[50] = {
0x6A, 0x6A, 0x6A, 0x51, 0x51, 0x51, 0x51, 0x51, 0x51, 0x51, 0x57, 0x57, 0x57, 0x63, 0x61,
0x54, 0x54, 0x54, 0x54, 0x58, 0x58, 0x58, 0x58, 0x45, 0x45, 0x56, 0x56, 0x5B, 0x5B, 0x37,
@@ -307,12 +278,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sApologize[50] = {
0x64, 0x60, 0x61, 0x63, 0x6A, 0x62, 0x62, 0x64, 0x65, 0x71,
};
/* 8039C8A8-8039C8B4 028F08 0009+03 1/0 0/0 0/0 .rodata sApologizeTail__8Z2MdnPrm */
u8 const Z2MdnPrm::sApologizeTail[9] = {
0x7C, 0x6E, 0x63, 0x71, 0x51, 0x37, 0x75, 0x58, 0x5C,
};
/* 8039C8B4-8039C918 028F14 0064+00 1/0 0/0 0/0 .rodata sDeside__8Z2MdnPrm */
Z2MdnPrm::Unit const Z2MdnPrm::sDeside[50] = {
0x77, 0x77, 0x77, 0x58, 0x58, 0x6F, 0x78, 0x5F, 0x66, 0x5E, 0x6E, 0x62, 0x62, 0x2E, 0x5A,
0x58, 0x54, 0x52, 0x52, 0x5C, 0x59, 0x56, 0x56, 0x4B, 0x4B, 0x63, 0x63, 0x4D, 0x4E, 0x4A,
@@ -323,12 +292,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sDeside[50] = {
0x75, 0x6A, 0x66, 0x76, 0x69, 0x69, 0x69, 0x60, 0x60, 0x5F,
};
/* 80455F28-80455F30 004528 0008+00 1/0 0/0 0/0 .sdata2 sDesideTail__8Z2MdnPrm */
u8 const Z2MdnPrm::sDesideTail[8] = {
0x64, 0x2E, 0x4A, 0x57, 0x80, 0x48, 0x7C, 0x5F,
};
/* 8039C918-8039C980 028F78 0068+00 1/0 0/0 0/0 .rodata sAfford__8Z2MdnPrm */
Z2MdnPrm::Unit const Z2MdnPrm::sAfford[52] = {
0x4E, 0x45, 0x52, 0x5B, 0x56, 0x5B, 0x59, 0x52, 0x52, 0x57, 0x5C, 0x50, 0x50, 0x49, 0x80,
0x6E, 0x6E, 0x5A, 0x5C, 0x60, 0x6A, 0x62, 0x62, 0x6A, 0x71, 0x48, 0x4C, 0x5B, 0x5A, 0x40,
@@ -339,12 +306,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sAfford[52] = {
0x63, 0x5D, 0x69, 0x70, 0x56, 0x50, 0x4B, 0x92, 0x86, 0x8F, 0x4B, 0x4F, 0x57, 0x56,
};
/* 8039C980-8039C98C 028FE0 000C+00 1/0 0/0 0/0 .rodata sAffordTail__8Z2MdnPrm */
u8 const Z2MdnPrm::sAffordTail[12] = {
0x63, 0x8E, 0x5B, 0x59, 0x4C, 0x3A, 0x69, 0x47, 0x41, 0x59, 0x50, 0x55,
};
/* 8039C98C-8039CA58 -00001 00CC+00 2/2 0/0 0/0 .rodata sPrm__8Z2MdnPrm */
const Z2MdnPrm::Prm Z2MdnPrm::sPrm[17] = {
{Z2MdnPrm::sReply, Z2MdnPrm::sReplyTail, ARRAY_SIZE(Z2MdnPrm::sReply), 6, 4},
{Z2MdnPrm::sJoke, Z2MdnPrm::sJokeTail, ARRAY_SIZE(Z2MdnPrm::sJoke), 3, 7},
@@ -365,7 +330,6 @@ const Z2MdnPrm::Prm Z2MdnPrm::sPrm[17] = {
{Z2MdnPrm::sAfford, Z2MdnPrm::sAffordTail, ARRAY_SIZE(Z2MdnPrm::sAfford), 2, 10},
};
/* 802CBC60-802CBCEC 2C65A0 008C+00 0/0 1/1 0/0 .text __ct__12Z2SpeechMgr2Fv */
Z2SpeechMgr2::Z2SpeechMgr2() : JASGlobalInstance<Z2SpeechMgr2>(true), random(0) {
mTextNum = 0;
mTextCount = -1;
@@ -379,8 +343,6 @@ Z2SpeechMgr2::Z2SpeechMgr2() : JASGlobalInstance<Z2SpeechMgr2>(true), random(0)
}
}
/* 802CBD88-802CBF60 2C66C8 01D8+00 1/0 1/1 0/0 .text setString__12Z2SpeechMgr2FPCUssUcUs
*/
void Z2SpeechMgr2::setString(const u16* s, s16 textNum, u8 speakerID, u16 mood) {
switch (speakerID) {
case 0x13:
@@ -534,7 +496,6 @@ void Z2SpeechMgr2::setString(const u16* s, s16 textNum, u8 speakerID, u16 mood)
selectUnit(false);
}
/* 802CBF60-802CC190 2C68A0 0230+00 1/0 2/2 0/0 .text setTextCount__12Z2SpeechMgr2Fs */
void Z2SpeechMgr2::setTextCount(s16 textCount) {
if (mVoice != 99) {
field_0x3ff = 0x0;
@@ -604,7 +565,6 @@ void Z2SpeechMgr2::setTextCount(s16 textCount) {
}
}
/* 802CC190-802CC2FC 2C6AD0 016C+00 1/1 1/1 0/0 .text speakOneWord__12Z2SpeechMgr2Fb */
void Z2SpeechMgr2::speakOneWord(bool param_0) {
if (Z2GetSceneMgr()->isSceneExist() && (mVoice == 1 || mVoice == 2) &&
field_0x400 == 0 && field_0x3ff <= 30)
@@ -627,7 +587,6 @@ void Z2SpeechMgr2::speakOneWord(bool param_0) {
}
}
/* 802CC2FC-802CC4C0 2C6C3C 01C4+00 2/2 0/0 0/0 .text isNonVerbal__12Z2SpeechMgr2Fv */
bool Z2SpeechMgr2::isNonVerbal() {
switch(mText[mTextCount]) {
case '\0':
@@ -723,7 +682,6 @@ typedef struct {
u8 field_0x1;
} Z2ConnectCost;
/* 802CC4C0-802CC738 2C6E00 0278+00 2/2 0/0 0/0 .text selectUnit__12Z2SpeechMgr2Fb */
void Z2SpeechMgr2::selectUnit(bool param_0) {
Z2ConnectCost cost[5];
@@ -791,7 +749,6 @@ void Z2SpeechMgr2::selectUnit(bool param_0) {
field_0x401++;
}
/* 802CC738-802CC9D0 2C7078 0298+00 1/1 0/0 0/0 .text selectTail__12Z2SpeechMgr2Fv */
void Z2SpeechMgr2::selectTail() {
Z2ConnectCost cost[5];
s8 cVar9 = 0;
@@ -846,7 +803,6 @@ void Z2SpeechMgr2::selectTail() {
}
}
/* 802CC9D0-802CCA18 2C7310 0048+00 0/0 1/1 0/0 .text framework__12Z2SpeechMgr2Fv */
void Z2SpeechMgr2::framework() {
switch (mVoice) {
case 1:
@@ -863,8 +819,6 @@ void Z2SpeechMgr2::framework() {
}
}
/* 802CCA18-802CCF88 2C7358 0570+00 0/0 2/2 0/0 .text playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc
*/
void Z2SpeechMgr2::playOneShotVoice(u8 speakerID, u16 param_1, Vec* posPtr, s8 param_3) {
if (speakerID == 0) {
return;
@@ -1019,7 +973,6 @@ void Z2SpeechMgr2::playOneShotVoice(u8 speakerID, u16 param_1, Vec* posPtr, s8 p
}
}
/* 802CCF88-802CCFB8 2C78C8 0030+00 0/0 1/1 0/0 .text isMidnaSpeak__12Z2SpeechMgr2Fv */
bool Z2SpeechMgr2::isMidnaSpeak() {
if ((mVoice == 1 || mVoice == 2) && field_0x0) {
return true;
@@ -1028,11 +981,8 @@ bool Z2SpeechMgr2::isMidnaSpeak() {
return false;
}
/* 802CCFB8-802CCFF8 2C78F8 0040+00 1/1 0/0 0/0 .text __ct__15Z2SpeechStarterFv */
Z2SpeechStarter::Z2SpeechStarter() : Z2SoundStarter(false) {}
/* 802CCFF8-802CD248 2C7938 0250+00 1/0 0/0 0/0 .text
* startSound__15Z2SpeechStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f>UlfffffUl */
bool Z2SpeechStarter::startSound(JAISoundID soundID, JAISoundHandle* handlePtr,
const JGeometry::TVec3<f32>* posPtr, u32 portData, f32 fxmix,
f32 pitch, f32 volume, f32 pan, f32 dolby, u32 moveSteps) {
src/Z2AudioLib/Z2StatusMgr.cpp
-15
View File
@@ -87,7 +87,6 @@ static const char* sSpotName[] = {
"D_SB10",
};
/* 802B5F1C-802B5F70 2B085C 0054+00 0/0 1/1 0/0 .text __ct__11Z2StatusMgrFv */
Z2StatusMgr::Z2StatusMgr() : JASGlobalInstance(true) {
mHour = 0;
mMinute = 0;
@@ -109,12 +108,10 @@ Z2StatusMgr::Z2StatusMgr() : JASGlobalInstance(true) {
mHeartGaugeOn = 0;
}
/* 802B5F70-802B5F7C 2B08B0 000C+00 0/0 1/1 0/0 .text heartGaugeOn__11Z2StatusMgrFv */
void Z2StatusMgr::heartGaugeOn() {
mHeartGaugeOn = 2;
}
/* 802B5F7C-802B60CC 2B08BC 0150+00 0/0 1/1 0/0 .text processHeartGaugeSound__11Z2StatusMgrFv */
void Z2StatusMgr::processHeartGaugeSound() {
if (!dComIfGp_event_runCheck() && mHeartGaugeOn != 0) {
if (dScnPly_c::isPause()) {
@@ -144,7 +141,6 @@ void Z2StatusMgr::processHeartGaugeSound() {
}
}
/* 802B60CC-802B6104 2B0A0C 0038+00 0/0 1/1 0/0 .text talkIn__11Z2StatusMgrFv */
void Z2StatusMgr::talkIn() {
if (!isMovieDemo()) {
Z2GetSeqMgr()->talkInBgm();
@@ -152,7 +148,6 @@ void Z2StatusMgr::talkIn() {
}
}
/* 802B6104-802B613C 2B0A44 0038+00 0/0 1/1 0/0 .text talkOut__11Z2StatusMgrFv */
void Z2StatusMgr::talkOut() {
if (!isMovieDemo()) {
Z2GetSeqMgr()->talkOutBgm();
@@ -160,7 +155,6 @@ void Z2StatusMgr::talkOut() {
}
}
/* 802B613C-802B617C 2B0A7C 0040+00 0/0 1/1 0/0 .text menuIn__11Z2StatusMgrFv */
void Z2StatusMgr::menuIn() {
Z2GetSeqMgr()->menuInBgm();
Z2GetSeMgr()->menuInSe();
@@ -168,7 +162,6 @@ void Z2StatusMgr::menuIn() {
mPauseFlag = true;
}
/* 802B617C-802B61BC 2B0ABC 0040+00 0/0 3/3 0/0 .text menuOut__11Z2StatusMgrFv */
void Z2StatusMgr::menuOut() {
Z2GetSeqMgr()->menuOutBgm();
Z2GetSeMgr()->talkOutSe();
@@ -176,12 +169,10 @@ void Z2StatusMgr::menuOut() {
mPauseFlag = false;
}
/* 802B61BC-802B61E8 2B0AFC 002C+00 2/2 1/1 0/0 .text isMovieDemo__11Z2StatusMgrFv */
bool Z2StatusMgr::isMovieDemo() {
return mDemoStatus == 2 || mDemoStatus == 8 || mDemoStatus == 9;
}
/* 802B61E8-802B671C 2B0B28 0534+00 1/0 7/7 11/11 .text setDemoName__11Z2StatusMgrFPc */
void Z2StatusMgr::setDemoName(char* demoName) {
if (mDemoStatus == 11) {
mDemoStatus = 0;
@@ -290,13 +281,11 @@ void Z2StatusMgr::setDemoName(char* demoName) {
}
}
/* 802B671C-802B6734 2B105C 0018+00 0/0 1/1 0/0 .text processTime__11Z2StatusMgrFv */
void Z2StatusMgr::processTime() {
u16 processed_hour = mHour * 256;
mTime = processed_hour + mMinute;
}
/* 802B6734-802B6758 2B1074 0024+00 0/0 5/5 0/0 .text checkDayTime__11Z2StatusMgrFv */
bool Z2StatusMgr::checkDayTime() {
if (mHour >= 6 && mHour < 19) {
return true;
@@ -305,22 +294,18 @@ bool Z2StatusMgr::checkDayTime() {
return false;
}
/* 802B6758-802B6760 -00001 0008+00 0/0 0/0 0/0 .text setEventBit__11Z2StatusMgrFPv */
void Z2StatusMgr::setEventBit(void* eventBit) {
mEventBit = eventBit;
}
/* 802B6760-802B6784 2B10A0 0024+00 0/0 1/1 0/0 .text setCameraPolygonPos__11Z2StatusMgrFP3Vec */
void Z2StatusMgr::setCameraPolygonPos(Vec* polygonPos) {
if (polygonPos != NULL) {
mPolygonPosition = *polygonPos;
}
}
/* 802B6784-802B6788 2B10C4 0004+00 0/0 1/1 0/0 .text setCameraGroupInfo__11Z2StatusMgrFUc */
void Z2StatusMgr::setCameraGroupInfo(u8) {}
/* 802B6788-802B6840 2B10C8 00B8+00 0/0 2/2 0/0 .text setCameraInWaterDepth__11Z2StatusMgrFf */
void Z2StatusMgr::setCameraInWaterDepth(f32 depth) {
if (0.0f == depth) {
mCameraInWaterDepthRatio = 0.0f;
src/Z2AudioLib/Z2WolfHowlMgr.cpp
-42
View File
@@ -7,36 +7,27 @@
#include "Z2AudioLib/Z2Audience.h"
#include "d/d_demo.h"
/* 80450880-80450884 000300 0004+00 2/2 0/0 0/0 .sdata cPitchDown */
static f32 cPitchDown = 0.8909f;
/* 80450884-80450888 000304 0004+00 4/4 0/0 0/0 .sdata cPitchCenter */
static f32 cPitchCenter = 1.0f;
/* 80450888-8045088C 000308 0004+00 2/2 0/0 0/0 .sdata cPitchUp */
static f32 cPitchUp = 1.1892f;
static u8 struct_8045088C = 7;
static u8 struct_8045088D = 7;
/* 8045088E-80450890 00030E 0002+00 4/4 0/0 0/0 .sdata None */
static u8 cBeginHowlTime = 30;
static u8 data_8045088F = 0;
/* 80450890-80450894 000310 0004+00 1/1 0/0 0/0 .sdata cR_FlatWidth */
static f32 cR_FlatWidth = 0.94387f; // 1.0f / 12th root of 2
/* 80450894-80450898 -00001 0004+00 3/3 0/0 0/0 .sdata None */
static u8 struct_80450894 = 5;
static u8 struct_80450895 = 30;
/* 80450898-8045089C 000318 0004+00 1/1 0/0 0/0 .sdata sStickHigh */
static f32 sStickHigh = 0.5f;
/* 8045089C-804508A0 00031C 0004+00 1/1 0/0 0/0 .sdata sStickCenter */
static f32 sStickCenter = 1.0f / 5.0f;
/* 804508A0-804508A8 000320 0008+00 1/0 0/0 0/0 .sdata sHowlTobikusa */
static Z2WolfHowlLine sHowlTobikusa[4] = {
{HOWL_LINE_HIGH, 30},
{HOWL_LINE_LOW, 30},
@@ -44,7 +35,6 @@ static Z2WolfHowlLine sHowlTobikusa[4] = {
{HOWL_LINE_LOW, 30},
};
/* 803CBC50-803CBC5C 028D70 000C+00 1/0 0/0 0/0 .data sHowlUmakusa */
static Z2WolfHowlLine sHowlUmakusa[6] = {
{HOWL_LINE_HIGH, 15},
{HOWL_LINE_MID, 15},
@@ -54,7 +44,6 @@ static Z2WolfHowlLine sHowlUmakusa[6] = {
{HOWL_LINE_LOW, 60},
};
/* 803CBC5C-803CBC68 028D7C 000C+00 1/0 0/0 0/0 .data sHowlZeldaSong */
static Z2WolfHowlLine sHowlZeldaSong[6] = {
{HOWL_LINE_MID, 30},
{HOWL_LINE_HIGH, 15},
@@ -64,7 +53,6 @@ static Z2WolfHowlLine sHowlZeldaSong[6] = {
{HOWL_LINE_LOW, 45},
};
/* 803CBC68-803CBC74 028D88 000C+00 1/0 0/0 0/0 .data sHowlLightPrelude */
static Z2WolfHowlLine sHowlLightPrelude[6] = {
{HOWL_LINE_HIGH, 20},
{HOWL_LINE_LOW, 40},
@@ -74,7 +62,6 @@ static Z2WolfHowlLine sHowlLightPrelude[6] = {
{HOWL_LINE_HIGH, 30},
};
/* 803CBC74-803CBC80 028D94 000C+00 1/0 0/0 0/0 .data sHowlSoulRequiem */
static Z2WolfHowlLine sHowlSoulRequiem[6] = {
{HOWL_LINE_LOW, 30},
{HOWL_LINE_MID, 15},
@@ -84,7 +71,6 @@ static Z2WolfHowlLine sHowlSoulRequiem[6] = {
{HOWL_LINE_LOW, 30},
};
/* 803CBC80-803CBC8C 028DA0 000C+00 1/0 0/0 0/0 .data sHealingSong */
static Z2WolfHowlLine sHealingSong[6] = {
{HOWL_LINE_HIGH, 30},
{HOWL_LINE_MID, 30},
@@ -94,7 +80,6 @@ static Z2WolfHowlLine sHealingSong[6] = {
{HOWL_LINE_LOW, 30},
};
/* 803CBC8C-803CBC9C 028DAC 000E+02 1/0 0/0 0/0 .data sNewSong1 */
static Z2WolfHowlLine sNewSong1[7] = {
{HOWL_LINE_LOW, 30},
{HOWL_LINE_MID, 30},
@@ -105,7 +90,6 @@ static Z2WolfHowlLine sNewSong1[7] = {
{HOWL_LINE_HIGH, 30},
};
/* 803CBC9C-803CBCAC 028DBC 0010+00 1/0 0/0 0/0 .data sNewSong2 */
static Z2WolfHowlLine sNewSong2[8] = {
{HOWL_LINE_HIGH, 20},
{HOWL_LINE_MID, 20},
@@ -117,7 +101,6 @@ static Z2WolfHowlLine sNewSong2[8] = {
{HOWL_LINE_LOW, 30},
};
/* 803CBCAC-803CBCC0 028DCC 0012+02 1/0 0/0 0/0 .data sNewSong3 */
static Z2WolfHowlLine sNewSong3[9] = {
{HOWL_LINE_MID, 30},
{HOWL_LINE_LOW, 60},
@@ -130,7 +113,6 @@ static Z2WolfHowlLine sNewSong3[9] = {
{HOWL_LINE_MID, 45},
};
/* 803CBCC0-803CBD08 -00001 0048+00 1/1 0/0 0/0 .data sGuideData */
static Z2WolfHowlData sGuideData[9] = {
{ARRAY_SIZE(sHowlTobikusa), sHowlTobikusa},
{ARRAY_SIZE(sHowlUmakusa), sHowlUmakusa},
@@ -143,7 +125,6 @@ static Z2WolfHowlData sGuideData[9] = {
{ARRAY_SIZE(sNewSong3), sNewSong3},
};
/* 802CAAC0-802CAB8C 2C5400 00CC+00 0/0 1/1 0/0 .text __ct__13Z2WolfHowlMgrFv */
Z2WolfHowlMgr::Z2WolfHowlMgr() : JASGlobalInstance(true) {
mNowHowlData = NULL;
mNowInputValue = 0.0f;
@@ -174,7 +155,6 @@ Z2WolfHowlMgr::Z2WolfHowlMgr() : JASGlobalInstance(true) {
mGuideData = (Z2WolfHowlData*)&sGuideData;
}
/* 802CAB8C-802CABEC 2C54CC 0060+00 1/1 0/0 0/0 .text resetState__13Z2WolfHowlMgrFv */
void Z2WolfHowlMgr::resetState() {
mWolfHowlVolume = 1.0f;
mNowPitch = cPitchCenter;
@@ -192,7 +172,6 @@ void Z2WolfHowlMgr::resetState() {
field_0x30 = 0.0f;
}
/* 802CABEC-802CACB0 2C552C 00C4+00 1/1 0/0 0/0 .text calcVolumeMod__13Z2WolfHowlMgrFf */
void Z2WolfHowlMgr::calcVolumeMod(f32) {
f32 volume;
@@ -214,7 +193,6 @@ void Z2WolfHowlMgr::calcVolumeMod(f32) {
}
}
/* 802CACB0-802CACCC 2C55F0 001C+00 1/1 0/0 0/0 .text getNowPitch__13Z2WolfHowlMgrFv */
f32 Z2WolfHowlMgr::getNowPitch() {
if (mWolfHowlHandle) {
return mWolfHowlHandle->getAuxiliary().params_.mPitch;
@@ -223,13 +201,10 @@ f32 Z2WolfHowlMgr::getNowPitch() {
return 1.0f;
}
/* 802CACCC-802CACD4 2C560C 0008+00 0/0 2/2 0/0 .text getNowInputValue__13Z2WolfHowlMgrFv
*/
f32 Z2WolfHowlMgr::getNowInputValue() {
return mNowInputValue;
}
/* 802CACD4-802CAED4 2C5614 0200+00 1/1 0/0 0/0 .text calcPitchMod__13Z2WolfHowlMgrFff */
void Z2WolfHowlMgr::calcPitchMod(f32 param_0, f32 param_1) {
(void)param_0;
@@ -278,7 +253,6 @@ void Z2WolfHowlMgr::calcPitchMod(f32 param_0, f32 param_1) {
}
}
/* 802CAED4-802CB100 2C5814 022C+00 0/0 1/1 0/0 .text startWolfHowlSound__13Z2WolfHowlMgrFffbf */
s8 Z2WolfHowlMgr::startWolfHowlSound(f32 param_0, f32 stickValue, bool isHowl, f32 param_3) {
if (mCorrectCurveID > Z2WOLFHOWL_UMAKUSA) {
Z2GetSeqMgr()->setWindStoneVol(0.0f, 0);
@@ -328,8 +302,6 @@ s8 Z2WolfHowlMgr::startWolfHowlSound(f32 param_0, f32 stickValue, bool isHowl, f
return checkLine();
}
/* 802CB100-802CB320 2C5A40 0220+00 0/0 1/1 0/0 .text
* setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData */
void Z2WolfHowlMgr::setCorrectData(s8 curveID, Z2WolfHowlData* data) {
if (curveID == mCorrectCurveID) {
return;
@@ -405,8 +377,6 @@ void Z2WolfHowlMgr::setCorrectData(s8 curveID, Z2WolfHowlData* data) {
mFullScore -= FAST_DIV(length, 4);
}
/* 802CB320-802CB370 2C5C60 0050+00 3/3 2/2 0/0 .text getCorrectLine__13Z2WolfHowlMgrFUc
*/
Z2WolfHowlLine Z2WolfHowlMgr::getCorrectLine(u8 lineIndex) {
u16 local_18;
@@ -420,7 +390,6 @@ Z2WolfHowlLine Z2WolfHowlMgr::getCorrectLine(u8 lineIndex) {
return mNowHowlData->lineData[lineIndex];
}
/* 802CB370-802CB38C 2C5CB0 001C+00 2/2 1/1 0/0 .text getCorrectLineNum__13Z2WolfHowlMgrFv */
u8 Z2WolfHowlMgr::getCorrectLineNum() {
if (mNowHowlData != NULL) {
return mNowHowlData->lineNum;
@@ -429,7 +398,6 @@ u8 Z2WolfHowlMgr::getCorrectLineNum() {
return 0;
}
/* 804341F8-8043421C 060F18 0024+00 2/2 0/0 0/0 .bss sCorrectPhrase */
static JAISoundID sCorrectPhrase[9] = {
Z2BGM_HOWL_TOBIKUSA,
Z2BGM_HOWL_UMAKUSA,
@@ -442,7 +410,6 @@ static JAISoundID sCorrectPhrase[9] = {
Z2BGM_NEW_03_HOWL,
};
/* 8043421C-80434240 060F3C 0024+00 2/3 0/0 0/0 .bss sWindStoneSound */
static JAISoundID sWindStoneSound[9] = {
0xFFFFFFFF,
0xFFFFFFFF,
@@ -455,7 +422,6 @@ static JAISoundID sWindStoneSound[9] = {
Z2BGM_NEW_03_STONE,
};
/* 80434240-80434268 060F60 0024+04 1/2 0/0 0/0 .bss sCorrectDuo */
static JAISoundID sCorrectDuo[9] = {
0xFFFFFFFF,
0xFFFFFFFF,
@@ -468,7 +434,6 @@ static JAISoundID sCorrectDuo[9] = {
Z2BGM_NEW_03_DUO,
};
/* 802CB38C-802CB650 2C5CCC 02C4+00 1/1 0/0 0/0 .text checkLine__13Z2WolfHowlMgrFv */
s8 Z2WolfHowlMgr::checkLine() {
if (mCorrectCurveID == Z2WOLFHOWL_NONE || mNowHowlData == NULL) {
return -1;
@@ -540,7 +505,6 @@ s8 Z2WolfHowlMgr::checkLine() {
return -1;
}
/* 802CB650-802CB6EC 2C5F90 009C+00 1/1 1/1 0/0 .text getOnLineNum__13Z2WolfHowlMgrFv */
s8 Z2WolfHowlMgr::getOnLineNum() {
Z2WolfHowlLine line = getCorrectLine(mNowLineIndex);
u8 type = line.type;
@@ -555,8 +519,6 @@ s8 Z2WolfHowlMgr::getOnLineNum() {
return -1;
}
/* 802CB6EC-802CBA88 2C602C 039C+00 0/0 0/0 2/2 .text startWindStoneSound__13Z2WolfHowlMgrFScP3Vec
*/
void Z2WolfHowlMgr::startWindStoneSound(s8 curveID, Vec* pos) {
if (pos == NULL || Z2GetLink() == NULL || Z2GetLink()->getCurrentPos() == NULL) {
return;
@@ -592,8 +554,6 @@ void Z2WolfHowlMgr::startWindStoneSound(s8 curveID, Vec* pos) {
}
}
/* 802CBA88-802CBB58 2C63C8 00D0+00 0/0 1/1 0/0 .text startGuideMelody__13Z2WolfHowlMgrFb
*/
int Z2WolfHowlMgr::startGuideMelody(bool startSound) {
Z2GetSeqMgr()->setWindStoneVol(0.0f, 0);
@@ -610,8 +570,6 @@ int Z2WolfHowlMgr::startGuideMelody(bool startSound) {
return 0;
}
/* 802CBB58-802CBB7C 2C6498 0024+00 0/0 1/1 0/0 .text skipCorrectDemo__13Z2WolfHowlMgrFv
*/
void Z2WolfHowlMgr::skipCorrectDemo() {
Z2GetSeqMgr()->stopWolfHowlSong();
}