mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-01 09:43:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

JAUSectionHeap, Z2SoundInfo, others (#1925)

Browse Source 
* Z2SoundInfo

* JAUSectionHeap

* Z2EnvSeMgr

* Z2AudioMgr

* m_Do_audio

* d_a_alink
This commit is contained in:
Jcw87
2023-09-15 05:20:09 -07:00
committed by GitHub
parent f834379a8b
commit 287ae62349
159 changed files with 1349 additions and 1511 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_alink.cpp
+2 -7
View File
@@ -19117,14 +19117,9 @@ asm BOOL dEvt_control_c::isOrderOK() {
#pragma pop
/* 801412F8-80141308 13BC38 0010+00 1/1 0/0 0/0 .text dComIfGp_getEvent__Fv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm dEvt_control_c& dComIfGp_getEvent() {
nofralloc
#include "asm/d/a/d_a_alink/dComIfGp_getEvent__Fv.s"
static dEvt_control_c& dComIfGp_getEvent() {
return g_dComIfG_gameInfo.play.getEvent();
}
#pragma pop
/* 80141308-80141324 13BC48 001C+00 1/1 0/0 0/0 .text dComIfGp_checkPlayerStatus0__FiUl
*/
src/d/event/d_event.cpp
+1 -1
View File
@@ -1089,7 +1089,7 @@ int dEvt_control_c::Step() {
mChangeOK = NULL;
if (chkEventFlag(0x200)) {
Z2AudioMgr::getInterface()->mStatusMgr.setDemoName(NULL);
Z2AudioMgr::getInterface()->setDemoName(NULL);
}
if (mEventStatus != 0) {
src/d/event/d_event_manager.cpp
+2 -2
View File
@@ -370,7 +370,7 @@ void dEvent_manager_c::Sequencer() {
}
}
}
Z2GetAudioMgr()->mStatusMgr.setDemoName(name);
Z2GetAudioMgr()->setDemoName(name);
}
if (event->finishCheck()) {
@@ -477,7 +477,7 @@ void dEvent_manager_c::Sequencer() {
}
} else {
if (evtControl.chkEventFlag(0x100)) {
Z2GetAudioMgr()->mStatusMgr.setDemoName(NULL);
Z2GetAudioMgr()->setDemoName(NULL);
}
}
}
src/d/menu/d_menu_calibration.cpp
+6 -6
View File
@@ -104,12 +104,12 @@ void dMenu_Calibration_c::step1_move_move() {
if (mDoCPd_c::getTrigA(PAD_1)) {
mProcess = PROC_STEP2_WAIT;
field_0xff = 0;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_NEXT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_NEXT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
} else if (mDoCPd_c::getTrigB(PAD_1)) {
field_0x101 = 0;
mStatus = 0;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_BACK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_BACK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
}
}
@@ -174,12 +174,12 @@ void dMenu_Calibration_c::step2_move_move() {
if (mDoCPd_c::getTrigA(PAD_1)) {
mProcess = PROC_STEP3_WAIT;
field_0xff = 0;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_NEXT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_NEXT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
} else if (mDoCPd_c::getTrigB(PAD_1)) {
mProcess = PROC_STEP1_WAIT;
field_0xff = 1;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_BACK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_BACK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
}
}
@@ -231,13 +231,13 @@ void dMenu_Calibration_c::step3_move_move() {
if (mDoCPd_c::getTrigA(PAD_1)) {
mStatus = 0;
field_0x101 = 1;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_BACK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_BACK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
setCalibrationValue();
} else if (mDoCPd_c::getTrigB(PAD_1)) {
mProcess = PROC_STEP2_WAIT;
field_0xff = 1;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_BACK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_BACK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
}
}
src/d/menu/d_menu_insect.cpp
+3 -3
View File
@@ -600,7 +600,7 @@ void dMenu_Insect_c::explain_close_init() {
if (field_0xf6 == 1) {
dMeter2Info_setInsectSelectType(getInsectItemID(field_0xf4, field_0xf5));
}
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
mpExpParent->alphaAnimeStart(0);
}
@@ -899,11 +899,11 @@ void dMenu_Insect_c::cursorMove() {
setAButtonString(0);
}
if (dpd != 0) {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_CURSOR_ITEM, NULL, 1, 0, 1.0f, 1.0f, -1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_ITEM, NULL, 1, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
dMeter2Info_set2DVibration();
} else {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_CURSOR_ITEM, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_ITEM, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
}
}
src/d/menu/d_menu_option.cpp
+25 -25
View File
@@ -1486,7 +1486,7 @@ void dMenu_Option_c::atten_move() {
(this->*tv_process[field_0x3f3])();
} else if (downTrigger) {
field_0x3ef = 1;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_CURSOR_OPTION, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_OPTION, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
} else if (leftTrigger) {
if (field_0x3e4 == 0) {
@@ -1498,7 +1498,7 @@ void dMenu_Option_c::atten_move() {
}
field_0x3ef = 3;
field_0x3f5 = 0;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_OPTION_SWITCH, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_OPTION_SWITCH, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
} else if (rightTrigger) {
if (field_0x3e4 == 0) {
@@ -1510,7 +1510,7 @@ void dMenu_Option_c::atten_move() {
}
field_0x3ef = 3;
field_0x3f5 = 0;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_OPTION_SWITCH, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_OPTION_SWITCH, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
} else {
changeTVCheck();
@@ -1560,11 +1560,11 @@ void dMenu_Option_c::vib_move() {
(this->*tv_process[field_0x3f3])();
} else if (upTrigger) {
field_0x3ef = 0;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_CURSOR_OPTION, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_OPTION, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
} else if (downTrigger) {
field_0x3ef = 2;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_CURSOR_OPTION, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_OPTION, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
} else if (leftTrigger) {
if (isRumbleSupported()) {
@@ -1578,7 +1578,7 @@ void dMenu_Option_c::vib_move() {
}
field_0x3ef = 3;
field_0x3f5 = 1;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_OPTION_SWITCH, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_OPTION_SWITCH, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
}
} else if (rightTrigger) {
@@ -1593,7 +1593,7 @@ void dMenu_Option_c::vib_move() {
}
field_0x3ef = 3;
field_0x3f5 = 1;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_OPTION_SWITCH, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_OPTION_SWITCH, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
}
} else {
@@ -1644,7 +1644,7 @@ void dMenu_Option_c::sound_move() {
(this->*tv_process[field_0x3f3])();
} else if (upTrigger) {
field_0x3ef = 1;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_CURSOR_OPTION, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_OPTION, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
} else if (leftTrigger) {
if (field_0x3e9 == 2) {
@@ -1655,15 +1655,15 @@ void dMenu_Option_c::sound_move() {
field_0x3da = -5;
switch (field_0x3e9) {
case 0:
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_SOUND_MODE_MONO, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_SOUND_MODE_MONO, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
break;
case 1:
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_SOUND_MODE_STEREO, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_SOUND_MODE_STEREO, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
break;
case 2:
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_SOUND_MODE_SURROUND, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_SOUND_MODE_SURROUND, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
break;
}
@@ -1671,7 +1671,7 @@ void dMenu_Option_c::sound_move() {
setSoundMode(dMo_soundMode[field_0x3e9]);
field_0x3ef = 3;
field_0x3f5 = 2;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_OPTION_SWITCH, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_OPTION_SWITCH, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
} else if (rightTrigger) {
if (field_0x3e9 == 0) {
@@ -1682,15 +1682,15 @@ void dMenu_Option_c::sound_move() {
field_0x3da = 5;
switch (field_0x3e9) {
case 0:
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_SOUND_MODE_MONO, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_SOUND_MODE_MONO, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
break;
case 1:
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_SOUND_MODE_STEREO, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_SOUND_MODE_STEREO, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
break;
case 2:
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_SOUND_MODE_SURROUND, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_SOUND_MODE_SURROUND, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
break;
}
@@ -1698,7 +1698,7 @@ void dMenu_Option_c::sound_move() {
setSoundMode(dMo_soundMode[field_0x3e9]);
field_0x3ef = 3;
field_0x3f5 = 2;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_OPTION_SWITCH, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_OPTION_SWITCH, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
} else {
changeTVCheck();
@@ -1815,7 +1815,7 @@ void dMenu_Option_c::confirm_open_init() {
changeBarColor(true);
setAButtonString(0);
setBButtonString(0);
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_EXP_WIN_OPEN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_OPEN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
#else
#pragma push
@@ -1890,7 +1890,7 @@ void dMenu_Option_c::confirm_move_move() {
dMeter2Info_set2DVibrationM();
} else if (rightTrigger != 0) {
if (field_0x3f9 != 0) {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
field_0x3fa = field_0x3f9;
field_0x3f9 = 0;
@@ -1899,7 +1899,7 @@ void dMenu_Option_c::confirm_move_move() {
}
} else if (leftTrigger != 0) {
if (field_0x3f9 != 1) {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
field_0x3fa = field_0x3f9;
field_0x3f9 = 1;
@@ -1948,7 +1948,7 @@ void dMenu_Option_c::confirm_close_init() {
changeBarColor(false);
setAButtonString(0);
setBButtonString(0);
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
#else
#pragma push
@@ -2064,7 +2064,7 @@ void dMenu_Option_c::tv_open2_move() {
// Matches with literals
void dMenu_Option_c::tv_move_move() {
if (mDoCPd_c::getTrigZ(0) != 0 || mDoCPd_c::getTrigA(0) != 0) {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_BACK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_BACK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
field_0x3f3 = 3;
setAButtonString(0x40C);
setBButtonString(0x3F9);
@@ -3085,7 +3085,7 @@ void dMenu_Option_c::setZButtonString(u16 i_stringID) {
// Matches with literals
void dMenu_Option_c::changeTVCheck() {
if (mDoCPd_c::getTrigZ(0) != 0) {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_CHANGE_WINDOW, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_CHANGE_WINDOW, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
field_0x3f3 = 0;
setAButtonString(0);
@@ -3460,10 +3460,10 @@ asm void dMenu_Option_c::yesnoCursorShow() {
void dMenu_Option_c::yesNoSelectStart() {
if (field_0x3f9 != 0) {
if (field_0x3f7 == 1) {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_NAME_OK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_NAME_OK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
} else {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_BACK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_BACK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
}
yesnoMenuMoveAnmInitSet(0x47D, 0x473);
@@ -3517,7 +3517,7 @@ asm void dMenu_Option_c::yesnoSelectAnmSet() {
#ifdef NONMATCHING
// Matches with literals
void dMenu_Option_c::yesnoCancelAnmSet() {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
mpDrawCursor->setAlphaRate(0.0f);
yesnoMenuMoveAnmInitSet(0x47D, 0x473);
}
src/d/menu/d_menu_save.cpp
+3 -3
View File
@@ -2175,7 +2175,7 @@ void dMenu_save_c::endingDataCheck() {
/* 801F2F4C-801F2FB4 1ED88C 0068+00 1/0 0/0 0/0 .text retryQuestion0__12dMenu_save_cFv */
void dMenu_save_c::retryQuestion0() {
if (Z2GetAudioMgr()->mSeqMgr.checkBgmIDPlaying(Z2BGM_GAME_OVER) != true) {
if (Z2GetAudioMgr()->checkBgmIDPlaying(Z2BGM_GAME_OVER) != true) {
mYesNoCursor = CURSOR_YES;
msgTxtSet(0x4BC, false); // Retry?
mMenuProc = PROC_RETRY_QUESTION1;
@@ -2292,11 +2292,11 @@ int dMenu_save_c::YesNoSelect() {
}
break;
case 1:
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
break;
case 255:
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
break;
}
src/d/menu/d_menu_skill.cpp
+5 -5
View File
@@ -306,19 +306,19 @@ void dMenu_Skill_c::wait_move() {
mStatus = 3;
} else if (mDoCPd_c::getTrigA(0)) {
mProcess = PROC_WAIT_MOVE;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_EXP_WIN_OPEN, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_OPEN, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
dMeter2Info_set2DVibration();
} else if (mpStick->checkUpTrigger()) {
if (mIndex) {
mIndex--;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_CURSOR_ITEM, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_ITEM, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
}
} else if (mpStick->checkDownTrigger() && mIndex < mSkillNum - 1) {
mIndex++;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_CURSOR_ITEM, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_ITEM, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
}
if (oldIndex != mIndex) {
@@ -378,13 +378,13 @@ void dMenu_Skill_c::read_move_init() {
*/
void dMenu_Skill_c::read_move_move() {
if (mDoCPd_c::getTrigA(0) != 0) {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
dMeter2Info_set2DVibration();
mProcess = PROC_MOVE_MOVE;
} else if ((mDoCPd_c::getTrig(0) & 0x200) != 0) {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
dMeter2Info_set2DVibration();
mProcess = PROC_MOVE_MOVE;
src/d/menu/d_menu_window.cpp
+13 -13
View File
@@ -1259,7 +1259,7 @@ SECTION_SDATA2 static u8 lit_4152[4] = {
void dMw_c::collect_open_init(u8 param_0) {
field_0x144 = 3;
dMeter2Info_setWindowStatus(3);
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_IN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_IN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMw_fade_out();
dMw_capture_create();
field_0x153 = 0;
@@ -1327,10 +1327,10 @@ void dMw_c::collect_close_init(u8 param_0) {
mpMenuCollect->getSubWindowOpenCheck() == 5 ||
mpMenuCollect->getSubWindowOpenCheck() == 6)
{
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_SUB_IN, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_SUB_IN, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
} else {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
dMeter2Info_set2DVibrationM();
}
@@ -1429,7 +1429,7 @@ void dMw_c::collect_letter_move_init(u8 param_0) {
/* 801FA6E0-801FA738 1F5020 0058+00 1/0 0/0 0/0 .text collect_letter_close_init__5dMw_cFUc */
void dMw_c::collect_letter_close_init(u8 param_0) {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
dMw_fade_out();
}
@@ -1450,7 +1450,7 @@ void dMw_c::collect_fishing_move_init(u8 param_0) {
/* 801FA798-801FA7F0 1F50D8 0058+00 1/0 0/0 0/0 .text collect_fishing_close_init__5dMw_cFUc */
void dMw_c::collect_fishing_close_init(u8 param_0) {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
dMw_fade_out();
}
@@ -1474,7 +1474,7 @@ void dMw_c::collect_skill_move_init(u8 param_0) {
/* 801FA850-801FA8A8 1F5190 0058+00 1/0 0/0 0/0 .text collect_skill_close_init__5dMw_cFUc
*/
void dMw_c::collect_skill_close_init(u8 param_0) {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
dMw_fade_out();
}
@@ -1497,7 +1497,7 @@ void dMw_c::collect_insect_move_init(u8 param_0) {
/* 801FA90C-801FA964 1F524C 0058+00 1/0 0/0 0/0 .text collect_insect_close_init__5dMw_cFUc */
void dMw_c::collect_insect_close_init(u8 param_0) {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
dMw_fade_out();
}
@@ -1506,7 +1506,7 @@ void dMw_c::collect_insect_close_init(u8 param_0) {
void dMw_c::insect_open_init(u8 param_0) {
field_0x144 = 10;
dMeter2Info_setWindowStatus(10);
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_SUB_IN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_SUB_IN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMw_fade_out();
dMw_capture_create();
}
@@ -1523,7 +1523,7 @@ void dMw_c::insect_move_init(u8 param_0) {
/* 801FA9F0-801FAA48 1F5330 0058+00 1/0 0/0 0/0 .text insect_close_init__5dMw_cFUc */
void dMw_c::insect_close_init(u8 param_0) {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
dMw_fade_out();
}
@@ -1644,7 +1644,7 @@ void dMw_c::fmap_move_proc() {
if (g_fmapHIO.field_0x2f9 != 0) {
mMenuStatus = FMAP_CLOSE;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
}
@@ -1691,7 +1691,7 @@ void dMw_c::dmap_move_proc() {
dMeter2Info_setMapKeyDirection(0x200);
mMenuStatus = DMAP_CLOSE;
mpMenuDmap->setInOutDir(3);
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
} else if (nextStatus == 2) {
dMeter2Info_setMapStatus(0);
@@ -1699,7 +1699,7 @@ void dMw_c::dmap_move_proc() {
mMenuStatus = DMAP_CLOSE;
dMeter2Info_getMeterMapClass()->setDispPosOutsideFlg_SE_On();
mpMenuDmap->setInOutDir(1);
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
} else if (nextStatus == 3) {
if (dMeterMap_c::isEnableDispMapAndMapDispSizeTypeNo()) {
@@ -1710,7 +1710,7 @@ void dMw_c::dmap_move_proc() {
mMenuStatus = DMAP_CLOSE;
mpMenuDmap->setInOutDir(2);
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
} else {
mpMenuDmap->_move();
src/d/meter/d_meter2.cpp
+8 -8
View File
@@ -958,7 +958,7 @@ void dMeter2_c::moveKantera() {
}
if (!dComIfGp_getOxygenShowFlag() && mpMeterDraw->getMeterGaugeAlphaRate(1) > 0.0f) {
Z2GetAudioMgr()->mSeMgr.seStartLevel(Z2SE_OIL_METER_RECOVER, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStartLevel(Z2SE_OIL_METER_RECOVER, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
}
draw_kantera = true;
@@ -970,13 +970,13 @@ void dMeter2_c::moveKantera() {
if (mNowOil == 0) {
if (mpMeterDraw->getMeterGaugeAlphaRate(1) > 0.0f) {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_OIL_METER_FINISH, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_OIL_METER_FINISH, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
}
} else if (((f32)dComIfGs_getOil() / (f32)dComIfGs_getMaxOil()) <= 0.1f &&
mpMeterDraw->getMeterGaugeAlphaRate(1) > 0.0f)
{
Z2GetAudioMgr()->mSeMgr.seStartLevel(Z2SE_OIL_METER_LESS, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStartLevel(Z2SE_OIL_METER_LESS, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
}
@@ -1055,7 +1055,7 @@ void dMeter2_c::moveOxygen() {
if (dComIfGp_getOxygen() < dComIfGp_getMaxOxygen() &&
mpMeterDraw->getMeterGaugeAlphaRate(2) > 0.0f)
{
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SWIM_TIMER_RECOVER, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SWIM_TIMER_RECOVER, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
}
}
@@ -1098,7 +1098,7 @@ void dMeter2_c::moveOxygen() {
if ((f32)dComIfGp_getOxygen() / (f32)dComIfGp_getMaxOxygen() > 0.5f &&
mpMeterDraw->getMeterGaugeAlphaRate(2) > 0.0f)
{
Z2GetAudioMgr()->mSeMgr.seStartLevel(Z2SE_SWIM_TIMER_DEC, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStartLevel(Z2SE_SWIM_TIMER_DEC, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
}
@@ -1160,11 +1160,11 @@ void dMeter2_c::moveLightDrop() {
dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea()))
{
var_r28 = 2;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_LIGHT_DROP_COMPLETE, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_LIGHT_DROP_COMPLETE, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
} else if (mLightDropNum < dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea())) {
var_r28 = 1;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_LIGHT_DROP_GET, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_LIGHT_DROP_GET, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
}
@@ -3051,7 +3051,7 @@ void dMeter2_c::alphaAnimeOxygen() {
field_0x1e1 = 1;
if (mpMeterDraw->getMeterGaugeAlphaRate(2) > 0.0f) {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SWIM_TIMER_ON, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SWIM_TIMER_ON, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
}
}
src/d/meter/d_meter2_draw.cpp
+2 -2
View File
@@ -1570,7 +1570,7 @@ void dMeter2Draw_c::drawKanteraScreen(u8 i_meterType) {
playOxygenBpkAnimation(mpOxygenBpk[0]);
if (mMeterAlphaRate[i_meterType] > 0.0f) {
Z2GetAudioMgr()->mSeMgr.seStartLevel(Z2SE_SWIM_TIMER_BLINK_2, NULL, 0, 0, 1.0f,
Z2GetAudioMgr()->seStartLevel(Z2SE_SWIM_TIMER_BLINK_2, NULL, 0, 0, 1.0f,
1.0f, -1.0f, -1.0f, 0);
}
} else if (oxygen_percent <= 0.5f) {
@@ -1579,7 +1579,7 @@ void dMeter2Draw_c::drawKanteraScreen(u8 i_meterType) {
playOxygenBpkAnimation(mpOxygenBpk[1]);
if (mMeterAlphaRate[i_meterType] > 0.0f) {
Z2GetAudioMgr()->mSeMgr.seStartLevel(Z2SE_SWIM_TIMER_BLINK_1, NULL, 0, 0, 1.0f,
Z2GetAudioMgr()->seStartLevel(Z2SE_SWIM_TIMER_BLINK_1, NULL, 0, 0, 1.0f,
1.0f, -1.0f, -1.0f, 0);
}
} else {
src/d/meter/d_meter_map.cpp
+15 -15
View File
@@ -541,7 +541,7 @@ void dMeterMap_c::ctrlShowMap() {
if (!dMeter2Info_isGameStatus(1)) {
if (!isMapOpenCheck() && !isEventRunCheck()) {
if (dMw_LEFT_TRIGGER() || dMw_RIGHT_TRIGGER()) {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
}
} else {
@@ -550,7 +550,7 @@ void dMeterMap_c::ctrlShowMap() {
dMeter2Info_getPauseStatus() == 2 || dMeter2Info_getPauseStatus() == 6) {
if (dMeter2Info_getMapStatus() == 0 && field_0x2d == 0) {
setDispPosInsideFlg_SE_On();
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
dMeter2Info_setMapStatus(1);
@@ -578,7 +578,7 @@ void dMeterMap_c::ctrlShowMap() {
break;
}
dMeter2Info_setMapKeyDirection(0x400);
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
}
@@ -589,7 +589,7 @@ void dMeterMap_c::ctrlShowMap() {
if (isDmapScreen()) {
if (dMeter2Info_getMapStatus() == 0 && field_0x2d == 0) {
setDispPosInsideFlg_SE_On();
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f,
1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
dMeter2Info_setMapStatus(1);
@@ -598,7 +598,7 @@ void dMeterMap_c::ctrlShowMap() {
if (dMeter2Info_getMapStatus() == 1 && field_0x2d != 0) {
dMeter2Info_setMapStatus(6);
dMeter2Info_setMapKeyDirection(0x400);
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f,
1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
}
@@ -711,7 +711,7 @@ void dMeterMap_c::meter_map_move(u32 param_0) {
if (!dMeter2Info_isSub2DStatus(1) && isFmapScreen()) {
dMeter2Info_setMapStatus(3);
dMeter2Info_setMapKeyDirection(0x400);
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
dMeter2Info_set2DVibration();
}
@@ -723,7 +723,7 @@ void dMeterMap_c::meter_map_move(u32 param_0) {
if (isFmapScreen() || isDmapScreen()) {
dMeter2Info_setMapStatus(2);
dMeter2Info_setMapKeyDirection(0x200);
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
}
@@ -735,7 +735,7 @@ void dMeterMap_c::meter_map_move(u32 param_0) {
if (isFmapScreen() || isDmapScreen()) {
dMeter2Info_setMapStatus(2);
dMeter2Info_setMapKeyDirection(0x400);
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
}
@@ -764,7 +764,7 @@ void dMeterMap_c::keyCheck() {
if (dMeter2Info_getMapStatus() == 1) {
if (isDispPosInsideFlg()) {
setDispPosOutsideFlg_SE_On();
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_CLOSE_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
dMeter2Info_setMapStatus(0);
}
@@ -772,12 +772,12 @@ void dMeterMap_c::keyCheck() {
if (!dMeter2Info_isSub2DStatus(1) && (isFmapScreen() || isDmapScreen())) {
dMeter2Info_setMapStatus(2);
dMeter2Info_setMapKeyDirection(0x200);
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
dMeter2Info_set2DVibration();
} else {
setDispPosInsideFlg_SE_On();
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
dMeter2Info_set2DVibration();
dMeter2Info_setMapStatus(1);
@@ -789,7 +789,7 @@ void dMeterMap_c::keyCheck() {
if (isEnableDispMapAndMapDispSizeTypeNo()) {
if (!isDispPosInsideFlg()) {
setDispPosInsideFlg_SE_On();
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
dMeter2Info_setMapStatus(1);
@@ -797,7 +797,7 @@ void dMeterMap_c::keyCheck() {
} else if (!dMeter2Info_isSub2DStatus(1) && (isFmapScreen() || isDmapScreen())) {
dMeter2Info_setMapStatus(2);
dMeter2Info_setMapKeyDirection(0x400);
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
dMeter2Info_set2DVibration();
}
@@ -805,12 +805,12 @@ void dMeterMap_c::keyCheck() {
if (!dMeter2Info_isSub2DStatus(1) && (isFmapScreen() || isDmapScreen())) {
dMeter2Info_setMapStatus(2);
dMeter2Info_setMapKeyDirection(0x400);
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
dMeter2Info_set2DVibration();
} else {
setDispPosOutsideFlg_SE_On();
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_CLOSE_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
dMeter2Info_setMapStatus(0);
}
src/d/msg/d_msg_class.cpp
+11 -11
View File
@@ -1052,24 +1052,24 @@ void jmessage_tReference::selectMessage() {
if (mSelectNum == 2) {
if (mSelectPos == 1) {
mSelectPos = 0;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
}
} else if (mSelectNum == 3 && mSelectPos != 0) {
mSelectPos--;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
}
} else if (mpStick->checkDownTrigger()) {
if (mSelectNum == 2) {
if (mSelectPos == 0) {
mSelectPos = 1;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
}
} else if (mSelectNum == 3 && mSelectPos < 2) {
mSelectPos++;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
}
}
@@ -1077,24 +1077,24 @@ void jmessage_tReference::selectMessage() {
if (mSelectPos == 1) {
mSelectPos = 0;
getObjectPtr()->getSequenceProcessor()->calcStringLength();
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
} else if (mSelectPos == 2) {
mSelectPos = 1;
getObjectPtr()->getSequenceProcessor()->calcStringLength();
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
}
} else if (mpStick->checkRightTrigger()) {
if (mSelectPos == 0) {
mSelectPos = 1;
getObjectPtr()->getSequenceProcessor()->calcStringLength();
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
} else if (mSelectPos == 1 && mSelectNum == 3) {
mSelectPos = 2;
getObjectPtr()->getSequenceProcessor()->calcStringLength();
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
}
}
@@ -1162,13 +1162,13 @@ void jmessage_tReference::inputNumber() {
} else if (mpStick->checkLeftTrigger()) {
if (mInputFigure < max_figure) {
mInputFigure++;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
}
} else if (mpStick->checkRightTrigger()) {
if (mInputFigure != 0) {
mInputFigure--;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
}
}
@@ -1182,7 +1182,7 @@ void jmessage_tReference::inputNumber() {
}
if (new_input_val != input_val) {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
Z2GetAudioMgr()->seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
}
src/d/s/d_s_logo.cpp
+2 -2
View File
@@ -536,7 +536,7 @@ static int phase_1(dScnLogo_c* logo) {
}
if (!mDoAud_zelAudio_c::isInitFlag() ||
Z2AudioMgr::getInterface()->mSceneMgr.checkFirstWaves()) {
Z2AudioMgr::getInterface()->checkFirstWaves()) {
return 0;
}
@@ -572,7 +572,7 @@ int dScnLogo_c::create() {
mpHeap->becomeCurrentHeap();
dvdDataLoad();
Z2AudioMgr::getInterface()->mSceneMgr.loadStaticWaves();
Z2AudioMgr::getInterface()->loadStaticWaves();
mDoGph_gInf_c::setTickRate((OS_BUS_CLOCK / 4) / 60);
mDoGph_gInf_c::waitBlanking(0);
field_0x20a = 0;
src/m_Do/m_Do_audio.cpp
+7 -7
View File
@@ -141,7 +141,7 @@ static void mDoAud_Create() {
if (g_mDoAud_audioHeap != NULL) {
s32 groupID = JKRHeap::sCurrentHeap->changeGroupID(5);
(*(mDoAud_zelAudio_c*)g_mDoAud_zelAudio)
.mAudioMgr.init(g_mDoAud_audioHeap, 0xA00000, l_affCommand->getMemAddress(),
.init(g_mDoAud_audioHeap, 0xA00000, l_affCommand->getMemAddress(),
l_arcCommand->getArchive());
JKRHeap::sCurrentHeap->changeGroupID(groupID);
g_mDoAud_audioHeap->adjustSize();
@@ -151,7 +151,7 @@ static void mDoAud_Create() {
}
(*(mDoAud_zelAudio_c*)g_mDoAud_zelAudio)
.mAudioMgr.mStatusMgr.setEventBit(dComIfGs_getPEventBit());
.setEventBit(dComIfGs_getPEventBit());
(*(mDoAud_zelAudio_c*)g_mDoAud_zelAudio).reset();
u32 soundMode = OSGetSoundMode();
@@ -172,29 +172,29 @@ void mDoAud_Execute() {
mDoAud_Create();
}
} else {
(*(mDoAud_zelAudio_c*)g_mDoAud_zelAudio).mAudioMgr.gframeProcess();
(*(mDoAud_zelAudio_c*)g_mDoAud_zelAudio).gframeProcess();
}
}
/* 800071BC-800071F8 001AFC 003C+00 0/0 3/3 0/0 .text mDoAud_setSceneName__FPCcll */
void mDoAud_setSceneName(char const* spot, s32 room, s32 layer) {
Z2AudioMgr::getInterface()->mSceneMgr.setSceneName((char*)spot, room, layer);
Z2AudioMgr::getInterface()->setSceneName((char*)spot, room, layer);
}
/* 800071F8-80007224 001B38 002C+00 0/0 1/1 0/0 .text mDoAud_load1stDynamicWave__Fv */
s32 mDoAud_load1stDynamicWave() {
Z2AudioMgr::getInterface()->mSceneMgr.load1stDynamicWave();
Z2AudioMgr::getInterface()->load1stDynamicWave();
return 1;
}
/* 80007224-80007254 001B64 0030+00 0/0 2/2 0/0 .text mDoAud_setFadeOutStart__FUc */
void mDoAud_setFadeOutStart(u8 param_0) {
Z2AudioMgr::getInterface()->mSceneMgr.setFadeOutStart((u8)param_0);
Z2AudioMgr::getInterface()->setFadeOutStart((u8)param_0);
}
/* 80007254-80007284 001B94 0030+00 0/0 2/2 1/1 .text mDoAud_setFadeInStart__FUc */
void mDoAud_setFadeInStart(u8 param_0) {
Z2AudioMgr::getInterface()->mSceneMgr.setFadeInStart((u8)param_0);
Z2AudioMgr::getInterface()->setFadeInStart((u8)param_0);
}
/* 80007284-800072C4 001BC4 0040+00 0/0 1/1 0/0 .text mDoAud_resetProcess__Fv */
src/msg/scrn/d_msg_scrn_explain.cpp
+5 -5
View File
@@ -398,9 +398,9 @@ void dMsgScrnExplain_c::move_select_proc() {
if (field_0x64 == 2) {
if (mSelCursor == 0) {
dMeter2Info_setWarpStatus(3);
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_WARP_MAP_DECIDE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_WARP_MAP_DECIDE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
} else {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
} else if (field_0x66 == 0) {
mDoAud_seStart(Z2SE_SY_TALK_CURSOR_OK, NULL, 0, 0);
@@ -409,7 +409,7 @@ void dMsgScrnExplain_c::move_select_proc() {
mDoAud_seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0);
} else if (field_0x58 && (checkTriggerB() || mForceSelect)) {
if (field_0x64 == 2) {
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
} else if (field_0x64 == 1) {
if (field_0x63 != 0xff) {
mSelCursor = field_0x63;
@@ -422,11 +422,11 @@ void dMsgScrnExplain_c::move_select_proc() {
} else if (mpSelect_c->isSelect() && field_0x44->checkUpTrigger()) {
if (mSelCursor == 1) {
mSelCursor = 0;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
} else if (mpSelect_c->isSelect() && field_0x44->checkDownTrigger() && mSelCursor == 0) {
mSelCursor = 1;
Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
}