diff options
Diffstat (limited to 'src/Z2AudioLib/Z2Creature.cpp')
| -rw-r--r-- | src/Z2AudioLib/Z2Creature.cpp | 688 |
1 files changed, 349 insertions, 339 deletions
diff --git a/src/Z2AudioLib/Z2Creature.cpp b/src/Z2AudioLib/Z2Creature.cpp index d5f057b102..fb7023503f 100644 --- a/src/Z2AudioLib/Z2Creature.cpp +++ b/src/Z2AudioLib/Z2Creature.cpp @@ -1,10 +1,4 @@ -/** - * Z2Creature.cpp - * Z2AudioLib - Creatures - */ - #include "Z2AudioLib/Z2Creature.h" -#include "SSystem/SComponent/c_xyz.h" #include "Z2AudioLib/Z2Param.h" #include "Z2AudioLib/Z2Calc.h" #include "Z2AudioLib/Z2AudioMgr.h" @@ -117,50 +111,52 @@ Z2Creature::~Z2Creature() { /* 802C04E8-802C0530 2BAE28 0048+00 4/2 2/2 0/0 .text deleteObject__10Z2CreatureFv */ void Z2Creature::deleteObject() { - mSoundObjAnime.mpAnimation = NULL; + mSoundObjAnime.stopAnime(); mSoundObjAnime.deleteObject(); mSoundObjSimple1.deleteObject(); mSoundObjSimple2.deleteObject(); } /* 802C0530-802C05B0 2BAE70 0080+00 5/5 1/1 125/125 .text init__10Z2CreatureFP3VecP3VecUcUc */ -void Z2Creature::init(Vec* param_0, Vec* param_1, u8 param_2, u8 param_3) { - if (param_0) { - mSoundObjAnime.init(param_0, param_2); - mpPos = param_0; +void Z2Creature::init(Vec* animePosPtr, Vec* simplePosPtr, u8 animeHandleNum, u8 simpleHandleNum) { + if (animePosPtr) { + mSoundObjAnime.init(animePosPtr, animeHandleNum); + mpPos = animePosPtr; } - if (param_1) { - mSoundObjSimple1.init(param_1, param_3); + + if (simplePosPtr) { + mSoundObjSimple1.init(simplePosPtr, simpleHandleNum); } } /* 802C05B0-802C0618 2BAEF0 0068+00 2/2 1/1 0/0 .text init__10Z2CreatureFP3VecP3VecP3VecUcUcUc */ -void Z2Creature::init(Vec* param_0, Vec* param_1, Vec* param_2, u8 param_3, u8 param_4, - u8 param_5) { - init(param_0, param_1, param_3, param_4); - if (param_2) { - mSoundObjSimple2.init(param_2, param_5); +void Z2Creature::init(Vec* animePosPtr, Vec* simplePosPtr, Vec* simple2PosPtr, u8 animeHandleNum, u8 simpleHandleNum, + u8 simple2HandleNum) { + init(animePosPtr, simplePosPtr, animeHandleNum, simpleHandleNum); + + if (simple2PosPtr) { + mSoundObjSimple2.init(simple2PosPtr, simple2HandleNum); } } /* 802C0618-802C0628 2BAF58 0010+00 7/0 2/0 0/0 .text * setSoundStarter__10Z2CreatureFP14Z2SoundStarter */ -void Z2Creature::setSoundStarter(Z2SoundStarter* i_starter) { - mSoundObjAnime.setSoundStarter(i_starter); - mSoundObjSimple1.setSoundStarter(i_starter); - mSoundObjSimple2.setSoundStarter(i_starter); +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* param_0, bool param_1, f32 param_2, f32 param_3) { - mSoundObjAnime.initAnime(param_0, param_1, param_2, param_3); +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 param_0, s8 param_1) { - mSoundObjAnime.framework(param_0, param_1); - mSoundObjSimple1.framework(param_0, param_1); - mSoundObjSimple2.framework(param_0, param_1); +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 */ @@ -175,115 +171,118 @@ void Z2Creature::stopAnime() { /* 802C0720-802C087C 2BB060 015C+00 4/0 2/0 0/0 .text * startCreatureSound__10Z2CreatureF10JAISoundIDUlSc */ -Z2SoundHandlePool* Z2Creature::startCreatureSound(JAISoundID i_soundID, u32 param_1, s8 param_2) { - switch (i_soundID) { - case Z2SE_KOSARU_V_KAGO_WAIT: - return mSoundObjSimple1.startSound(i_soundID, param_1, 0); - default: - Z2SoundHandlePool* handle = mSoundObjAnime.startSound(i_soundID, param_1, param_2); - if (handle != NULL && *handle) { - switch (i_soundID) { - case Z2SE_FAIRY_S_FLY: - f32 pitch = Z2Calc::getParamByExp((f32)param_1, 30.0f, 100.0f, 0.3f, - 0.8f, 1.2f, Z2Calc::CURVE_SIGN_0); - f32 volume = Z2Calc::getParamByExp((f32)param_1, 30.0f, 100.0f, 0.3f, - 0.5f, 1.0f, Z2Calc::CURVE_SIGN_0); - (*handle)->getAuxiliary().moveVolume(volume, 0); - (*handle)->getAuxiliary().movePitch(pitch, 0); - } +Z2SoundHandlePool* Z2Creature::startCreatureSound(JAISoundID soundID, u32 mapinfo, s8 reverb) { + switch (soundID) { + case Z2SE_KOSARU_V_KAGO_WAIT: + return mSoundObjSimple1.startSound(soundID, mapinfo, 0); + default: + Z2SoundHandlePool* handle = mSoundObjAnime.startSound(soundID, mapinfo, reverb); + if (handle != NULL && *handle) { + switch (soundID) { + case Z2SE_FAIRY_S_FLY: + f32 pitch = Z2Calc::getParamByExp((f32)mapinfo, 30.0f, 100.0f, 0.3f, + 0.8f, 1.2f, Z2Calc::CURVE_NEGATIVE); + f32 volume = Z2Calc::getParamByExp((f32)mapinfo, 30.0f, 100.0f, 0.3f, + 0.5f, 1.0f, Z2Calc::CURVE_NEGATIVE); + (*handle)->getAuxiliary().moveVolume(volume, 0); + (*handle)->getAuxiliary().movePitch(pitch, 0); } - return handle; + } + return handle; } } /* 802C087C-802C0A4C 2BB1BC 01D0+00 4/0 2/0 0/0 .text * startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc */ -Z2SoundHandlePool* Z2Creature::startCreatureSoundLevel(JAISoundID i_soundID, u32 param_1, s8 param_2) { - switch (i_soundID) { - case Z2SE_FAIRY_S_LV: - Z2GetAudioMgr()->seStartLevel(i_soundID, mpPos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); - return NULL; - default: - Z2SoundHandlePool* handle = mSoundObjAnime.startLevelSound(i_soundID, param_1, param_2); - if (handle != NULL && *handle) { - if (i_soundID == Z2SE_YM_SNOBO_RIDE || i_soundID == Z2SE_YW_SNOBO_RIDE) { - f32 volume = 0.0f; - if (param_1 != 0) { - volume = Z2Calc::getParamByExp((f32)param_1, 0.0f, 92.0f, 0.25f, - 0.4f, 1.0f, Z2Calc::CURVE_SIGN_0); - } - f32 pitch = Z2Calc::getParamByExp((f32)param_1, 0.0f, 92.0f, 0.3f, - 0.5f, 1.2f, Z2Calc::CURVE_SIGN_0); - - (*handle)->getAuxiliary().moveVolume(volume, 0); - (*handle)->getAuxiliary().movePitch(pitch, 0); - } else if (i_soundID == Z2SE_ZRZ_MV) { - (*handle)->getAuxiliary().moveVolume((f32)param_1 / 100.0f, 0); +Z2SoundHandlePool* Z2Creature::startCreatureSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb) { + switch (soundID) { + case Z2SE_FAIRY_S_LV: + Z2GetAudioMgr()->seStartLevel(soundID, mpPos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + return NULL; + default: + Z2SoundHandlePool* handle = mSoundObjAnime.startLevelSound(soundID, mapinfo, reverb); + if (handle != NULL && *handle) { + if (soundID == Z2SE_YM_SNOBO_RIDE || soundID == Z2SE_YW_SNOBO_RIDE) { + f32 volume = 0.0f; + if (mapinfo != 0) { + volume = Z2Calc::getParamByExp((f32)mapinfo, 0.0f, 92.0f, 0.25f, + 0.4f, 1.0f, Z2Calc::CURVE_NEGATIVE); } + f32 pitch = Z2Calc::getParamByExp((f32)mapinfo, 0.0f, 92.0f, 0.3f, + 0.5f, 1.2f, Z2Calc::CURVE_NEGATIVE); + + (*handle)->getAuxiliary().moveVolume(volume, 0); + (*handle)->getAuxiliary().movePitch(pitch, 0); + } else if (soundID == Z2SE_ZRZ_MV) { + f32 volume = (f32)mapinfo / 100.0f; + (*handle)->getAuxiliary().moveVolume(volume, 0); } - return handle; + } + return handle; } } /* 802C0A4C-802C0AF8 2BB38C 00AC+00 4/1 2/0 0/0 .text * startCreatureVoice__10Z2CreatureF10JAISoundIDSc */ -Z2SoundHandlePool* Z2Creature::startCreatureVoice(JAISoundID i_soundID, s8 param_1) { - switch (i_soundID) { - case Z2SE_MDN_V_FLY_OUT: - case Z2SE_MDN_V_MGN_TAME: - case Z2SE_MDN_V_CLINGST: - case Z2SE_MDN_V_LV_PANIC: - case Z2SE_MDN_V_HIT: - case Z2SE_MDN_V_LOOKABOUT_1: - case Z2SE_MDN_V_WLSWIMDIE: - case Z2SE_MDN_V_WAITD: - case Z2SE_MDN_V_SWAITA: - case Z2SE_MDN_V_SWAITB_1: - case Z2SE_MDN_V_SWAITB_3: - case Z2SE_MDN_V_SWAITC: - case Z2SE_MDN_V_SWAITD: - case Z2SE_MDN_V_LEADSWAIT: - case Z2SE_MDN_V_HIP: - case Z2SE_MDN_V_WLDIEA: - case Z2SE_MDN_V_ENTRANCE: - case Z2SE_MDN_V_DOOROP: - case Z2SE_MDN_V_ROPEWAIT_1: - case Z2SE_MDN_V_ROPEWAIT_2: - case Z2SE_MDN_V_ROPEFALTER: - case Z2SE_MDN_V_WAITTP: - if (Z2GetSpeechMgr2()->isMidnaSpeak()) { - return NULL; - } +Z2SoundHandlePool* Z2Creature::startCreatureVoice(JAISoundID soundID, s8 reverb) { + switch (soundID) { + case Z2SE_MDN_V_FLY_OUT: + case Z2SE_MDN_V_MGN_TAME: + case Z2SE_MDN_V_CLINGST: + case Z2SE_MDN_V_LV_PANIC: + case Z2SE_MDN_V_HIT: + case Z2SE_MDN_V_LOOKABOUT_1: + case Z2SE_MDN_V_WLSWIMDIE: + case Z2SE_MDN_V_WAITD: + case Z2SE_MDN_V_SWAITA: + case Z2SE_MDN_V_SWAITB_1: + case Z2SE_MDN_V_SWAITB_3: + case Z2SE_MDN_V_SWAITC: + case Z2SE_MDN_V_SWAITD: + case Z2SE_MDN_V_LEADSWAIT: + case Z2SE_MDN_V_HIP: + case Z2SE_MDN_V_WLDIEA: + case Z2SE_MDN_V_ENTRANCE: + case Z2SE_MDN_V_DOOROP: + case Z2SE_MDN_V_ROPEWAIT_1: + case Z2SE_MDN_V_ROPEWAIT_2: + case Z2SE_MDN_V_ROPEFALTER: + case Z2SE_MDN_V_WAITTP: + if (Z2GetSpeechMgr2()->isMidnaSpeak()) { + return NULL; + } } - return mSoundObjSimple1.startSound(i_soundID, 0, param_1); + + return mSoundObjSimple1.startSound(soundID, 0, reverb); } /* 802C0AF8-802C0B70 2BB438 0078+00 3/0 2/0 0/0 .text * startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc */ -Z2SoundHandlePool* Z2Creature::startCreatureVoiceLevel(JAISoundID i_soundID, s8 param_1) { - if (i_soundID == Z2SE_MDN_V_WAITD) { +Z2SoundHandlePool* Z2Creature::startCreatureVoiceLevel(JAISoundID soundID, s8 reverb) { + if (soundID == Z2SE_MDN_V_WAITD) { if (Z2GetStatusMgr()->getDemoStatus() == 2 || !Z2GetSceneMgr()->isInGame()) { return NULL; } } - return mSoundObjSimple1.startLevelSound((u32)i_soundID, 0, param_1); + + 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 param_0, u32 param_1, s8 param_2) { - return mSoundObjSimple2.startSound(param_0, param_1, param_2); +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 param_0, u32 param_1, s8 param_2) { - return mSoundObjSimple2.startLevelSound(param_0, param_1, param_2); +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 param_0, u32 param_1) { - return mSoundObjAnime.startCollisionSE(param_0, param_1, NULL); +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 */ @@ -292,18 +291,14 @@ Z2CreatureCitizen::Z2CreatureCitizen() : mCitizenID(-1), field_0xa1(-1), mLinkSearch(false) -{ - /* empty function */ -} +{} /* 802C0C6C-802C0CE4 2BB5AC 0078+00 0/0 0/0 12/12 .text __dt__17Z2CreatureCitizenFv */ -Z2CreatureCitizen::~Z2CreatureCitizen() { - /* empty function */ -} +Z2CreatureCitizen::~Z2CreatureCitizen() {} /* 802C0CE4-802C0D04 2BB624 0020+00 0/0 2/2 7/7 .text init__17Z2CreatureCitizenFP3VecP3VecUcUc */ -void Z2CreatureCitizen::init(Vec* param_0, Vec* param_1, u8 param_2, u8 param_3) { - Z2Creature::init(param_0, param_1, param_2, param_3); +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 */ @@ -311,6 +306,7 @@ void Z2CreatureCitizen::deleteObject() { if (mLinkSearch == false) { Z2GetSeMgr()->decrCrowdSize(); } + Z2Creature::deleteObject(); } @@ -320,24 +316,24 @@ void Z2CreatureCitizen::setMdlType(s8 param_0, bool param_1, bool param_2) { s8 b = param_1 ? 0x40 : 0; s8 c = param_2 ? 0x80 : 0; mCitizenID = a + c + b; + if (!param_2) { Z2GetSeMgr()->incrCrowdSize(); } + if (param_0 == 0) { field_0xa1 = data_80451358; - data_80451358 = !data_80451358; - } - else if (param_0 == 1) { + data_80451358 = !data_80451358 ? 1 : 0; + } else if (param_0 == 1) { field_0xa1 = data_80451359; - data_80451359 = !data_80451359; + data_80451359 = !data_80451359 ? 1 : 0; } } /* 802C0E18-802C0ED8 2BB758 00C0+00 0/0 0/0 21/21 .text playVoice__17Z2CreatureCitizenFi */ void Z2CreatureCitizen::playVoice(int i_sound) { - u32 tmp = mCitizenID; - u32 sound_id = Z2SE_MAN_A1_V_AWAY + 6 * tmp + i_sound; + u32 sound_id = Z2SE_MAN_A1_V_AWAY + 6 * (s8)mCitizenID + i_sound; switch (mCitizenID) { case 0: case 1: @@ -346,6 +342,7 @@ void Z2CreatureCitizen::playVoice(int i_sound) { } break; } + mSoundObjSimple1.startSound(sound_id, 0, -1); if ((i_sound == 0 || i_sound == 2) && !mLinkSearch) { Z2GetSeMgr()->decrCrowdSize(); @@ -355,8 +352,8 @@ void Z2CreatureCitizen::playVoice(int i_sound) { /* 802C0ED8-802C0F64 2BB818 008C+00 1/0 0/0 0/0 .text * startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc */ -Z2SoundHandlePool* Z2CreatureCitizen::startCreatureVoice(JAISoundID i_soundID, s8 param_1) { - switch (i_soundID) { +Z2SoundHandlePool* Z2CreatureCitizen::startCreatureVoice(JAISoundID soundID, s8 reverb) { + switch (soundID) { case Z2SE_KIU_V_FEAR: case Z2SE_HANA_V_FEAR: case Z2SE_MICH_V_FEAR: @@ -366,7 +363,8 @@ Z2SoundHandlePool* Z2CreatureCitizen::startCreatureVoice(JAISoundID i_soundID, s } break; } - return Z2Creature::startCreatureVoice(i_soundID, -1); + + return Z2Creature::startCreatureVoice(soundID, -1); } /* 802C0F64-802C0FC4 2BB8A4 0060+00 2/2 0/0 100/100 .text __ct__15Z2CreatureEnemyFv */ @@ -376,19 +374,19 @@ Z2CreatureEnemy::Z2CreatureEnemy() : field_0xa1(1), mLinkSearch(false), field_0xa3(0) -{ - /* empty function */ -} +{} /* 802C0FC4-802C1094 2BB904 00D0+00 3/2 0/0 0/0 .text deleteObject__15Z2CreatureEnemyFv */ void Z2CreatureEnemy::deleteObject() { - if (mEnemyID == 0x2c) { - Z2GetSeqMgr()->unMuteSceneBgm(0x21); + if (mEnemyID == Z2_ENEMY_GB) { + Z2GetSeqMgr()->unMuteSceneBgm(33); } + if (getSupervisor() != NULL) { Z2GetSoundObjMgr()->removeEnemy(this); } + mSoundObjAnime.stopAnime(); mSoundObjAnime.deleteObject(); mSoundObjSimple1.deleteObject(); @@ -396,71 +394,79 @@ void Z2CreatureEnemy::deleteObject() { } /* 802C1094-802C10B4 2BB9D4 0020+00 0/0 0/0 98/98 .text init__15Z2CreatureEnemyFP3VecP3VecUcUc */ -void Z2CreatureEnemy::init(Vec* param_0, Vec* param_1, u8 param_2, u8 param_3) { - Z2Creature::init(param_0, param_1, param_2, param_3); +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* param_0, Vec* param_1, Vec* param_2, u8 param_3, u8 param_4, - u8 param_5) { - Z2Creature::init(param_0, param_1, param_2, param_3, param_4, param_5); +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 param_0, s8 param_1) { +void Z2CreatureEnemy::framework(u32 mapinfo, s8 reverb) { if (field_0xa1 < 1) { - field_0xa1 += 1; + field_0xa1++; } - Z2Creature::framework(param_0, param_1); + + Z2Creature::framework(mapinfo, reverb); } /* 802C110C-802C136C 2BBA4C 0260+00 4/0 0/0 0/0 .text * startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc */ -Z2SoundHandlePool* Z2CreatureEnemy::startCreatureSound(JAISoundID i_soundID, u32 param_1, s8 param_2) { - Z2SoundHandlePool* handle = mSoundObjAnime.startSound(i_soundID, param_1, param_2); +Z2SoundHandlePool* Z2CreatureEnemy::startCreatureSound(JAISoundID soundID, u32 mapinfo, s8 reverb) { + Z2SoundHandlePool* handle = mSoundObjAnime.startSound(soundID, mapinfo, reverb); switch (mEnemyID) { case Z2_ENEMY_SF: - if (i_soundID == Z2SE_EN_SF_BREAK_DOWN) { + if (soundID == Z2SE_EN_SF_BREAK_DOWN) { field_0xa3 = 1; Z2GetSoundObjMgr()->getEnemyList()->remove(this); - } else if (field_0xa3 != 0 && i_soundID == Z2SE_EN_SF_BUILD_UP) { + } else if (field_0xa3 != 0 && soundID == Z2SE_EN_SF_BUILD_UP) { field_0xa3 = 0; Z2GetSoundObjMgr()->getEnemyList()->append(this); } break; case Z2_ENEMY_FZ: - if (handle != NULL && handle->isSoundAttached() && i_soundID == Z2SE_EN_FZ_BOUND) { - f32 volume = Z2Calc::linearTransform(param_1, 10.0f, 50.0f, 0.1f, 1.0f, false); - f32 pitch = Z2Calc::linearTransform(param_1, 10.0f, 50.0f, 0.8f, 1.2f, false); + if (handle != NULL && *handle && soundID == Z2SE_EN_FZ_BOUND) { + f32 volume = Z2Calc::linearTransform(mapinfo, 10.0f, 50.0f, 0.1f, 1.0f, false); + f32 pitch = Z2Calc::linearTransform(mapinfo, 10.0f, 50.0f, 0.8f, 1.2f, false); (*handle)->getAuxiliary().moveVolume(volume, 0); (*handle)->getAuxiliary().movePitch(pitch, 0); } break; - case Z2_ENEMY_MS: - Z2_E_ms_modVol(handle, mSoundObjAnime.field_0x1c); + case Z2_ENEMY_MS: { + u32 var_r24 = mSoundObjAnime.field_0x1c; + Z2_E_ms_modVol(handle, var_r24); break; + } case Z2_ENEMY_SW: - Z2_E_sw_modPitch(handle, param_1); + Z2_E_sw_modPitch(handle, mapinfo); break; - case Z2_ENEMY_MM: - Z2_E_mm_modPitch(handle, mSoundObjAnime.field_0x1c); + case Z2_ENEMY_MM: { + u32 var_r23 = mSoundObjAnime.field_0x1c; + Z2_E_mm_modPitch(handle, var_r23); break; + } case Z2_ENEMY_SM2: - if (i_soundID == Z2SE_EN_SM_HIT) { + if (soundID == Z2SE_EN_SM_HIT) { field_0xa3 = 1; - Z2GetSeqMgr()->setBattleLastHit(struct_80450869); + Z2GetSeqMgr()->setBattleLastHit(Z2Param::ENDING_BLOW_VOL_LOWER_TIME); } break; } - switch (i_soundID) { - case Z2SE_EN_ZAN_YO_LAND: - Z2_B_zan_modPitch(handle, mSoundObjAnime.field_0x1c); + switch (soundID) { + case Z2SE_EN_ZAN_YO_LAND: { + u32 var_r22 = mSoundObjAnime.field_0x1c; + Z2_B_zan_modPitch(handle, var_r22); break; + } case Z2SE_EN_ZAN_YO_FLOAT_WAIT: - if (mSoundObjAnime.field_0x1c > 100) { + u32 var_r21 = mSoundObjAnime.field_0x1c; + if (var_r21 > 100) { return NULL; } break; @@ -471,9 +477,9 @@ Z2SoundHandlePool* Z2CreatureEnemy::startCreatureSound(JAISoundID i_soundID, u32 /* 802C136C-802C168C 2BBCAC 0320+00 2/0 0/0 0/0 .text * startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc */ -Z2SoundHandlePool* Z2CreatureEnemy::startCreatureSoundLevel(JAISoundID i_soundID, u32 param_1, s8 param_2) { - if (i_soundID == 0x7FFFF) { - cXyz pos; +Z2SoundHandlePool* Z2CreatureEnemy::startCreatureSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb) { + if (soundID == 0x7FFFF) { + Vec pos; Z2GetAudience()->convertAbsToRel(*mpPos, &pos, 0); f32 volume = Z2GetAudience()->calcRelPosVolume(pos, 2.0f, 0); f32 pan = Z2GetAudience()->calcRelPosPan(pos, 0); @@ -483,36 +489,36 @@ Z2SoundHandlePool* Z2CreatureEnemy::startCreatureSoundLevel(JAISoundID i_soundID return NULL; } - Z2SoundHandlePool* handle = mSoundObjAnime.startLevelSound(i_soundID, param_1, param_2); + Z2SoundHandlePool* handle = mSoundObjAnime.startLevelSound(soundID, mapinfo, reverb); switch (mEnemyID) { case Z2_ENEMY_FZ: - if (handle != NULL && *handle && i_soundID == Z2SE_EN_FZ_MOVE) { - f32 volume = Z2Calc::getParamByExp(param_1, 1.0f, 50.0f, 0.4f, 0.1f, 1.1f, - Z2Calc::CURVE_SIGN_1); + if (handle != NULL && *handle && soundID == Z2SE_EN_FZ_MOVE) { + f32 volume = Z2Calc::getParamByExp(mapinfo, 1.0f, 50.0f, 0.4f, 0.1f, 1.1f, + Z2Calc::CURVE_POSITIVE); (*handle)->getAuxiliary().moveVolume(volume, 0); } break; case Z2_ENEMY_SW: - Z2_E_sw_modPitch(handle, param_1); + Z2_E_sw_modPitch(handle, mapinfo); break; case Z2_ENEMY_RB: - if (handle != NULL && *handle && i_soundID == Z2SE_EN_RB_MOVE) { - f32 volume = Z2Calc::getParamByExp(param_1, 4.0f, 35.0f, 0.6f, 0.7f, 1.0f, - Z2Calc::CURVE_SIGN_1); - f32 pitch = Z2Calc::getParamByExp(param_1, 4.0f, 35.0f, 0.4f, 0.8f, 1.0f, - Z2Calc::CURVE_SIGN_1); + if (handle != NULL && *handle && soundID == Z2SE_EN_RB_MOVE) { + f32 volume = Z2Calc::getParamByExp(mapinfo, 4.0f, 35.0f, 0.6f, 0.7f, 1.0f, + Z2Calc::CURVE_POSITIVE); + f32 pitch = Z2Calc::getParamByExp(mapinfo, 4.0f, 35.0f, 0.4f, 0.8f, 1.0f, + Z2Calc::CURVE_POSITIVE); (*handle)->getAuxiliary().moveVolume(volume, 0); (*handle)->getAuxiliary().movePitch(pitch, 0); break; } - // no break + // fallthrough default: - if (handle != NULL && *handle && i_soundID == Z2SE_EN_PH_PROPELLER) { - f32 volume = Z2Calc::getParamByExp(param_1, 0.0f, 30.0f, 0.4f, 0.0f, 1.0f, - Z2Calc::CURVE_SIGN_1); - f32 pitch = Z2Calc::getParamByExp(param_1, 4000.0f, 13000.0f, 0.4f, 0.8f, 1.2f, - Z2Calc::CURVE_SIGN_1); + if (handle != NULL && *handle && soundID == Z2SE_EN_PH_PROPELLER) { + f32 volume = Z2Calc::getParamByExp(mapinfo, 0.0f, 30.0f, 0.4f, 0.0f, 1.0f, + Z2Calc::CURVE_POSITIVE); + f32 pitch = Z2Calc::getParamByExp(mapinfo, 4000.0f, 13000.0f, 0.4f, 0.8f, 1.2f, + Z2Calc::CURVE_POSITIVE); (*handle)->getAuxiliary().moveVolume(volume, 0); (*handle)->getAuxiliary().movePitch(pitch, 0); } @@ -524,7 +530,7 @@ Z2SoundHandlePool* Z2CreatureEnemy::startCreatureSoundLevel(JAISoundID i_soundID /* 802C168C-802C1948 2BBFCC 02BC+00 4/0 0/0 0/0 .text * startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc */ -Z2SoundHandlePool* Z2CreatureEnemy::startCreatureVoice(JAISoundID i_soundID, s8 param_1) { +Z2SoundHandlePool* Z2CreatureEnemy::startCreatureVoice(JAISoundID soundID, s8 reverb) { if (Z2GetSeqMgr()->getMainBgmID() == Z2BGM_BOSS_ZANT) { switch (Z2GetSeqMgr()->mBgmStatus) { case 0: @@ -532,88 +538,95 @@ Z2SoundHandlePool* Z2CreatureEnemy::startCreatureVoice(JAISoundID i_soundID, s8 break; case 2: case 3: - switch (i_soundID) { + switch (soundID) { case Z2SE_EN_ZAN_V_ATK_BALL: - i_soundID = Z2SE_EN_ZAN_V_ATK_BALL_MG; + soundID = Z2SE_EN_ZAN_V_ATK_BALL_MG; break; case Z2SE_EN_ZAN_V_DMG: - i_soundID = Z2SE_EN_ZAN_V_DMG_MG; + soundID = Z2SE_EN_ZAN_V_DMG_MG; break; } break; case 4: case 5: - switch (i_soundID) { + switch (soundID) { case Z2SE_EN_ZAN_V_ATK_BALL: - i_soundID = Z2SE_EN_ZAN_V_ATK_BALL_OI; + soundID = Z2SE_EN_ZAN_V_ATK_BALL_OI; break; case Z2SE_EN_ZAN_V_DMG: - i_soundID = Z2SE_EN_ZAN_V_DMG_OI; + soundID = Z2SE_EN_ZAN_V_DMG_OI; break; } break; case 6: case 7: - switch (i_soundID) { + switch (soundID) { case Z2SE_EN_ZAN_V_ATK_BALL: - i_soundID = Z2SE_EN_ZAN_V_ATK_BALL_MK; + soundID = Z2SE_EN_ZAN_V_ATK_BALL_MK; break; case Z2SE_EN_ZAN_V_DMG: - i_soundID = Z2SE_EN_ZAN_V_DMG_MK; + soundID = Z2SE_EN_ZAN_V_DMG_MK; break; } break; case 8: case 9: - switch (i_soundID) { + switch (soundID) { case Z2SE_EN_ZAN_V_DMG: - i_soundID = Z2SE_EN_ZAN_V_DMG_YO; + soundID = Z2SE_EN_ZAN_V_DMG_YO; break; } break; case 10: case 11: - switch (i_soundID) { + switch (soundID) { case Z2SE_EN_ZAN_V_DMG: - i_soundID = Z2SE_EN_ZAN_V_DMG_CTL; + soundID = Z2SE_EN_ZAN_V_DMG_CTL; break; } break; } } - u32 var1 = 0; - if (mEnemyID == 7) { - var1 = 1; + u32 mapinfo = 0; + if (mEnemyID == Z2_ENEMY_RDY) { + mapinfo = 1; } - Z2SoundHandlePool* handle = mSoundObjSimple1.startSound(i_soundID, var1, param_1); + + Z2SoundHandlePool* handle = mSoundObjSimple1.startSound(soundID, mapinfo, reverb); switch (mEnemyID) { case Z2_ENEMY_SH: - if (i_soundID == Z2SE_EN_SH_V_DEAD) { + if (soundID == Z2SE_EN_SH_V_DEAD) { field_0xa3 = 1; - Z2GetSeqMgr()->setBattleLastHit(struct_80450869); + Z2GetSeqMgr()->setBattleLastHit(Z2Param::ENDING_BLOW_VOL_LOWER_TIME); } break; case Z2_ENEMY_BS: - if (i_soundID == Z2SE_EN_BS_V_DEAD) { + if (soundID == Z2SE_EN_BS_V_DEAD) { field_0xa3 = 1; - Z2GetSeqMgr()->setBattleLastHit(struct_80450869); + Z2GetSeqMgr()->setBattleLastHit(Z2Param::ENDING_BLOW_VOL_LOWER_TIME); } break; - case Z2_ENEMY_MS: - Z2_E_ms_modVol(handle, mSoundObjSimple1.field_0x1c); - break; - case Z2_ENEMY_SW: - Z2_E_sw_modPitch(handle, mSoundObjSimple1.field_0x1c); + case Z2_ENEMY_MS: { + u32 var_r26 = mSoundObjSimple1.field_0x1c; + Z2_E_ms_modVol(handle, var_r26); break; - case Z2_ENEMY_MM: - Z2_E_mm_modPitch(handle, mSoundObjSimple1.field_0x1c); + } + case Z2_ENEMY_SW: { + u32 var_r25 = mSoundObjSimple1.field_0x1c; + Z2_E_sw_modPitch(handle, var_r25); break; } + case Z2_ENEMY_MM: { + u32 var_r24 = mSoundObjSimple1.field_0x1c; + Z2_E_mm_modPitch(handle, var_r24); + } + } - if (i_soundID == Z2SE_EN_ZAN_YO_V_KENKEN) { - Z2_B_zan_modPitch(handle, mSoundObjSimple1.field_0x1c); + if (soundID == Z2SE_EN_ZAN_YO_V_KENKEN) { + u32 var_r23 = mSoundObjSimple1.field_0x1c; + Z2_B_zan_modPitch(handle, var_r23); } return handle; @@ -621,43 +634,41 @@ Z2SoundHandlePool* Z2CreatureEnemy::startCreatureVoice(JAISoundID i_soundID, s8 /* 802C1948-802C199C 2BC288 0054+00 3/0 0/0 0/0 .text * startCreatureVoiceLevel__15Z2CreatureEnemyF10JAISoundIDSc */ -Z2SoundHandlePool* Z2CreatureEnemy::startCreatureVoiceLevel(JAISoundID i_soundID, s8 param_1) { - u32 var1 = 0; +Z2SoundHandlePool* Z2CreatureEnemy::startCreatureVoiceLevel(JAISoundID soundID, s8 reverb) { + u32 mapinfo = 0; if (mEnemyID == Z2_ENEMY_RDY) { - var1 = 1; + mapinfo = 1; } - return mSoundObjSimple1.startLevelSound(i_soundID, var1, param_1); + return mSoundObjSimple1.startLevelSound(soundID, mapinfo, reverb); } /* 802C199C-802C19D8 2BC2DC 003C+00 3/0 0/0 0/0 .text * startCreatureExtraSound__15Z2CreatureEnemyF10JAISoundIDUlSc */ -Z2SoundHandlePool* Z2CreatureEnemy::startCreatureExtraSound(JAISoundID i_soundID, u32 param_1, - s8 param_2) { - return mSoundObjSimple2.startSound(i_soundID, param_1, param_2); +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 i_soundID, u32 param_1, - s8 param_2) { - return mSoundObjSimple2.startLevelSound(i_soundID, param_1, param_2); +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 param_0, u32 param_1) { +Z2SoundHandlePool* Z2CreatureEnemy::startCollisionSE(u32 hitID, u32 mapinfo) { u8 var1; switch (mEnemyID) { case Z2_ENEMY_WS: field_0xa3 = 1; - Z2GetSeqMgr()->setBattleLastHit(struct_80450869); - return mSoundObjAnime.startCollisionSE(param_0, param_1, NULL); + Z2GetSeqMgr()->setBattleLastHit(Z2Param::ENDING_BLOW_VOL_LOWER_TIME); + return mSoundObjAnime.startCollisionSE(hitID, mapinfo, NULL); case Z2_ENEMY_BI: if (getSupervisor() != NULL) { Z2GetSoundObjMgr()->removeEnemy(this); } - return mSoundObjAnime.startCollisionSE(param_0, param_1, NULL); + return mSoundObjAnime.startCollisionSE(hitID, mapinfo, NULL); default: - switch (param_1) { + switch (mapinfo) { case 0x1e: case 0x1f: case 0x22: @@ -668,61 +679,60 @@ Z2SoundHandlePool* Z2CreatureEnemy::startCollisionSE(u32 param_0, u32 param_1) { case 0x2a: case 0x2d: case 0x34: - Z2GetSeqMgr()->setBattleSeqState(2); + Z2GetSeqMgr()->onEnemyDamage(); break; case 0x20: case 0x24: field_0xa3 = 1; - var1 = struct_80450869; - if (param_0 == Z2SE_HIT_SWORD || param_0 == Z2SE_HIT_SWORD_STAB - || param_0 == Z2SE_HIT_WOLFBITE) { - var1 = 0x14; + var1 = Z2Param::ENDING_BLOW_VOL_LOWER_TIME; + if (hitID == Z2SE_HIT_SWORD || hitID == Z2SE_HIT_SWORD_STAB || hitID == Z2SE_HIT_WOLFBITE) { + var1 = 20; } Z2GetSeqMgr()->setBattleLastHit(var1); break; case 0x21: - if (mEnemyID == 0x2b) { + if (mEnemyID == Z2_ENEMY_HB) { field_0xa3 = 1; - Z2GetSeqMgr()->setBattleLastHit(struct_80450869); - } else if (mEnemyID == 0x16) { - Z2GetSeqMgr()->setBattleSeqState(2); + Z2GetSeqMgr()->setBattleLastHit(Z2Param::ENDING_BLOW_VOL_LOWER_TIME); + } else if (mEnemyID == Z2_ENEMY_DB) { + Z2GetSeqMgr()->onEnemyDamage(); } break; } - return mSoundObjAnime.startCollisionSE(param_0, param_1, NULL); + + return mSoundObjAnime.startCollisionSE(hitID, mapinfo, NULL); } } /* 802C1B7C-802C1B90 2BC4BC 0014+00 0/0 0/0 55/55 .text setLinkSearch__15Z2CreatureEnemyFb */ -void Z2CreatureEnemy::setLinkSearch(bool b_search) { - if (field_0xa3 != 0) { - return; +void Z2CreatureEnemy::setLinkSearch(bool isLinkSearch) { + if (field_0xa3 == 0) { + mLinkSearch = isLinkSearch; } - mLinkSearch = b_search; } /* 802C1B90-802C1BE8 2BC4D0 0058+00 0/0 0/0 72/72 .text setEnemyName__15Z2CreatureEnemyFPCc */ -void Z2CreatureEnemy::setEnemyName(char const* i_name) { - if (i_name == NULL) { +void Z2CreatureEnemy::setEnemyName(const char* enemyName) { + if (enemyName == NULL) { field_0xa1 = -1; } else { - mEnemyID = Z2GetSoundObjMgr()->getEnemyID(i_name, this); + mEnemyID = Z2GetSoundObjMgr()->getEnemyID(enemyName, this); } } /* 802C1BE8-802C1C24 2BC528 003C+00 0/0 0/0 1/1 .text __ct__16Z2CreatureSumomoFv */ -Z2CreatureSumomo::Z2CreatureSumomo() { - /* empty function */ -} +Z2CreatureSumomo::Z2CreatureSumomo() {} /* 802C1C24-802C1CA0 2BC564 007C+00 0/0 0/0 8/8 .text playSumomoBgm__16Z2CreatureSumomoFUl */ -void Z2CreatureSumomo::playSumomoBgm(u32 param_0) { +void Z2CreatureSumomo::playSumomoBgm(u32 dist) { if (Z2GetSeqMgr()->getSubBgmID() != Z2BGM_SUMOMO) { - if (param_0 < 700) { + if (dist < 700) { Z2GetSeqMgr()->subBgmStart(Z2BGM_SUMOMO); + OS_REPORT("SUMOMO_BGM_START dist:%d\n", dist); } - } else if (param_0 >= 1000 && Z2GetStatusMgr()->getDemoStatus() != 6) { + } else if (dist >= 1000 && Z2GetStatusMgr()->getDemoStatus() != 6) { Z2GetSeqMgr()->subBgmStop(); + OS_REPORT("SUMOMO_BGM_STOP dist:%d\n", dist); } } @@ -731,32 +741,31 @@ void Z2CreatureSumomo::playSumomoBgm(u32 param_0) { void Z2CreatureSumomo::deleteObject() { if (Z2GetSeqMgr()->getSubBgmID() == Z2BGM_SUMOMO && Z2GetStatusMgr()->getDemoStatus() != 6) { Z2GetSeqMgr()->subBgmStop(); + OS_REPORT("SUMOMO_BGM_STOP (DELETE)\n"); } + Z2Creature::deleteObject(); } /* 802C1D10-802C1D4C 2BC650 003C+00 0/0 0/0 3/3 .text __ct__18Z2SoundObjBeeGroupFv */ -Z2SoundObjBeeGroup::Z2SoundObjBeeGroup() { - /* empty function */ -} +Z2SoundObjBeeGroup::Z2SoundObjBeeGroup() {} /* 802C1D4C-802C1D6C 2BC68C 0020+00 1/0 0/0 0/0 .text init__18Z2SoundObjBeeGroupFP3VecUc */ -void Z2SoundObjBeeGroup::init(Vec* param_0, u8 param_1) { - Z2SoundObjBase::init(param_0, param_1); +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 i_soundID, u8 param_1) { +void Z2SoundObjBeeGroup::playBeeGroupSound(JAISoundID soundID, u8 param_1) { if (param_1 == 0) { return; } - u32 sound_id = (u32)i_soundID; JAISoundID sound_id2; - switch (sound_id) { + switch ((u32)soundID) { case Z2SE_EN_BE_STAY: sound_id2 = Z2SE_EN_BE_STAY_GROUP; break; @@ -774,7 +783,7 @@ void Z2SoundObjBeeGroup::playBeeGroupSound(JAISoundID i_soundID, u8 param_1) { break; } - Z2SoundHandlePool* handle1 = startLevelSound(sound_id, 0, -1); + Z2SoundHandlePool* handle1 = startLevelSound((u32)soundID, 0, -1); Z2SoundHandlePool* handle2 = startLevelSound(sound_id2, 0, -1); if (handle1 != NULL && *handle1 != NULL) { @@ -788,9 +797,7 @@ void Z2SoundObjBeeGroup::playBeeGroupSound(JAISoundID i_soundID, u8 param_1) { } /* 802C1F54-802C1FB0 2BC894 005C+00 0/0 0/0 1/1 .text __ct__12Z2CreatureFMFv */ -Z2CreatureFM::Z2CreatureFM() { - /* empty function */ -} +Z2CreatureFM::Z2CreatureFM() {} /* 802C1FB0-802C1FFC 2BC8F0 004C+00 1/0 0/0 0/0 .text deleteObject__12Z2CreatureFMFv */ void Z2CreatureFM::deleteObject() { @@ -803,10 +810,10 @@ void Z2CreatureFM::deleteObject() { /* 802C1FFC-802C20E8 2BC93C 00EC+00 0/0 0/0 1/1 .text * init__12Z2CreatureFMFP3VecP3VecP3VecP3VecP3VecP3VecUcUcUcUcUcUc */ -void Z2CreatureFM::init(Vec* param_0, Vec* param_1, Vec* param_2, Vec* param_3, Vec* param_4, - Vec* param_5, u8 param_6, u8 param_7, u8 param_8, u8 param_9, +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) { - Z2Creature::init(param_0, param_1, param_6, param_7); + Z2Creature::init(animePosPtr, simplePosPtr, animeHandleNum, simpleHandleNum); if (param_2 != NULL) { field_0xa4.init(param_2, param_8); } @@ -822,27 +829,27 @@ void Z2CreatureFM::init(Vec* param_0, Vec* param_1, Vec* param_2, Vec* param_3, } /* 802C20E8-802C2194 2BCA28 00AC+00 1/0 0/0 0/0 .text framework__12Z2CreatureFMFUlSc */ -void Z2CreatureFM::framework(u32 param_0, s8 param_1) { - Z2Creature::framework(param_0, param_1); - field_0xa4.framework(param_0, param_1); - field_0xc4.framework(param_0, param_1); - field_0xe4.framework(param_0, param_1); - field_0x104.framework(param_0, param_1); +void Z2CreatureFM::framework(u32 mapinfo, s8 reverb) { + Z2Creature::framework(mapinfo, reverb); + field_0xa4.framework(mapinfo, reverb); + field_0xc4.framework(mapinfo, reverb); + field_0xe4.framework(mapinfo, reverb); + field_0x104.framework(mapinfo, reverb); } /* 802C2194-802C2290 2BCAD4 00FC+00 0/0 0/0 1/1 .text * startChainSound__12Z2CreatureFMF10JAISoundIDUcfUlSc */ -Z2SoundHandlePool* Z2CreatureFM::startChainSound(JAISoundID i_soundID, u8 param_1, f32 param_2, - u32 param_3, s8 param_4) { +Z2SoundHandlePool* Z2CreatureFM::startChainSound(JAISoundID soundID, u8 param_1, f32 param_2, + u32 mapinfo, s8 reverb) { switch (param_1) { case 0: - return field_0xa4.startSound(i_soundID, param_3, param_4); + return field_0xa4.startSound(soundID, mapinfo, reverb); case 1: - return field_0xc4.startSound(i_soundID, param_3, param_4); + return field_0xc4.startSound(soundID, mapinfo, reverb); case 2: - return field_0xe4.startSound(i_soundID, param_3, param_4); + return field_0xe4.startSound(soundID, mapinfo, reverb); case 3: - return field_0x104.startSound(i_soundID, param_3, param_4); + return field_0x104.startSound(soundID, mapinfo, reverb); default: return NULL; } @@ -850,13 +857,13 @@ Z2SoundHandlePool* Z2CreatureFM::startChainSound(JAISoundID i_soundID, u8 param_ /* 802C2290-802C24B0 2BCBD0 0220+00 0/0 0/0 1/1 .text * startChainSoundLevel__12Z2CreatureFMF10JAISoundIDUcfUlSc */ -Z2SoundHandlePool* Z2CreatureFM::startChainSoundLevel(JAISoundID i_soundID, u8 param_1, f32 param_2, - u32 param_3, s8 param_4) { +Z2SoundHandlePool* Z2CreatureFM::startChainSoundLevel(JAISoundID soundID, u8 param_1, f32 param_2, + u32 mapinfo, s8 reverb) { Z2SoundHandlePool* handle; f32 pitch; switch (param_1) { case 0: - handle = field_0xa4.startLevelSound(i_soundID, param_3, param_4); + handle = field_0xa4.startLevelSound(soundID, mapinfo, reverb); if (handle != NULL && *handle) { if (param_2 > 30.0f) { pitch = 1.06f; @@ -872,7 +879,7 @@ Z2SoundHandlePool* Z2CreatureFM::startChainSoundLevel(JAISoundID i_soundID, u8 p } return NULL; case 1: - handle = field_0xa4.startLevelSound(i_soundID, param_3, param_4); + handle = field_0xa4.startLevelSound(soundID, mapinfo, reverb); if (handle != NULL && *handle) { if (param_2 > 30.0f) { pitch = 1.06f; @@ -888,9 +895,9 @@ Z2SoundHandlePool* Z2CreatureFM::startChainSoundLevel(JAISoundID i_soundID, u8 p } return NULL; case 2: - return field_0xe4.startLevelSound(i_soundID, param_3, param_4); + return field_0xe4.startLevelSound(soundID, mapinfo, reverb); case 3: - return field_0x104.startLevelSound(i_soundID, param_3, param_4); + return field_0x104.startLevelSound(soundID, mapinfo, reverb); default: return NULL; } @@ -898,26 +905,25 @@ Z2SoundHandlePool* Z2CreatureFM::startChainSoundLevel(JAISoundID i_soundID, u8 p /* 802C24B0-802C24D0 2BCDF0 0020+00 0/0 0/0 1/1 .text init__13Z2CreatureGobFP3VecP3VecP3VecUcUcUc */ -void Z2CreatureGob::init(Vec* param_0, Vec* param_1, Vec* param_2, u8 param_3, u8 param_4, - u8 param_5) { - Z2Creature::init(param_0, param_1, param_2, param_3, param_4, param_5); +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 i_soundID, s8 param_1) { +Z2SoundHandlePool* Z2CreatureGob::startCreatureVoiceLevel(JAISoundID soundID, s8 reverb) { if (mSoundObjSimple1.getHandleSoundID(Z2SE_EN_GOB_V_DAMAGE) != NULL || mSoundObjSimple1.getHandleSoundID(Z2SE_EN_GOB_V_STOMACH) != NULL) { return NULL; } - return mSoundObjSimple1.startLevelSound(i_soundID, 0, param_1); + + return mSoundObjSimple1.startLevelSound(soundID, 0, reverb); } /* 802C2578-802C25EC 2BCEB8 0074+00 0/0 0/0 1/1 .text __ct__12Z2CreatureOIFv */ -Z2CreatureOI::Z2CreatureOI() { - /* empty function */ -} +Z2CreatureOI::Z2CreatureOI() {} /* 802C25EC-802C2670 2BCF2C 0084+00 1/0 0/0 0/0 .text deleteObject__12Z2CreatureOIFv */ void Z2CreatureOI::deleteObject() { @@ -977,35 +983,34 @@ 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 param_0, s8 param_1) { - Z2Creature::framework(param_0, param_1); - field_0xa4.framework(param_0, param_1); - field_0xc4.framework(param_0, param_1); - field_0xe4.framework(param_0, param_1); - mTentacleSounds[0].framework(param_0, param_1); - mTentacleSounds[1].framework(param_0, param_1); - mTentacleSounds[2].framework(param_0, param_1); - mTentacleSounds[3].framework(param_0, param_1); - mTentacleSounds[4].framework(param_0, param_1); - mTentacleSounds[5].framework(param_0, param_1); - mTentacleSounds[6].framework(param_0, param_1); - mTentacleSounds[7].framework(param_0, param_1); +void Z2CreatureOI::framework(u32 mapinfo, s8 reverb) { + Z2Creature::framework(mapinfo, reverb); + field_0xa4.framework(mapinfo, reverb); + field_0xc4.framework(mapinfo, reverb); + field_0xe4.framework(mapinfo, reverb); + mTentacleSounds[0].framework(mapinfo, reverb); + mTentacleSounds[1].framework(mapinfo, reverb); + mTentacleSounds[2].framework(mapinfo, reverb); + mTentacleSounds[3].framework(mapinfo, reverb); + mTentacleSounds[4].framework(mapinfo, reverb); + mTentacleSounds[5].framework(mapinfo, reverb); + mTentacleSounds[6].framework(mapinfo, reverb); + mTentacleSounds[7].framework(mapinfo, reverb); } /* 802C29D4-802C2C84 2BD314 02B0+00 1/0 0/0 0/0 .text * startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc */ -Z2SoundHandlePool* Z2CreatureOI::startCreatureSoundLevel(JAISoundID i_soundID, u32 param_1, - s8 param_2) { - if (i_soundID == Z2SE_EN_OI_MOVE) { - Z2SoundHandlePool* handle1 = mSoundObjAnime.startLevelSound(i_soundID, param_1, param_2); - Z2SoundHandlePool* handle2 = field_0xa4.startLevelSound(i_soundID, param_1, param_2); - Z2SoundHandlePool* handle3 = field_0xc4.startLevelSound(i_soundID, param_1, param_2); - Z2SoundHandlePool* handle4 = field_0xe4.startLevelSound(i_soundID, param_1, param_2); - - f32 volume = Z2Calc::getParamByExp(param_1, 0.0f, 42.0f, 0.4f, 0.0f, 1.0f, - Z2Calc::CURVE_SIGN_1); - f32 pitch = Z2Calc::getParamByExp(param_1, 0.0f, 42.0f, 0.4f, 0.9f, 1.1f, - Z2Calc::CURVE_SIGN_1); +Z2SoundHandlePool* Z2CreatureOI::startCreatureSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb) { + if (soundID == Z2SE_EN_OI_MOVE) { + Z2SoundHandlePool* handle1 = mSoundObjAnime.startLevelSound(soundID, mapinfo, reverb); + Z2SoundHandlePool* handle2 = field_0xa4.startLevelSound(soundID, mapinfo, reverb); + Z2SoundHandlePool* handle3 = field_0xc4.startLevelSound(soundID, mapinfo, reverb); + Z2SoundHandlePool* handle4 = field_0xe4.startLevelSound(soundID, mapinfo, reverb); + + f32 volume = Z2Calc::getParamByExp(mapinfo, 0.0f, 42.0f, 0.4f, 0.0f, 1.0f, + Z2Calc::CURVE_POSITIVE); + f32 pitch = Z2Calc::getParamByExp(mapinfo, 0.0f, 42.0f, 0.4f, 0.9f, 1.1f, + Z2Calc::CURVE_POSITIVE); if (handle1 != NULL && *handle1 != NULL) { (*handle1)->getAuxiliary().moveVolume(volume, 0); @@ -1036,28 +1041,27 @@ Z2SoundHandlePool* Z2CreatureOI::startCreatureSoundLevel(JAISoundID i_soundID, u return NULL; } } else { - return mSoundObjAnime.startLevelSound(i_soundID, param_1, param_2); + return mSoundObjAnime.startLevelSound(soundID, mapinfo, reverb); } } /* 802C2C84-802C2CD4 2BD5C4 0050+00 0/0 0/0 1/1 .text * startTentacleSound__12Z2CreatureOIF10JAISoundIDUcUlSc */ -Z2SoundHandlePool* Z2CreatureOI::startTentacleSound(JAISoundID i_soundID, u8 param_1, u32 param_2, - s8 param_3) { - return mTentacleSounds[param_1].startSound(i_soundID, param_2, param_3); +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 i_soundID, u8 param_1, - f32 param_2, u32 param_3, s8 param_4) { - Z2SoundHandlePool* handle = - mTentacleSounds[param_1].startLevelSound(i_soundID, param_3, param_4); +Z2SoundHandlePool* Z2CreatureOI::startTentacleSoundLevel(JAISoundID soundID, u8 tentacleIndex, + f32 param_2, u32 mapinfo, s8 reverb) { + Z2SoundHandlePool* handle = NULL; + handle = mTentacleSounds[tentacleIndex].startLevelSound(soundID, mapinfo, reverb); if (handle != NULL && *handle) { f32 volume = Z2Calc::getParamByExp(param_2, 0.0f, 60.0f, 0.4f, 0.0f, 1.0f, - Z2Calc::CURVE_SIGN_1); + Z2Calc::CURVE_POSITIVE); f32 pitch = Z2Calc::getParamByExp(param_2, 0.0f, 60.0f, 0.4f, 0.9f, 1.1f, - Z2Calc::CURVE_SIGN_1); + Z2Calc::CURVE_POSITIVE); (*handle)->getAuxiliary().moveVolume(volume, 0); (*handle)->getAuxiliary().movePitch(pitch, 0); return handle; @@ -1067,10 +1071,10 @@ Z2SoundHandlePool* Z2CreatureOI::startTentacleSoundLevel(JAISoundID i_soundID, u } /* 802C2DE0-802C2E54 2BD720 0074+00 3/3 0/0 0/0 .text Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl */ -static void Z2_E_sw_modPitch(Z2SoundHandlePool* i_handle, u32 param_1) { - if (i_handle != NULL && *i_handle != NULL) { +static void Z2_E_sw_modPitch(Z2SoundHandlePool* handle, u32 mapinfo) { + if (handle != NULL && *handle != NULL) { f32 pitch = 1.0f; - switch (param_1) { + switch (mapinfo) { case 1: pitch = 1.1f; break; @@ -1078,41 +1082,47 @@ static void Z2_E_sw_modPitch(Z2SoundHandlePool* i_handle, u32 param_1) { pitch = 0.8f; break; } - (*i_handle)->getAuxiliary().movePitch(pitch, 0); + (*handle)->getAuxiliary().movePitch(pitch, 0); } } /* 802C2E54-802C2E9C 2BD794 0048+00 2/2 0/0 0/0 .text Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl */ -static void Z2_E_ms_modVol(Z2SoundHandlePool* i_handle, u32 param_1) { - if (i_handle != NULL && *i_handle != NULL && param_1 == 1) { - (*i_handle)->getAuxiliary().moveVolume(0.2f, 0); +static void Z2_E_ms_modVol(Z2SoundHandlePool* handle, u32 mapinfo) { + if (handle != NULL && *handle != NULL) { + f32 var_f31 = 0.2f; + if (mapinfo == 1) { + (*handle)->getAuxiliary().moveVolume(var_f31, 0); + } } } /* 802C2E9C-802C2EE4 2BD7DC 0048+00 2/2 0/0 0/0 .text Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl */ -static void Z2_E_mm_modPitch(Z2SoundHandlePool* i_handle, u32 param_1) { - if (i_handle != NULL && *i_handle != NULL && param_1 == 3) { - (*i_handle)->getAuxiliary().movePitch(0.7f, 0); +static void Z2_E_mm_modPitch(Z2SoundHandlePool* handle, u32 mapinfo) { + if (handle != NULL && *handle != NULL) { + f32 var_f31 = 0.7f; + if (mapinfo == 3) { + (*handle)->getAuxiliary().movePitch(var_f31, 0); + } } } /* 802C2EE4-802C3040 2BD824 015C+00 2/2 0/0 0/0 .text Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl */ -static void Z2_B_zan_modPitch(Z2SoundHandlePool* i_handle, u32 param_1) { - if (i_handle != NULL && *i_handle != NULL) { - f32 pitch; +static void Z2_B_zan_modPitch(Z2SoundHandlePool* handle, u32 mapinfo) { + if (handle != NULL && *handle != NULL) { + f32 pitch = 1.0f; f32 volume = 1.0f; - if (param_1 > 400) { + if (mapinfo > 400) { pitch = 0.5f; - } else if (param_1 > 100) { - pitch = Z2Calc::getParamByExp(400 - param_1, 0.0f, 300.0f, 0.4f, 0.5f, 1.0f, - Z2Calc::CURVE_SIGN_0); + } else if (mapinfo > 100) { + pitch = Z2Calc::getParamByExp(400 - mapinfo, 0.0f, 300.0f, 0.4f, 0.5f, 1.0f, + Z2Calc::CURVE_NEGATIVE); } else { - pitch = Z2Calc::getParamByExp(100 - param_1, 0.0f, 50.0f, 0.4f, 1.0f, 1.5f, - Z2Calc::CURVE_SIGN_0); - volume = Z2Calc::getParamByExp(param_1, 50.0f, 100.0f, 0.4f, 0.4f, 1.0f, - Z2Calc::CURVE_SIGN_0); + pitch = Z2Calc::getParamByExp(100 - mapinfo, 0.0f, 50.0f, 0.4f, 1.0f, 1.5f, + Z2Calc::CURVE_NEGATIVE); + volume = Z2Calc::getParamByExp(mapinfo, 50.0f, 100.0f, 0.4f, 0.4f, 1.0f, + Z2Calc::CURVE_NEGATIVE); } - (*i_handle)->getAuxiliary().movePitch(pitch, 0); - (*i_handle)->getAuxiliary().moveVolume(volume, 0); + (*handle)->getAuxiliary().movePitch(pitch, 0); + (*handle)->getAuxiliary().moveVolume(volume, 0); } } |