From 9037c8e8f15b396e068fbf1065526e639880b9f2 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sat, 13 Jan 2024 01:50:54 -0500 Subject: [PATCH] Use BGM/SE enums for JAIZelBasic --- include/JAZelAudio/JAIZelBasic.h | 10 +- include/JAZelAudio/JAZelAudio_BGM.h | 105 +++++++++ include/d/d_save_event_bit.inc | 1 + include/f_op/f_op_actor_mng.h | 12 +- include/m_Do/m_Do_audio.h | 12 +- src/JAZelAudio/JAIZelBasic.cpp | 280 +++++++++++----------- src/JAZelAudio/JAIZelScene.cpp | 344 ++++++++++++++-------------- src/d/actor/d_a_player_main.cpp | 12 +- src/d/d_com_inf_game.cpp | 7 +- src/d/d_event_data.cpp | 4 +- src/d/d_kankyo.cpp | 2 +- 11 files changed, 458 insertions(+), 331 deletions(-) diff --git a/include/JAZelAudio/JAIZelBasic.h b/include/JAZelAudio/JAIZelBasic.h index 4406719ac..7875e786f 100644 --- a/include/JAZelAudio/JAIZelBasic.h +++ b/include/JAZelAudio/JAIZelBasic.h @@ -168,13 +168,7 @@ public: void isTaktUsing() {} struct scene_info_s { - u16 field_0x0; - u8 field_0x2; - u8 field_0x3; - }; - - struct isle_info_s { - u16 field_0x0; + u16 bgmNum; u8 field_0x2; u8 field_0x3; }; @@ -190,7 +184,7 @@ public: static u8 m_dy_wave_set_1st[][2]; static u8 m_dy_wave_set_2nd[][2]; static scene_info_s m_scene_info[]; - static isle_info_s m_isle_info[]; + static scene_info_s m_isle_info[]; static const char* spot_dir_name[]; // static mIsleArea; diff --git a/include/JAZelAudio/JAZelAudio_BGM.h b/include/JAZelAudio/JAZelAudio_BGM.h index d1e46b640..2ae5721b1 100644 --- a/include/JAZelAudio/JAZelAudio_BGM.h +++ b/include/JAZelAudio/JAZelAudio_BGM.h @@ -2,6 +2,7 @@ #define JAZELAUDIO_BGM_H enum { + // These are official BGM sequence enum names extracted from WWHD. JA_BGM_SE_SEQUENCE = 0x80000800, JA_BGM_ISLAND_LINK = 0x80000001, JA_BGM_ITEM_GET = 0x80000002, @@ -102,4 +103,108 @@ enum { JA_BGM_TRIFORCE_DEMO = 0x80000061, }; +enum { + // These are official BGM stream enum names extracted from WWHD. + JA_STRM_PROLOGUE = 0xC0000000, + JA_STRM_DEMO_TETRA_FLY = 0xC0000001, + JA_STRM_BTD_START = 0xC0000002, + JA_STRM_BOSS_CLEAR = 0xC0000003, + JA_STRM_DEMO_MJ_SISTER = 0xC0000004, + JA_STRM_DEMO_GO_MAJU = 0xC0000005, + JA_STRM_MJ_DEMO_INTRO = 0xC0000006, + JA_STRM_BKM_START = 0xC0000007, + JA_STRM_DK_START = 0xC0000008, + JA_STRM_BST_START = 0xC0000009, + JA_STRM_DEMO_14_01 = 0xC000000A, + JA_STRM_DEMO_14_02 = 0xC000000B, + JA_STRM_DEMO_14_03 = 0xC000000C, + JA_STRM_DEMO_14_04 = 0xC000000D, + JA_STRM_DEMO_14_05 = 0xC000000E, + JA_STRM_RANE_START = 0xC000000F, + JA_STRM_DEMO_15_01 = 0xC0000010, + JA_STRM_DEMO_15_02 = 0xC0000011, + JA_STRM_DEMO_15_03 = 0xC0000012, + JA_STRM_DEMO_15_04 = 0xC0000013, + JA_STRM_DEMO_04_01 = 0xC0000014, + JA_STRM_DEMO_04_02 = 0xC0000015, + JA_STRM_DEMO_08_01 = 0xC0000016, + JA_STRM_DEMO_08_02 = 0xC0000017, + JA_STRM_DEMO_08_03 = 0xC0000018, + JA_STRM_BST_CLEAR = 0xC0000019, + JA_STRM_DK_CLEAR = 0xC000001A, + JA_STRM_BWD_CLEAR = 0xC000001B, + JA_STRM_DEMO_05_01 = 0xC000001C, + JA_STRM_DEMO_24_01 = 0xC000001D, + JA_STRM_DEMO_24_02 = 0xC000001E, + JA_STRM_DEMO_24_03 = 0xC000001F, + JA_STRM_DEMO_24_04 = 0xC0000020, + JA_STRM_DEMO_24_05 = 0xC0000021, + JA_STRM_DEMO_24_06 = 0xC0000022, + JA_STRM_DEMO_33_01 = 0xC0000023, + JA_STRM_DEMO_01_01 = 0xC0000024, + JA_STRM_DEMO_19_01 = 0xC0000025, + JA_STRM_DEMO_25_01 = 0xC0000026, + JA_STRM_DEMO_25_02 = 0xC0000027, + JA_STRM_DEMO_25_03 = 0xC0000028, + JA_STRM_DEMO_25_04 = 0xC0000029, + JA_STRM_DEMO_18_01 = 0xC000002A, + JA_STRM_DEMO_26_01 = 0xC000002B, + JA_STRM_DEMO_26_02 = 0xC000002C, + JA_STRM_DEMO_23_01 = 0xC000002D, + JA_STRM_DEMO_23_02 = 0xC000002E, + JA_STRM_DEMO_23_03 = 0xC000002F, + JA_STRM_DEMO_23_04 = 0xC0000030, + JA_STRM_DEMO_23_05 = 0xC0000031, + JA_STRM_DEMO_44_01 = 0xC0000032, + JA_STRM_DEMO_43_01 = 0xC0000033, + JA_STRM_BPW_START = 0xC0000034, + JA_STRM_DEMO_27_01 = 0xC0000035, + JA_STRM_DEMO_28_01 = 0xC0000036, + JA_STRM_DEMO_28_02 = 0xC0000037, + JA_STRM_DEMO_29_01 = 0xC0000038, + JA_STRM_DEMO_36_01 = 0xC0000039, + JA_STRM_DEMO_34_01 = 0xC000003A, + JA_STRM_DEMO_30_01 = 0xC000003B, + JA_STRM_DEMO_31_01 = 0xC000003C, + JA_STRM_DEMO_32_01 = 0xC000003D, + JA_STRM_TITLE = 0xC000003E, + JA_STRM_DEMO_42_01 = 0xC000003F, + JA_STRM_DEMO_42_02 = 0xC0000040, + JA_STRM_DEMO_42_03 = 0xC0000041, + JA_STRM_DEMO_42_04 = 0xC0000042, + JA_STRM_DEMO_42_05 = 0xC0000043, + JA_STRM_DEMO_42_06 = 0xC0000044, + JA_STRM_DEMO_35_01 = 0xC0000045, + JA_STRM_DEMO_35_02 = 0xC0000046, + JA_STRM_DEMO_35_03 = 0xC0000047, + JA_STRM_DEMO_35_04 = 0xC0000048, + JA_STRM_DEMO_42_07 = 0xC0000049, + JA_STRM_DEMO_42_LAUGH = 0xC000004A, +}; + +enum { + // These are special hardcoded BGM sequence numbers that are checked in JAIZelBasic::bgmStart. + // These enum names are not official. + JA_BGM_UNK_105 = 0x80000105, // 0x05 JA_BGM_KINDAN_BOSS + JA_BGM_UNK_110 = 0x80000110, // 0x14 JA_BGM_DK_BATTLE + JA_BGM_UNK_111 = 0x80000111, // 0x14 JA_BGM_DK_BATTLE + JA_BGM_UNK_112 = 0x80000112, // 0x14 JA_BGM_DK_BATTLE + JA_BGM_UNK_115 = 0x80000115, // 0x15 JA_BGM_DIE_LINK + JA_BGM_UNK_120 = 0x80000120, // 0x23 JA_BGM_BST_BATTLE + JA_BGM_UNK_121 = 0x80000121, // 0x23 JA_BGM_BST_BATTLE + JA_BGM_UNK_122 = 0x80000122, // 0x23 JA_BGM_BST_BATTLE + JA_BGM_UNK_123 = 0x80000123, // 0x23 JA_BGM_BST_BATTLE + JA_BGM_UNK_124 = 0x80000124, // 0x29 JA_BGM_RANE_BATTLE + JA_BGM_UNK_125 = 0x80000125, // 0x28 JA_BGM_KAMI_TOWER + JA_BGM_UNK_126 = 0x80000126, // 0x28 JA_BGM_KAMI_TOWER + JA_BGM_UNK_130 = 0x80000130, // 0x42 JA_BGM_D_GANON_1 + JA_BGM_UNK_131 = 0x80000131, // 0x42 JA_BGM_D_GANON_1 + JA_BGM_UNK_132 = 0x80000132, // 0x42 JA_BGM_D_GANON_1 + JA_BGM_UNK_133 = 0x80000133, // 0x42 JA_BGM_D_GANON_1 + JA_BGM_UNK_140 = 0x80000140, // 0x48 JA_BGM_BIG_POW + JA_BGM_UNK_150 = 0x80000150, // 0x49 JA_BGM_PAST_BIG_POW + JA_BGM_UNK_151 = 0x80000151, // 0x4A JA_BGM_PAST_BKM + JA_BGM_UNK_152 = 0x80000152, // 0x4C JA_BGM_PAST_RANE +}; + #endif /* JAZELAUDIO_BGM_H */ \ No newline at end of file diff --git a/include/d/d_save_event_bit.inc b/include/d/d_save_event_bit.inc index 987ee707d..9ba262f20 100644 --- a/include/d/d_save_event_bit.inc +++ b/include/d/d_save_event_bit.inc @@ -3,6 +3,7 @@ class dSv_evtBit_c { public: enum { + ENDLESS_NIGHT = 0x0A02, MET_KORL = 0x0F80, RODE_KORL = 0x2A08, BARRIER_BREAK = 0x2C02, diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index fa2335f8f..0b7c4be1e 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -566,16 +566,16 @@ inline f32 fopAcM_searchPlayerDistance(fopAc_ac_c* actor) { s8 dComIfGp_getReverb(int roomNo); -inline void fopAcM_seStartCurrent(fopAc_ac_c* actor, u32 sfxID, u32 param_2) { - mDoAud_seStart(sfxID, &actor->current.pos, param_2, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); +inline void fopAcM_seStartCurrent(fopAc_ac_c* actor, u32 i_seNum, u32 param_2) { + mDoAud_seStart(i_seNum, &actor->current.pos, param_2, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); } -inline void fopAcM_seStart(fopAc_ac_c* actor, u32 sfxID, u32 param_2) { - mDoAud_seStart(sfxID, &actor->mEyePos, param_2, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); +inline void fopAcM_seStart(fopAc_ac_c* actor, u32 i_seNum, u32 param_2) { + mDoAud_seStart(i_seNum, &actor->mEyePos, param_2, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); } -inline void fopAcM_monsSeStart(fopAc_ac_c* actor, u32 sfxID, u32 param_2) { - mDoAud_monsSeStart(sfxID, &actor->mEyePos, fopAcM_GetID(actor), 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); +inline void fopAcM_monsSeStart(fopAc_ac_c* actor, u32 i_seNum, u32 param_2) { + mDoAud_monsSeStart(i_seNum, &actor->mEyePos, fopAcM_GetID(actor), 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); } void fopDwTg_ToDrawQ(create_tag_class*, int); diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index 23421b14c..bfa36f3ce 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -113,16 +113,16 @@ inline void mDoAud_resetProcess() { } } -inline void mDoAud_seStart(u32 i_sfxID, Vec* i_sePos = NULL, u32 param_2 = 0, s8 i_reverb = 0) { - mDoAud_zelAudio_c::getInterface()->seStart(i_sfxID, i_sePos, param_2, i_reverb, 1.0f, 1.0f, -1.0f, -1.0f, 0); +inline void mDoAud_seStart(u32 i_seNum, Vec* i_sePos = NULL, u32 param_2 = 0, s8 i_reverb = 0) { + mDoAud_zelAudio_c::getInterface()->seStart(i_seNum, i_sePos, param_2, i_reverb, 1.0f, 1.0f, -1.0f, -1.0f, 0); } inline void mDoAud_bgmSetSwordUsing(s32 param_1) { mDoAud_zelAudio_c::getInterface()->bgmSetSwordUsing(param_1); } -inline void mDoAud_seStop(u32 i_sfxID, s32 param_2) { - mDoAud_zelAudio_c::getInterface()->seStop(i_sfxID, param_2); +inline void mDoAud_seStop(u32 i_seNum, s32 param_2) { + mDoAud_zelAudio_c::getInterface()->seStop(i_seNum, param_2); } inline void mDoAud_seStopActor(Vec* param_1, u32 param_2) { @@ -141,8 +141,8 @@ inline void mDoAud_linkVoiceStart(u32 param_0, Vec* i_sePos, u8 param_3, s8 para mDoAud_zelAudio_c::getInterface()->linkVoiceStart(param_0, i_sePos, param_3, param_4); } -inline void mDoAud_monsSeStart(u32 sfxID, Vec* param_1, u32 param_2, u32 param_3, s8 i_reverb) { - mDoAud_zelAudio_c::getInterface()->monsSeStart(sfxID, param_1, param_2, param_3, i_reverb); +inline void mDoAud_monsSeStart(u32 i_seNum, Vec* param_1, u32 param_2, u32 param_3, s8 i_reverb) { + mDoAud_zelAudio_c::getInterface()->monsSeStart(i_seNum, param_1, param_2, param_3, i_reverb); } inline void mDoAud_onEnemyDamage() { diff --git a/src/JAZelAudio/JAIZelBasic.cpp b/src/JAZelAudio/JAIZelBasic.cpp index 23f846776..a64d5413e 100644 --- a/src/JAZelAudio/JAIZelBasic.cpp +++ b/src/JAZelAudio/JAIZelBasic.cpp @@ -159,11 +159,11 @@ void JAIZelBasic::processHeartGaugeSound() { if (dComIfGp_event_getMode() == 0 && field_0x0040) { if (field_0x0034 && field_0x0206 == 0) { if (field_0x0034 <= 2) { - seStart(0xd2, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + seStart(JA_SE_ALMOST_DIE_ALERM_3, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); } else if (field_0x0034 <= 4) { - seStart(0xd1, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + seStart(JA_SE_ALMOST_DIE_ALERM_2, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); } else if (field_0x0034 <= 6) { - seStart(0xd0, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + seStart(JA_SE_ALMOST_DIE_ALERM_1, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); } } field_0x0040--; @@ -262,7 +262,7 @@ void JAIZelBasic::bgmStreamPrepare(u32 param_1) { if (mpStreamBgmSound) { mpStreamBgmSound->setPrepareFlag(1); } - if (param_1 == 0xc0000009) { + if (param_1 == JA_STRM_BST_START) { field_0x00be = 1; } field_0x007c = param_1; @@ -278,7 +278,7 @@ void JAIZelBasic::bgmStreamPlay() { mpStreamBgmSound->start(0); } switch (field_0x007c) { - case -0x3fffffff: + case JA_STRM_DEMO_TETRA_FLY: field_0x00ba = 1; if (mpMainBgmSound) { mpMainBgmSound->stop(30); @@ -286,7 +286,7 @@ void JAIZelBasic::bgmStreamPlay() { field_0x1f3c = 0; field_0x0201 = 1; break; - case -0x40000000: + case JA_STRM_PROLOGUE: if (mpMainBgmSound) { mpMainBgmSound->stop(30); } @@ -305,7 +305,7 @@ void JAIZelBasic::bgmStart(u32, u32, s32) { /* 802A4658-802A4770 .text bgmStop__11JAIZelBasicFUll */ void JAIZelBasic::bgmStop(u32 param_1, s32 param_2) { - if (field_0x0078 != -0x7ffffffd && field_0x0078 != -0x7ffffff0) { + if (field_0x0078 != JA_BGM_GOMA && field_0x0078 != JA_BGM_GOMA_2) { mSomeSpecialBGMFlag = 0; } if (mpMainBgmSound) { @@ -376,7 +376,7 @@ void JAIZelBasic::bgmBattleGFrame() { /* 802A5548-802A55AC .text stopBattleBgm__11JAIZelBasicFv */ void JAIZelBasic::stopBattleBgm() { - if (mpSubBgmSound && (field_0x0074 == -0x7ffffffc || field_0x0074 == -0x7fffffe4)) { + if (mpSubBgmSound && (field_0x0074 == JA_BGM_BATTLE_NORM || field_0x0074 == JA_BGM_SEA_ENEMY)) { mpSubBgmSound->stop(45); mpSubBgmSound = NULL; field_0x0074 = -1; @@ -388,10 +388,10 @@ void JAIZelBasic::bgmNowKaitengiri() { /* Nonmatching */ if (field_0x00c8 == 0 && mpSubBgmSound) { switch (field_0x0074) { - case -0x7ffffffc: + case JA_BGM_BATTLE_NORM: mpSubBgmSound->setTrackVolume(JAIZelParam::BTL_KAITENGIRI_TRACK, 1.0, JAIZelParam::BTL_KAITENGIRI_FADEIN_TIME); break; - case -0x7fffffe6: + case JA_BGM_MBOSS_S: mpSubBgmSound->setTrackVolume(JAIZelParam::MBOSS_BTL_KAITENGIRI_TRACK, 1.0, JAIZelParam::BTL_KAITENGIRI_FADEIN_TIME); break; default: @@ -413,11 +413,11 @@ void JAIZelBasic::bgmSetSwordUsing(s32 param_1) { /* 802A57A4-802A5818 .text onEnemyDamage__11JAIZelBasicFv */ void JAIZelBasic::onEnemyDamage() { - if (field_0x0074 == -0x7fffffe4) { + if (field_0x0074 == JA_BGM_SEA_ENEMY) { if (mpSubBgmSound) { mpSubBgmSound->setPortData(9, 1); } - } else if (field_0x0074 == -0x7ffffffc) { + } else if (field_0x0074 == JA_BGM_BATTLE_NORM) { if (mpSubBgmSound) { JASystem::TTrack* track = &mpSubBgmSound->getSeqParameter()->field_0x1360; if (track) { @@ -512,15 +512,15 @@ void JAIZelBasic::bgmMuteMtDragon() { /* 802A5ACC-802A5BA4 .text enemyNearBy__11JAIZelBasicFv */ void JAIZelBasic::enemyNearBy() { - if (mpMainBgmSound && field_0x0078 == -0x7fffffec && field_0x00cb == -1) { + if (mpMainBgmSound && field_0x0078 == JA_BGM_DK_BATTLE && field_0x00cb == -1) { if (field_0x00cc == 0) { - bgmStart(0x80000111, 0, 0); + bgmStart(JA_BGM_UNK_111, 0, 0); } else { - bgmStart(0x80000112, 0, 0); + bgmStart(JA_BGM_UNK_112, 0, 0); } } - if (mpMainBgmSound && field_0x0078 == -0x7fffffeb && field_0x00cb == -1) { - bgmStart(0x80000115, 0, 0); + if (mpMainBgmSound && field_0x0078 == JA_BGM_MJ_TOWER_BATTLE && field_0x00cb == -1) { + bgmStart(JA_BGM_UNK_115, 0, 0); } field_0x00cb = JAIZelParam::COMMON_BATTLE_FO_DELAY; } @@ -542,7 +542,7 @@ void JAIZelBasic::bgmAllMute(u32 param_1) { void JAIZelBasic::taktModeMute() { field_0x0098 = 0.0f; if (mpMainBgmSound) { - if (field_0x0078 != -0x7fffffdf && field_0x0078 != -0x7fffffde) { + if (field_0x0078 != JA_BGM_TAKT_MAKORE && field_0x0078 != JA_BGM_TAKT_MEDRI) { mpMainBgmSound->setVolume(calcMainBgmVol(), 10, 0); } else { field_0x0098 = 1.0f; @@ -560,7 +560,7 @@ void JAIZelBasic::taktModeMuteOff() { if (mpMainBgmSound) { mpMainBgmSound->setVolume(calcMainBgmVol(), 10, 0); } - if (field_0x0074 == -0x7fffffcf) { + if (field_0x0074 == JA_BGM_TAKT_KAZE) { field_0x008c = 1.0; if (mpMainBgmSound) { mpMainBgmSound->setVolume(calcMainBgmVol(), 45, 0); @@ -584,7 +584,7 @@ void JAIZelBasic::cbPracticeProcess() { /* 802A6434-802A6508 .text cbPracticeStop__11JAIZelBasicFv */ void JAIZelBasic::cbPracticeStop() { - if (mpSubBgmSound && (field_0x0074 == -0x7fffffca || field_0x0074 == -0x7fffffc9)) { + if (mpSubBgmSound && (field_0x0074 == JA_BGM_CB_NEXTYEAR || field_0x0074 == JA_BGM_CB_NEXTYEAR_W)) { mpSubBgmSound->stop(15); mpSubBgmSound = NULL; field_0x0074 = -1; @@ -600,7 +600,7 @@ void JAIZelBasic::cbPracticeStop() { /* 802A6508-802A6570 .text checkCbPracticePlay__11JAIZelBasicFv */ BOOL JAIZelBasic::checkCbPracticePlay() { BOOL result; - if (checkSubBgmPlaying() == 1 && (checkPlayingSubBgmFlag() == -0x7fffffca || checkPlayingSubBgmFlag() == -0x7fffffc9)) { + if (checkSubBgmPlaying() == 1 && (checkPlayingSubBgmFlag() == JA_BGM_CB_NEXTYEAR || checkPlayingSubBgmFlag() == JA_BGM_CB_NEXTYEAR_W)) { result = 1; } else { result = 0; @@ -620,10 +620,10 @@ void JAIZelBasic::startLandingDemo() { case 1: break; case 2: - bgmStart(0x8000003a, 0, 0); + bgmStart(JA_BGM_ISLAND_DRAGON, 0, 0); break; case 3: - bgmStart(0x80000039, 0, 0); + bgmStart(JA_BGM_ISLAND_WOOD, 0, 0); break; case 4: break; @@ -680,20 +680,20 @@ void JAIZelBasic::initSe() { } /* 802A6720-802A8550 .text seStart__11JAIZelBasicFUlP3VecUlScffffUc */ -void JAIZelBasic::seStart(u32, Vec*, u32, s8, f32, f32, f32, f32, u8) { +void JAIZelBasic::seStart(u32 i_seNum, Vec*, u32, s8, f32, f32, f32, f32, u8) { /* Nonmatching */ } /* 802A8550-802A85F4 .text seStop__11JAIZelBasicFUll */ -void JAIZelBasic::seStop(u32 param_1, s32 param_2) { - if (param_1 == -1) { +void JAIZelBasic::seStop(u32 i_seNum, s32 param_2) { + if (i_seNum == -1) { return; } - if (param_1 == 0x280d) { + if (i_seNum == JA_SE_LK_RUN_SLIP) { param_2 = 8; } for (int i = 0; i < 24; i++) { - if (field_0x0134[i] == param_1 && field_0x00d4[i]) { + if (field_0x0134[i] == i_seNum && field_0x00d4[i]) { field_0x00d4[i]->stop(param_2); field_0x00d4[i] = NULL; field_0x0134[i] = 0; @@ -744,7 +744,7 @@ void JAIZelBasic::monsSeInit() { } /* 802A8958-802A8B24 .text monsSeStart__11JAIZelBasicFUlP3VecUlUlSc */ -void JAIZelBasic::monsSeStart(u32, Vec*, u32, u32, s8) { +void JAIZelBasic::monsSeStart(u32 i_seNum, Vec*, u32, u32, s8) { /* Nonmatching */ } @@ -874,7 +874,7 @@ void JAIZelBasic::setOutputMode(u32 param_1) { void JAIZelBasic::talkIn() { if (field_0x0064[0] != 1 && isDemo() != 1 && field_0x0098 != 0.0f) { field_0x0084 = JAIZelParam::VOL_BGM_TALKING; - if (mpMainBgmSound && field_0x0078 != -0x7fffffaf && field_0x0078 != -0x7fffffae) { + if (mpMainBgmSound && field_0x0078 != JA_BGM_BIRDMAN_GOAL && field_0x0078 != JA_BGM_BIRDMAN_FAIL) { mpMainBgmSound->setVolume(calcMainBgmVol(), 2, 0); } field_0x00a0 = JAIZelParam::VOL_BGM_TALKING; @@ -894,7 +894,7 @@ void JAIZelBasic::talkIn() { /* 802A9A20-802A9B74 .text talkOut__11JAIZelBasicFv */ void JAIZelBasic::talkOut() { - if (checkStreamPlaying(0xc0000006) == 1) { + if (checkStreamPlaying(JA_STRM_MJ_DEMO_INTRO) == 1) { return; } field_0x0084 = JAIZelParam::VOL_BGM_DEFAULT; @@ -1026,17 +1026,17 @@ void JAIZelBasic::changeSeaBgm() { /* 802AA2B8-802AA348 .text startIsleBgm__11JAIZelBasicFv */ void JAIZelBasic::startIsleBgm() { - /* Nonmatching */ if (!checkDayTime()) { return; } - u32 r4; + u32 bgmNum; if (mIslandRoomNo == 44 && checkEventBit(0xe20) == 1) { - r4 = 0x80000055; + bgmNum = JA_BGM_ISLAND_LINK_3; } else { - r4 = expandSceneBgmNum(m_isle_info[mIslandRoomNo].field_0x0); + bgmNum = m_isle_info[mIslandRoomNo].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } - bgmStart(r4, 0, 1); + bgmStart(bgmNum, 0, 1); } /* 802AA348-802AA378 .text setLinkGroupInfo__11JAIZelBasicFUc */ @@ -1069,9 +1069,8 @@ BOOL JAIZelBasic::getMapInfoGround(u32) { } /* 802AA390-802AACE8 .text setScene__11JAIZelBasicFllll */ -void JAIZelBasic::setScene(s32 param_1, s32 param_2, s32 param_3, s32 param_4) { - /* Nonmatching */ - OSReport("[JAIZelBasic::setScene] num = %d, start = %d, layer = %d (%d)\n", param_1, param_2, param_4, param_3); +void JAIZelBasic::setScene(s32 param_1, s32 roomNo, s32 param_3, s32 layerNo) { + OSReport("[JAIZelBasic::setScene] num = %d, start = %d, layer = %d (%d)\n", param_1, roomNo, layerNo, param_3); if (param_1 >= 0x79) { OSReport("[JAIZelBasic::setScene] too large scene number\n"); return; @@ -1079,53 +1078,58 @@ void JAIZelBasic::setScene(s32 param_1, s32 param_2, s32 param_3, s32 param_4) { if (field_0x022c != 0) { return; } - u32 r27; - field_0x00bd = field_0x00cd = r27 = 0; + u32 bgmNum; + field_0x00bd = field_0x00cd = bgmNum = 0; u32 var1; u32 var2; if (param_1 == 0x12) { - if (param_2 > 0) { - mIslandRoomNo = param_2; + if (roomNo > 0) { + mIslandRoomNo = roomNo; } else { - mIslandRoomNo = r27; + mIslandRoomNo = bgmNum; } OSReport(" --- Isle = %d\n", mIslandRoomNo); if (param_3 != 1) { if (mIslandRoomNo == 44) { - if (param_4 == 10) { - r27 = 0; + if (layerNo == 10) { + bgmNum = 0; } else if (checkEventBit(0x3510) == 0) { - r27 = 0x80000038; + bgmNum = JA_BGM_ISLAND_LINK_0; } else if (checkEventBit(1) == 1 && checkEventBit(0x101) == 0) { - r27 = 0x8000000e; + bgmNum = JA_BGM_ISLAND_LINK_2; } else if (checkEventBit(0x101) == 1 && checkEventBit(0xe20) == 0) { - r27 = 0; + bgmNum = 0; } else if (checkEventBit(0xe20) == 1) { - r27 = 0x80000055; + bgmNum = JA_BGM_ISLAND_LINK_3; } else { - r27 = expandSceneBgmNum(m_isle_info[mIslandRoomNo].field_0x0); + bgmNum = m_isle_info[mIslandRoomNo].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } else if (mIslandRoomNo == 11) { if (checkEventBit(0x2e01) == 0) { - r27 = 0; + bgmNum = 0; } else { - r27 = expandSceneBgmNum(m_isle_info[mIslandRoomNo].field_0x0); + bgmNum = m_isle_info[mIslandRoomNo].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } else if (mIslandRoomNo == 13) { - if (param_4 == 8 || param_4 == 10 || param_4 == 11) { - r27 = 0; + if (layerNo == 8 || layerNo == 10 || layerNo == 11) { + bgmNum = 0; } else { - r27 = expandSceneBgmNum(m_isle_info[13].field_0x0); + bgmNum = m_isle_info[mIslandRoomNo].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } else if (mIslandRoomNo == 14) { - if (param_4 == 2 || param_4 == 3) { - r27 = 0; + if (layerNo == 2 || layerNo == 3) { + bgmNum = 0; field_0x00bd = 1; } else { - r27 = expandSceneBgmNum(m_isle_info[14].field_0x0); + bgmNum = m_isle_info[mIslandRoomNo].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } else { - r27 = expandSceneBgmNum(m_isle_info[mIslandRoomNo].field_0x0); + bgmNum = m_isle_info[mIslandRoomNo].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } var1 = m_isle_info[mIslandRoomNo].field_0x2; @@ -1133,134 +1137,153 @@ void JAIZelBasic::setScene(s32 param_1, s32 param_2, s32 param_3, s32 param_4) { } else { mIslandRoomNo = 0; if (param_1 == 16 && checkEventBit(0x280) == 0) { - r27 = 0x80000016; + bgmNum = JA_BGM_FIND_TETRA; } else if (param_1 == 19 && checkEventBit(0x801) == 0) { - r27 = 0; + bgmNum = 0; } else if (param_1 == 2 && field_0x0021 != 0) { if (g_dComIfG_gameInfo.save.getSavedata().mMemory[3].getBit().isDungeonItem(5)) { field_0x00cd = 1; } if (g_dComIfG_gameInfo.save.getSavedata().mMemory[3].getBit().isDungeonItem(3)) { - r27 = expandSceneBgmNum(m_scene_info[1].field_0x0); + bgmNum = m_scene_info[1].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); field_0x0204 = 1; } else { - r27 = expandSceneBgmNum(m_scene_info[2].field_0x0); + bgmNum = m_scene_info[param_1].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } else if (param_1 == 7 && field_0x0021 != 0) { if (g_dComIfG_gameInfo.save.getSavedata().mMemory[4].getBit().isDungeonItem(5)) { field_0x00cd = 1; } if (g_dComIfG_gameInfo.save.getSavedata().mMemory[4].getBit().isDungeonItem(3)) { - r27 = expandSceneBgmNum(m_scene_info[3].field_0x0); + bgmNum = m_scene_info[3].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } else { - r27 = expandSceneBgmNum(m_scene_info[7].field_0x0); + bgmNum = m_scene_info[param_1].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } else if (param_1 == 37 && field_0x0021 != 0) { if (g_dComIfG_gameInfo.save.getSavedata().mMemory[5].getBit().isDungeonItem(5)) { field_0x00cd = 1; } if (g_dComIfG_gameInfo.save.getSavedata().mMemory[5].getBit().isDungeonItem(3)) { - r27 = expandSceneBgmNum(m_scene_info[10].field_0x0); + bgmNum = m_scene_info[10].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } else { - r27 = expandSceneBgmNum(m_scene_info[37].field_0x0); + bgmNum = m_scene_info[param_1].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } else if (param_1 == 24 && field_0x0021 != 0) { if (g_dComIfG_gameInfo.save.getSavedata().mMemory[7].getBit().isDungeonItem(5)) { field_0x00cd = 1; } - if (param_4 - 8 <= 2 || param_4 == 11) { - r27 = 0; + if (layerNo == 8 || layerNo == 9 || layerNo == 10 || layerNo == 11) { + bgmNum = 0; } else if (g_dComIfG_gameInfo.save.getSavedata().mMemory[7].getBit().isDungeonItem(3)) { - r27 = 0; + bgmNum = 0; } else { - r27 = expandSceneBgmNum(m_scene_info[24].field_0x0); + bgmNum = m_scene_info[param_1].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } else if (param_1 == 45 && field_0x0021 != 0) { if (g_dComIfG_gameInfo.save.getSavedata().mMemory[6].getBit().isDungeonItem(5)) { field_0x00cd = 1; } - if (param_4 - 8 <= 2 || param_4 == 11) { - r27 = 0; + if (layerNo == 8 || layerNo == 9 || layerNo == 10 || layerNo == 11) { + bgmNum = 0; } else if (g_dComIfG_gameInfo.save.getSavedata().mMemory[6].getBit().isDungeonItem(3)) { - r27 = 0; + bgmNum = 0; } else { - r27 = expandSceneBgmNum(m_scene_info[45].field_0x0); + bgmNum = m_scene_info[param_1].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } else if (param_1 == 54) { if (checkEventBit(0x2d04) == 0) { - r27 = 0x80000034; + bgmNum = JA_BGM_HYRULE_OFF; } else { - r27 = expandSceneBgmNum(m_scene_info[54].field_0x0); + bgmNum = m_scene_info[param_1].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } else if (param_1 == 53) { - if (param_4 - 8 <= 2 || param_4 == 11) { - r27 = 0; + if (layerNo == 8 || layerNo == 9 || layerNo == 10 || layerNo == 11) { + bgmNum = 0; } else { - r27 = expandSceneBgmNum(m_scene_info[53].field_0x0); + bgmNum = m_scene_info[param_1].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } else if (param_1 == 54) { - if (param_4 - 8 <= 2 || param_4 == 11) { - r27 = 0; + if (layerNo == 8 || layerNo == 9 || layerNo == 10 || layerNo == 11) { + bgmNum = 0; } else { - r27 = expandSceneBgmNum(m_scene_info[54].field_0x0); + bgmNum = m_scene_info[param_1].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } else if (param_1 == 89) { - if (param_4 - 8 <= 2 || param_4 == 11) { - r27 = 0; + if (layerNo == 8 || layerNo == 9 || layerNo == 10 || layerNo == 11) { + bgmNum = 0; } else if (checkEventBit(0x2d04) == 0) { - r27 = 0x80000034; + bgmNum = JA_BGM_HYRULE_OFF; } else { - r27 = expandSceneBgmNum(m_scene_info[89].field_0x0); + bgmNum = m_scene_info[param_1].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } else if (param_1 == 39) { - if (param_4 - 8 <= 2 || param_4 == 11) { - r27 = 0; + if (layerNo == 8 || layerNo == 9 || layerNo == 10 || layerNo == 11) { + bgmNum = 0; } else { - r27 = expandSceneBgmNum(m_scene_info[39].field_0x0); + bgmNum = m_scene_info[param_1].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } else if (param_1 == 41) { - if (param_4 - 8 <= 2 || param_4 == 11) { - r27 = 0; + if (layerNo == 8 || layerNo == 9 || layerNo == 10 || layerNo == 11) { + bgmNum = 0; } else { - r27 = expandSceneBgmNum(m_scene_info[41].field_0x0); + bgmNum = m_scene_info[param_1].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } else if (param_1 == 22) { - if (param_4 - 8 <= 2 || param_4 == 11) { - r27 = 0; + if (layerNo == 8 || layerNo == 9 || layerNo == 10 || layerNo == 11) { + bgmNum = 0; } else { - r27 = expandSceneBgmNum(m_scene_info[22].field_0x0); + bgmNum = m_scene_info[param_1].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } else if (param_1 == 44) { - if (param_4 - 8 <= 2 || param_4 == 11) { - r27 = 0; + if (layerNo == 8 || layerNo == 9 || layerNo == 10 || layerNo == 11) { + bgmNum = 0; } else { - r27 = expandSceneBgmNum(m_scene_info[44].field_0x0); + bgmNum = m_scene_info[param_1].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } else if (param_1 == 11) { - if (param_4 == 9 && field_0x0043 == 0) { - r27 = 0; + if (layerNo == 9 && field_0x0043 == 0) { + bgmNum = 0; } else if (field_0x0043 && checkEventBit(0x2a20) == 0) { - r27 = 0x80000044; + bgmNum = JA_BGM_BAACHAN; } else { - r27 = expandSceneBgmNum(m_scene_info[11].field_0x0); + bgmNum = m_scene_info[param_1].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } else if (param_1 == 32) { - if (checkEventBit(0x2110) == 0 && checkEventBit(0xa02) == 1) { - r27 = 0x8000003d; + if (checkEventBit(0x2110) == 0 && checkEventBit(dSv_evtBit_c::ENDLESS_NIGHT) == 1) { + bgmNum = JA_BGM_PIRATE_DEMO5; } else { - r27 = expandSceneBgmNum(m_scene_info[32].field_0x0); + bgmNum = m_scene_info[param_1].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } } else { - r27 = expandSceneBgmNum(m_scene_info[param_1].field_0x0); + bgmNum = m_scene_info[param_1].bgmNum; + bgmNum = expandSceneBgmNum(bgmNum); } var1 = m_scene_info[param_1].field_0x2; var2 = m_scene_info[param_1].field_0x3; } - sceneChange(r27, var1, var2, param_3); + sceneChange(bgmNum, var1, var2, param_3); field_0x022d = 0; field_0x0220 = param_1; field_0x022c = 1; - field_0x0239 = param_4; + field_0x0239 = layerNo; } /* 802AACE8-802AAD0C .text expandSceneBgmNum__11JAIZelBasicFUl */ @@ -1279,9 +1302,8 @@ void JAIZelBasic::checkLinkOnBoardSea() { } /* 802AAD94-802AAE80 .text setSceneName__11JAIZelBasicFPcll */ -void JAIZelBasic::setSceneName(char* param_1, s32 param_2, s32 param_3) { - /* Nonmatching */ - OSReport("[JAIZelBasic::setSceneName] spot = %s, room = %d\n"); +void JAIZelBasic::setSceneName(char* param_1, s32 roomNo, s32 param_3) { + OSReport("[JAIZelBasic::setSceneName] spot = %s, room = %d\n", param_1, roomNo); int id = spotNameToId(param_1); if (id == 0x75) { for (int i = 0; i < 24; i++) { @@ -1298,7 +1320,7 @@ void JAIZelBasic::setSceneName(char* param_1, s32 param_2, s32 param_3) { } else { field_0x0066 = 0; } - setScene(id, param_2, 0, param_3); + setScene(id, roomNo, 0, param_3); } /* 802AAE80-802AAF04 .text spotNameToId__11JAIZelBasicFPc */ @@ -1389,11 +1411,11 @@ void JAIZelBasic::setLinkBootsType(s32 param_1) { /* 802ABA9C-802ABB18 .text setLinkOnBoard__11JAIZelBasicFl */ void JAIZelBasic::setLinkOnBoard(s32 param_1) { field_0x0047 = param_1; - if (mpSubBgmSound && field_0x0074 == -0x7fffffe4) { + if (mpSubBgmSound && field_0x0074 == JA_BGM_SEA_ENEMY) { if (field_0x0047 == 1) { - bgmMute(&mpSubBgmSound, 0x8000001c, 0, 10); + bgmMute(&mpSubBgmSound, JA_BGM_SEA_ENEMY, 0, 10); } else { - bgmMute(&mpSubBgmSound, 0x8000001c, 1, 10); + bgmMute(&mpSubBgmSound, JA_BGM_SEA_ENEMY, 1, 10); } } } @@ -1410,23 +1432,23 @@ int JAIZelBasic::checkStreamPlaying(u32) { /* 802ABC3C-802ABC88 .text stWaterLevelUp__11JAIZelBasicFv */ void JAIZelBasic::stWaterLevelUp() { - if (field_0x00b7 == 0 && field_0x0078 == -0x7fffffd8) { - bgmStart(0x80000125, 1, 0); + if (field_0x00b7 == 0 && field_0x0078 == JA_BGM_KAMI_TOWER) { + bgmStart(JA_BGM_UNK_125, 1, 0); } } /* 802ABC88-802ABCD4 .text stWaterLevelDown__11JAIZelBasicFv */ void JAIZelBasic::stWaterLevelDown() { - if (field_0x00b7 == 0 && field_0x0078 == -0x7fffffd8) { - bgmStart(0x80000028, 1, 0); + if (field_0x00b7 == 0 && field_0x0078 == JA_BGM_KAMI_TOWER) { + bgmStart(JA_BGM_KAMI_TOWER, 1, 0); } } /* 802ABCD4-802ABD34 .text stSkyCloisters__11JAIZelBasicFv */ void JAIZelBasic::stSkyCloisters() { - if (field_0x0078 == -0x7fffffd8) { + if (field_0x0078 == JA_BGM_KAMI_TOWER) { if (field_0x00b7 == 0) { - bgmStart(0x80000126, 1, 0); + bgmStart(JA_BGM_UNK_126, 1, 0); } field_0x00b7 = 4; } @@ -1477,7 +1499,7 @@ void JAIZelBasic::processTime() { if (field_0x0030 < 0x1400 && time >= 0x1400) { mainBgmStopOnly(JAIZelParam::JAI_ZEL_NIGHT_FADEOUT_TIME); } else if (field_0x0030 < 0x53b && time >= 0x53b) { - bgmStart(0x8000001d, 0, 0); + bgmStart(JA_BGM_MORNING, 0, 0); field_0x0032 = 1; } } @@ -1487,7 +1509,7 @@ void JAIZelBasic::processTime() { /* 802ABF2C-802ABFC0 .text processMorningToNormal__11JAIZelBasicFv */ void JAIZelBasic::processMorningToNormal() { - if (field_0x0078 != -0x7fffffe3) { + if (field_0x0078 != JA_BGM_MORNING) { field_0x0032 = 0; return; } @@ -1495,7 +1517,7 @@ void JAIZelBasic::processMorningToNormal() { field_0x0094 = 1.0; f32 tmp; if (checkOnOuterSea(&tmp) >= 2) { - bgmStart(0x8000002e, 0, 1); + bgmStart(JA_BGM_SEA, 0, 1); } else { startIsleBgm(); } @@ -1567,9 +1589,9 @@ BOOL JAIZelBasic::isDemo() { /* 802AC788-802AC7E8 .text checkSeaBgmID__11JAIZelBasicFv */ u32 JAIZelBasic::checkSeaBgmID() { - if (checkEventBit(0xa02) == 1 && checkEventBit(0x3920) == 0) { - return 0x8000003c; + if (checkEventBit(dSv_evtBit_c::ENDLESS_NIGHT) == 1 && checkEventBit(0x3920) == 0) { + return JA_BGM_SEA_STORM; } else { - return 0x8000002e; + return JA_BGM_SEA; } } diff --git a/src/JAZelAudio/JAIZelScene.cpp b/src/JAZelAudio/JAIZelScene.cpp index c659bdd08..3068fa55e 100644 --- a/src/JAZelAudio/JAIZelScene.cpp +++ b/src/JAZelAudio/JAIZelScene.cpp @@ -84,180 +84,180 @@ u8 JAIZelBasic::m_dy_wave_set_2nd[][2] = { }; JAIZelBasic::scene_info_s JAIZelBasic::m_scene_info[] = { - {0x00, 0x00, 0x00}, - {0x06, 0x01, 0x05}, - {0x00, 0x01, 0x01}, - {0x26, 0x03, 0x05}, - {0x5E, 0x02, 0x05}, - {0x42, 0x17, 0x00}, - {0x42, 0x17, 0x00}, - {0x00, 0x03, 0x02}, - {0x07, 0x02, 0x05}, - {0x00, 0x07, 0x04}, - {0x28, 0x06, 0x05}, - {0x08, 0x1B, 0x00}, - {0x2C, 0x04, 0x00}, - {0x18, 0x09, 0x00}, - {0x1B, 0x10, 0x00}, - {0x2D, 0x12, 0x05}, - {0x17, 0x05, 0x03}, - {0x2A, 0x0E, 0x00}, - {0x00, 0x00, 0x00}, - {0x07, 0x02, 0x00}, - {0x42, 0x17, 0x00}, - {0x42, 0x17, 0x00}, - {0x57, 0x28, 0x00}, - {0x2F, 0x08, 0x05}, - {0x00, 0x08, 0x09}, - {0x42, 0x17, 0x00}, - {0x08, 0x09, 0x00}, - {0x40, 0x16, 0x00}, - {0x08, 0x0C, 0x00}, - {0x08, 0x1A, 0x00}, - {0x08, 0x0D, 0x00}, - {0x08, 0x1B, 0x00}, - {0x08, 0x1B, 0x00}, - {0x00, 0x19, 0x00}, - {0x08, 0x19, 0x00}, - {0x00, 0x01, 0x05}, - {0x43, 0x18, 0x0A}, - {0x00, 0x06, 0x07}, - {0x40, 0x16, 0x00}, - {0x3F, 0x0F, 0x0C}, - {0x00, 0x1C, 0x00}, - {0x57, 0x22, 0x00}, - {0x08, 0x09, 0x00}, - {0x08, 0x09, 0x00}, - {0x57, 0x27, 0x00}, - {0x00, 0x12, 0x0B}, - {0x42, 0x17, 0x00}, - {0x130, 0x17, 0x00}, - {0x131, 0x17, 0x00}, - {0x132, 0x17, 0x00}, - {0x133, 0x17, 0x00}, - {0x42, 0x17, 0x00}, - {0x42, 0x17, 0x00}, - {0x56, 0x25, 0x00}, - {0x35, 0x14, 0x00}, - {0x00, 0x1D, 0x00}, - {0x28, 0x06, 0x05}, - {0x00, 0x0F, 0x0C}, - {0x00, 0x1E, 0x00}, - {0x00, 0x1F, 0x00}, - {0x2D, 0x12, 0x05}, - {0x08, 0x19, 0x00}, - {0x26, 0x03, 0x05}, - {0x5E, 0x02, 0x05}, - {0x00, 0x07, 0x04}, - {0x2F, 0x08, 0x05}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x53, 0x24, 0x00}, - {0x53, 0x24, 0x00}, - {0x53, 0x24, 0x00}, - {0x53, 0x24, 0x00}, - {0x53, 0x24, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x23, 0x0D}, - {0x00, 0x06, 0x05}, - {0x08, 0x1B, 0x00}, - {0x08, 0x0C, 0x00}, - {0x58, 0x29, 0x00}, - {0x35, 0x14, 0x05}, - {0x00, 0x2C, 0x00}, - {0x00, 0x2A, 0x00}, - {0x00, 0x20, 0x00}, - {0x53, 0x24, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x08, 0x09, 0x00}, - {0x08, 0x09, 0x00}, - {0x08, 0x09, 0x00}, - {0x08, 0x09, 0x00}, - {0x08, 0x09, 0x00}, - {0x08, 0x09, 0x00}, - {0x08, 0x09, 0x00}, - {0x08, 0x09, 0x00}, - {0x18, 0x09, 0x00}, - {0x43, 0x18, 0x0A}, - {0x42, 0x17, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x58, 0x26, 0x00}, - {0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00}, + {0x0000, 0x00, 0x00}, + {JA_BGM_D_RYU_MT, 0x01, 0x05}, + {0x0000, 0x01, 0x01}, + {JA_BGM_D_FOREST, 0x03, 0x05}, + {JA_BGM_I_MAJU_2ND, 0x02, 0x05}, + {JA_BGM_D_GANON_1, 0x17, 0x00}, + {JA_BGM_D_GANON_1, 0x17, 0x00}, + {0x0000, 0x03, 0x02}, + {JA_BGM_I_MAJU, 0x02, 0x05}, + {0x0000, 0x07, 0x04}, + {JA_BGM_KAMI_TOWER, 0x06, 0x05}, + {JA_BGM_HOUSE, 0x1B, 0x00}, + {JA_BGM_PIRATE_C, 0x04, 0x00}, + {JA_BGM_HOUSE_G, 0x09, 0x00}, + {JA_BGM_BOAT_SHOP, 0x10, 0x00}, + {JA_BGM_D_EARTH, 0x12, 0x05}, + {JA_BGM_I_LINK_FOREST, 0x05, 0x03}, + {JA_BGM_PIRATE, 0x0E, 0x00}, + {0x0000, 0x00, 0x00}, + {JA_BGM_I_MAJU, 0x02, 0x00}, + {JA_BGM_D_GANON_1, 0x17, 0x00}, + {JA_BGM_D_GANON_1, 0x17, 0x00}, + {JA_BGM_JABOO_CAVE, 0x28, 0x00}, + {JA_BGM_D_WIND, 0x08, 0x05}, + {0x0000, 0x08, 0x09}, + {JA_BGM_D_GANON_1, 0x17, 0x00}, + {JA_BGM_HOUSE, 0x09, 0x00}, + {JA_BGM_DRUG_STORE, 0x16, 0x00}, + {JA_BGM_HOUSE, 0x0C, 0x00}, + {JA_BGM_HOUSE, 0x1A, 0x00}, + {JA_BGM_HOUSE, 0x0D, 0x00}, + {JA_BGM_HOUSE, 0x1B, 0x00}, + {JA_BGM_HOUSE, 0x1B, 0x00}, + {0x0000, 0x19, 0x00}, + {JA_BGM_HOUSE, 0x19, 0x00}, + {0x0000, 0x01, 0x05}, + {JA_BGM_D_GANON_2, 0x18, 0x0A}, + {0x0000, 0x06, 0x07}, + {JA_BGM_DRUG_STORE, 0x16, 0x00}, + {JA_BGM_I_WOOD_INNER, 0x0F, 0x0C}, + {0x0000, 0x1C, 0x00}, + {JA_BGM_JABOO_CAVE, 0x22, 0x00}, + {JA_BGM_HOUSE, 0x09, 0x00}, + {JA_BGM_HOUSE, 0x09, 0x00}, + {JA_BGM_JABOO_CAVE, 0x27, 0x00}, + {0x0000, 0x12, 0x0B}, + {JA_BGM_D_GANON_1, 0x17, 0x00}, + {JA_BGM_UNK_130, 0x17, 0x00}, + {JA_BGM_UNK_131, 0x17, 0x00}, + {JA_BGM_UNK_132, 0x17, 0x00}, + {JA_BGM_UNK_133, 0x17, 0x00}, + {JA_BGM_D_GANON_1, 0x17, 0x00}, + {JA_BGM_D_GANON_1, 0x17, 0x00}, + {JA_BGM_DEATH_VALLEY, 0x25, 0x00}, + {JA_BGM_HYRULE_ON, 0x14, 0x00}, + {0x0000, 0x1D, 0x00}, + {JA_BGM_KAMI_TOWER, 0x06, 0x05}, + {0x0000, 0x0F, 0x0C}, + {0x0000, 0x1E, 0x00}, + {0x0000, 0x1F, 0x00}, + {JA_BGM_D_EARTH, 0x12, 0x05}, + {JA_BGM_HOUSE, 0x19, 0x00}, + {JA_BGM_D_FOREST, 0x03, 0x05}, + {JA_BGM_I_MAJU_2ND, 0x02, 0x05}, + {0x0000, 0x07, 0x04}, + {JA_BGM_D_WIND, 0x08, 0x05}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_ELF, 0x24, 0x00}, + {JA_BGM_ELF, 0x24, 0x00}, + {JA_BGM_ELF, 0x24, 0x00}, + {JA_BGM_ELF, 0x24, 0x00}, + {JA_BGM_ELF, 0x24, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x23, 0x0D}, + {0x0000, 0x06, 0x05}, + {JA_BGM_HOUSE, 0x1B, 0x00}, + {JA_BGM_HOUSE, 0x0C, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x29, 0x00}, + {JA_BGM_HYRULE_ON, 0x14, 0x05}, + {0x0000, 0x2C, 0x00}, + {0x0000, 0x2A, 0x00}, + {0x0000, 0x20, 0x00}, + {JA_BGM_ELF, 0x24, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_HOUSE, 0x09, 0x00}, + {JA_BGM_HOUSE, 0x09, 0x00}, + {JA_BGM_HOUSE, 0x09, 0x00}, + {JA_BGM_HOUSE, 0x09, 0x00}, + {JA_BGM_HOUSE, 0x09, 0x00}, + {JA_BGM_HOUSE, 0x09, 0x00}, + {JA_BGM_HOUSE, 0x09, 0x00}, + {JA_BGM_HOUSE, 0x09, 0x00}, + {JA_BGM_HOUSE_G, 0x09, 0x00}, + {JA_BGM_D_GANON_2, 0x18, 0x0A}, + {JA_BGM_D_GANON_1, 0x17, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {JA_BGM_SUB_DUNGEON, 0x26, 0x00}, + {0x0000, 0x00, 0x00}, + {0x0000, 0x00, 0x00}, + {0x0000, 0x00, 0x00}, + {0x0000, 0x00, 0x00}, }; -JAIZelBasic::isle_info_s JAIZelBasic::m_isle_info[] = { - {0x0000, 0x00, 0x00}, - {0x0007, 0x02, 0x0A}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x2B, 0x06}, - {0x0000, 0x1A, 0x06}, - {0x003B, 0x0B, 0x00}, - {0x0000, 0x0A, 0x06}, - {0x003A, 0x19, 0x06}, - {0x0000, 0x15, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x11, 0x06}, - {0x0000, 0x21, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x10, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x13, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x13, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x21, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0039, 0x0F, 0x00}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0001, 0x0A, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x24, 0x06}, - {0x0000, 0x0A, 0x06}, - {0x0000, 0x15, 0x06}, - {0x0000, 0x0A, 0x06}, +JAIZelBasic::scene_info_s JAIZelBasic::m_isle_info[] = { + {0x0000, 0x00, 0x00}, + {JA_BGM_I_MAJU, 0x02, 0x0A}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x2B, 0x06}, + {0x0000, 0x1A, 0x06}, + {JA_BGM_ISLAND_TAURA, 0x0B, 0x00}, + {0x0000, 0x0A, 0x06}, + {JA_BGM_ISLAND_DRAGON, 0x19, 0x06}, + {0x0000, 0x15, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x11, 0x06}, + {0x0000, 0x21, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x10, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x13, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x13, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x21, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {JA_BGM_ISLAND_WOOD, 0x0F, 0x00}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {JA_BGM_ISLAND_LINK, 0x0A, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x24, 0x06}, + {0x0000, 0x0A, 0x06}, + {0x0000, 0x15, 0x06}, + {0x0000, 0x0A, 0x06}, }; const char* JAIZelBasic::spot_dir_name[] = { diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index fd851a71b..288b84710 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -268,18 +268,18 @@ void daPy_matAnm_c::calc(J3DMaterial* mat) const { } /* 80103074-801030BC .text seStartOnlyReverb__9daPy_lk_cFUl */ -void daPy_lk_c::seStartOnlyReverb(u32 sfxID) { - mDoAud_seStart(sfxID, ¤t.pos, 0, mReverb); +void daPy_lk_c::seStartOnlyReverb(u32 i_seNum) { + mDoAud_seStart(i_seNum, ¤t.pos, 0, mReverb); } /* 801030BC-80103104 .text seStartMapInfo__9daPy_lk_cFUl */ -void daPy_lk_c::seStartMapInfo(u32 sfxID) { - mDoAud_seStart(sfxID, ¤t.pos, mMtrlSndId, mReverb); +void daPy_lk_c::seStartMapInfo(u32 i_seNum) { + mDoAud_seStart(i_seNum, ¤t.pos, mMtrlSndId, mReverb); } /* 80103104-8010314C .text seStartSwordCut__9daPy_lk_cFUl */ -void daPy_lk_c::seStartSwordCut(u32 sfxID) { - mDoAud_seStart(sfxID, &mSwordTopPos, 0, mReverb); +void daPy_lk_c::seStartSwordCut(u32 i_seNum) { + mDoAud_seStart(i_seNum, &mSwordTopPos, 0, mReverb); } /* 8010314C-801031A4 .text voiceStart__9daPy_lk_cFUl */ diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 752ba23e1..0d518677d 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -1096,7 +1096,12 @@ BOOL dComIfGs_checkSeaLandingEvent(s8 i_roomNo) { }; static landing_event l_landingEvent[] = { - {1, 0x3040}, {4, 0x2E02}, {13, 0x902}, {23, 0xA02}, {41, 0xA20}, {45, 0x2E04}, + {1, 0x3040}, + {4, 0x2E02}, + {13, 0x902}, + {23, dSv_evtBit_c::ENDLESS_NIGHT}, + {41, 0xA20}, + {45, 0x2E04}, }; landing_event* event_check = l_landingEvent; diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp index 9cc2882aa..d2d27fa67 100644 --- a/src/d/d_event_data.cpp +++ b/src/d/d_event_data.cpp @@ -405,10 +405,10 @@ void dEvDtStaff_c::specialProcSound() { mDoAud_bgmStreamPlay(); break; case 2: // STRM_DEMO_MJ_SISTER - mDoAud_bgmStreamPrepare(0xC0000004); + mDoAud_bgmStreamPrepare(JA_STRM_DEMO_MJ_SISTER); break; case 3: // STRM_DEMO_GO_MAJU - mDoAud_bgmStreamPrepare(0xC0000005); + mDoAud_bgmStreamPrepare(JA_STRM_DEMO_GO_MAJU); break; case 4: // NOMSG_WAIT specialProc_WaitStart(staffIdx); diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index a1c2be73a..eacdbb9bb 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -3012,7 +3012,7 @@ void dKy_arrowcol_chg_move() { /* 80196764-801967C4 .text dKy_checkEventNightStop__Fv */ BOOL dKy_checkEventNightStop() { - if (dComIfGs_isEventBit(0xA02) && !dComIfGs_isSymbol(0)) { + if (dComIfGs_isEventBit(dSv_evtBit_c::ENDLESS_NIGHT) && !dComIfGs_isSymbol(0)) { return true; }