From d3e05a4f37ee488e386e075a4a327fca7be2226a Mon Sep 17 00:00:00 2001 From: TakaRikka Date: Sat, 18 Jul 2026 19:39:24 -0700 Subject: [PATCH] pr comments again --- src/d/actor/d_a_e_pm.cpp | 139 +++++++++++++++++++++++---------------- src/d/d_bright_check.cpp | 53 +++++++++++++-- src/d/d_menu_dmap.cpp | 2 +- src/d/d_msg_class.cpp | 10 +-- src/d/d_name.cpp | 10 ++- 5 files changed, 141 insertions(+), 73 deletions(-) diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp index 8c68907f15..0d019da747 100644 --- a/src/d/actor/d_a_e_pm.cpp +++ b/src/d/actor/d_a_e_pm.cpp @@ -19,6 +19,7 @@ #include "d/actor/d_a_obj_smw_stone.h" #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" +#include "dusk/version.hpp" class daE_PM_HIO_c { public: @@ -115,7 +116,7 @@ enum Joint { }; enum Mode { -#if VERSION == VERSION_GCN_JPN +#if TARGET_PC || VERSION == VERSION_GCN_JPN /* 0x00 */ Mode0_JPN, #endif /* 0x00 */ Mode0, @@ -470,26 +471,31 @@ void daE_PM_c::Ap_StartAction() { bool bVar3 = false; switch (mMode) { -#if VERSION == VERSION_GCN_JPN +#if TARGET_PC || VERSION == VERSION_GCN_JPN case Mode0_JPN: - if (mAppear) { - bVar3 = true; - mMode++; - } else if (mSecondEncounter && fopAcM_searchPlayerDistanceXZ(this) < 800.0f) { - bVar3 = true; - mMode++; - } + IF_DUSK_BLOCK(dusk::version::isRegionJpn()) + if (mAppear) { + bVar3 = true; + mMode++; + } else if (mSecondEncounter && fopAcM_searchPlayerDistanceXZ(this) < 800.0f) { + bVar3 = true; + mMode++; + } + IF_DUSK_BLOCK_END break; - case Mode0: - bVar3 = true; -#else - case Mode0: - if (mAppear) { - bVar3 = true; - } else if (mSecondEncounter && fopAcM_searchPlayerDistanceXZ(this) < 800.0f) { - bVar3 = true; - } #endif + case Mode0: + IF_DUSK_BLOCK(dusk::version::isRegionJpn()) + bVar3 = true; + IF_DUSK_BLOCK_END + + IF_DUSK_BLOCK(!dusk::version::isRegionJpn()) + if (mAppear) { + bVar3 = true; + } else if (mSecondEncounter && fopAcM_searchPlayerDistanceXZ(this) < 800.0f) { + bVar3 = true; + } + IF_DUSK_BLOCK_END if (bVar3 && CameraSet()) { if (dComIfG_play_c::getLayerNo(0) == 2) { player_pos.set(-10477.0f, mAcch.GetGroundH(), 17710.0f); @@ -816,10 +822,12 @@ void daE_PM_c::DemoBeforeEscape() { for (int i = 0; i < 4; i++) { e_fs_class* puppet; if (fopAcM_SearchByID(mPuppetID[i], (fopAc_ac_c**)&puppet)) { -#if VERSION == VERSION_GCN_JPN +#if TARGET_PC || VERSION == VERSION_GCN_JPN + IF_DUSK_BLOCK(dusk::version::isRegionJpn()) if (puppet == NULL) { continue; } + IF_DUSK_BLOCK_END #endif puppet->mAction = e_fs_class::ACT_END; puppet->mMode = 0; @@ -1271,11 +1279,14 @@ void daE_PM_c::DemoBossStart2() { player = (daPy_py_c*)dComIfGp_getPlayer(0); -#if VERSION == VERSION_GCN_JPN - if (mDemoMode > Mode0) { +#if TARGET_PC + if (dusk::version::isRegionJpn() ? (mDemoMode > Mode0) : (mDemoMode != Mode0)) +#elif VERSION == VERSION_GCN_JPN + if (mDemoMode > Mode0) #else - if (mDemoMode != Mode0) { + if (mDemoMode != Mode0) #endif + { SetMoveCam(0.1f, 50.0f); } else { SetMoveCam(0.03f, 50.0f); @@ -1284,31 +1295,33 @@ void daE_PM_c::DemoBossStart2() { mTargetAngleY = s_TargetAngle; switch (mDemoMode) { -#if VERSION == VERSION_GCN_JPN +#if TARGET_PC || VERSION == VERSION_GCN_JPN case Mode0_JPN: - if (!CameraSet()) { - break; - } + IF_DUSK_BLOCK(dusk::version::isRegionJpn()) + if (!CameraSet()) { + break; + } - mPuppetNum = 4; - gravity = -9.0f; - mTimer[0] = 130; - if (mSecondEncounter) { - mTimer[0] = 180; - vec1.set(current.pos.x, 1900.0f, current.pos.z); - SetStopCam(vec1, 500.0f, 0.0f, s_TargetAngle); - mCamEye.set(mCamEyeTarget); - actor_status &= ~fopAcStts_CULL_e; - } - if (mSecondEncounter) { - player->mDemo.setDemoType(daPy_demo_c::DEMO_TYPE_ORIGINAL_e); - player->mDemo.setParam0(0); - player->mDemo.setDemoMode(4); - player->mDemo.setParam0(0); - player->mDemo.setParam1(0); - player->mDemo.setParam2(0); - } - mDemoMode++; + mPuppetNum = 4; + gravity = -9.0f; + mTimer[0] = 130; + if (mSecondEncounter) { + mTimer[0] = 180; + vec1.set(current.pos.x, 1900.0f, current.pos.z); + SetStopCam(vec1, 500.0f, 0.0f, s_TargetAngle); + mCamEye.set(mCamEyeTarget); + actor_status &= ~fopAcStts_CULL_e; + } + if (mSecondEncounter) { + player->mDemo.setDemoType(daPy_demo_c::DEMO_TYPE_ORIGINAL_e); + player->mDemo.setParam0(0); + player->mDemo.setDemoMode(4); + player->mDemo.setParam0(0); + player->mDemo.setParam1(0); + player->mDemo.setParam2(0); + } + mDemoMode++; + IF_DUSK_BLOCK_END break; #endif case Mode0: @@ -1443,20 +1456,21 @@ void daE_PM_c::DemoBossStart() { } switch (mDemoMode) { -#if VERSION == VERSION_GCN_JPN +#if TARGET_PC || VERSION == VERSION_GCN_JPN case Mode0_JPN: - if (!CameraSet()) { - break; - } - - mPuppetNum = 4; - gravity = -9.0f; - mTimer[0] = 130; - vec1.set(current.pos.x, current.pos.y + 80.0f, current.pos.z); - mTargetAngleY = shape_angle.y; - SetStopCam(vec1, 500.0f, -150.0f, shape_angle.y); - mDemoMode++; + IF_DUSK_BLOCK(dusk::version::isRegionJpn()) + if (!CameraSet()) { + break; + } + mPuppetNum = 4; + gravity = -9.0f; + mTimer[0] = 130; + vec1.set(current.pos.x, current.pos.y + 80.0f, current.pos.z); + mTargetAngleY = shape_angle.y; + SetStopCam(vec1, 500.0f, -150.0f, shape_angle.y); + mDemoMode++; + IF_DUSK_BLOCK_END break; #endif case Mode0: @@ -2209,7 +2223,8 @@ void daE_PM_c::StartAction() { if (fopAcM_gc_c::gndCheck(&pos) && current.pos.absXZ(*s_LinkPos) < 1000.0f && mAnm == ANM_WAIT01 && s_LinkPos->y <= fopAcM_gc_c::getGroundY() + 100.0f) { -#if VERSION != VERSION_GCN_JPN +#if TARGET_PC || VERSION != VERSION_GCN_JPN + IF_DUSK_BLOCK(!dusk::version::isRegionJpn()) if (!CameraSet()) { break; } @@ -2236,6 +2251,14 @@ void daE_PM_c::StartAction() { player->changeOriginalDemo(); player->changeDemoMode(4, 0, 0, 0); } + IF_DUSK_BLOCK_END + + IF_DUSK_BLOCK(dusk::version::isRegionJpn()) + mPuppetNum = 4; + mAction = 6; + mMode = Mode0; + mDemoMode = 0; + IF_DUSK_BLOCK_END #else mPuppetNum = 4; mAction = 6; diff --git a/src/d/d_bright_check.cpp b/src/d/d_bright_check.cpp index ccb04c69e5..cbea55100a 100644 --- a/src/d/d_bright_check.cpp +++ b/src/d/d_bright_check.cpp @@ -15,6 +15,8 @@ #include "m_Do/m_Do_controller_pad.h" #include +#include "dusk/version.hpp" + dBrightCheck_c::dBrightCheck_c(JKRArchive* i_archive) { mArchive = i_archive; mBrightCheck.mMsgString = JKR_NEW dMsgString_c(); @@ -39,7 +41,16 @@ void dBrightCheck_c::screenSet() { MULTI_CHAR('font_a1'), MULTI_CHAR('font_at2'), MULTI_CHAR('font_at3'), MULTI_CHAR('font_at4'), MULTI_CHAR('font_at'), }; - #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + #if TARGET_PC + static u64 const txTV_jpn[] = { + MULTI_CHAR('menu_t6s'), MULTI_CHAR('menu_t6'), MULTI_CHAR('menu_t9s'), MULTI_CHAR('menu_t9'), MULTI_CHAR('menut10s'), + MULTI_CHAR('menu_t10'), MULTI_CHAR('menu_t7s'), MULTI_CHAR('menu_t7'), MULTI_CHAR('menu_t8s'), MULTI_CHAR('menu_t8'), + }; + static u64 const txTV[] = { + MULTI_CHAR('menu_t61'), MULTI_CHAR('menu_t2'), MULTI_CHAR('menu_t91'), MULTI_CHAR('menu_t1'), MULTI_CHAR('menut101'), + MULTI_CHAR('menu_t01'), MULTI_CHAR('menu_t71'), MULTI_CHAR('menu_t3'), MULTI_CHAR('menu_t81'), MULTI_CHAR('menu_t4'), + }; + #elif (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) static u64 const txTV[] = { MULTI_CHAR('menu_t6s'), MULTI_CHAR('menu_t6'), MULTI_CHAR('menu_t9s'), MULTI_CHAR('menu_t9'), MULTI_CHAR('menut10s'), MULTI_CHAR('menu_t10'), MULTI_CHAR('menu_t7s'), MULTI_CHAR('menu_t7'), MULTI_CHAR('menu_t8s'), MULTI_CHAR('menu_t8'), @@ -51,7 +62,14 @@ void dBrightCheck_c::screenSet() { }; #endif - #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + #if TARGET_PC + static u64 const txTVhide_jpn[] = { + MULTI_CHAR('fmenu_6n'), MULTI_CHAR('fmenu_9n'), MULTI_CHAR('fmenu_10'), MULTI_CHAR('fmenu_7n'), MULTI_CHAR('fmenu_8n'), + }; + static u64 const txTVhide[] = { + MULTI_CHAR('menu_6n'), MULTI_CHAR('menu_9n'), MULTI_CHAR('menu_10n'), MULTI_CHAR('menu_7n'), MULTI_CHAR('menu_8n'), + }; + #elif (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) static u64 const txTVhide[] = { MULTI_CHAR('fmenu_6n'), MULTI_CHAR('fmenu_9n'), MULTI_CHAR('fmenu_10'), MULTI_CHAR('fmenu_7n'), MULTI_CHAR('fmenu_8n'), }; @@ -67,7 +85,18 @@ void dBrightCheck_c::screenSet() { mBrightCheck.Scr->search(MULTI_CHAR('g_abtn_n'))->hide(); - #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + #if TARGET_PC + J2DTextBox* settings_text; + if (dusk::version::isRegionJpn()) { + settings_text = (J2DTextBox*)mBrightCheck.Scr->search(MULTI_CHAR('t_t00')); + mBrightCheck.Scr->search(MULTI_CHAR('t_t00'))->show(); + mBrightCheck.Scr->search(MULTI_CHAR('f_t00'))->hide(); + } else { + settings_text = (J2DTextBox*)mBrightCheck.Scr->search(MULTI_CHAR('f_t00')); + mBrightCheck.Scr->search(MULTI_CHAR('f_t00'))->show(); + mBrightCheck.Scr->search(MULTI_CHAR('t_t00'))->hide(); + } + #elif (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search(MULTI_CHAR('t_t00')); mBrightCheck.Scr->search(MULTI_CHAR('t_t00'))->show(); mBrightCheck.Scr->search(MULTI_CHAR('f_t00'))->hide(); @@ -83,7 +112,15 @@ void dBrightCheck_c::screenSet() { J2DTextBox* btna_text[5]; for (int i = 0; i < 5; i++) { - #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + #if TARGET_PC + if (dusk::version::isRegionJpn()) { + btna_text[i] = (J2DTextBox*)mBrightCheck.Scr->search(tv_btnA[i]); + mBrightCheck.Scr->search(ftv_btnA[i])->hide(); + } else { + btna_text[i] = (J2DTextBox*)mBrightCheck.Scr->search(ftv_btnA[i]); + mBrightCheck.Scr->search(tv_btnA[i])->hide(); + } + #elif (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) btna_text[i] = (J2DTextBox*)mBrightCheck.Scr->search(tv_btnA[i]); mBrightCheck.Scr->search(ftv_btnA[i])->hide(); #else @@ -97,15 +134,17 @@ void dBrightCheck_c::screenSet() { } for (int i = 0; i < 5; i++) { - mBrightCheck.Scr->search(txTVhide[i])->hide(); + mBrightCheck.Scr->search(DUSK_IF_ELSE(dusk::version::isRegionJpn() ? txTVhide_jpn[i] : txTVhide[i], txTVhide[i]))->hide(); } for (int i = 0; i < 10; i++) { - J2DTextBox* check_text = (J2DTextBox*)mBrightCheck.Scr->search(txTV[i]); + J2DTextBox* check_text = (J2DTextBox*)mBrightCheck.Scr->search(DUSK_IF_ELSE(dusk::version::isRegionJpn() ? txTV_jpn[i] : txTV[i], txTV[i])); check_text->setFont(mDoExt_getMesgFont()); - #if (VERSION != VERSION_GCN_JPN) && (VERSION != VERSION_WII_JPN) + #if TARGET_PC || ((VERSION != VERSION_GCN_JPN) && (VERSION != VERSION_WII_JPN)) + IF_DUSK_BLOCK(!dusk::version::isRegionJpn()) check_text->setCharSpace(0.0f); + IF_DUSK_BLOCK_END #endif if (i < 2) { diff --git a/src/d/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp index b71c756283..6feb191562 100644 --- a/src/d/d_menu_dmap.cpp +++ b/src/d/d_menu_dmap.cpp @@ -482,7 +482,7 @@ void dMenu_DmapBg_c::setCButtonString(u32 i_msgNo) { MULTI_CHAR('c_text_s'), MULTI_CHAR('c_text') }; static u64 const c_tag[2] = { - MULTI_CHAR('c_text_s'), MULTI_CHAR('c_text') + MULTI_CHAR('f_text_s'), MULTI_CHAR('f_text') }; #else static u64 const c_tag[2] = { diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp index aeeb2243b8..f299049f28 100644 --- a/src/d/d_msg_class.cpp +++ b/src/d/d_msg_class.cpp @@ -3456,11 +3456,13 @@ void jmessage_tRenderingProcessor::do_heightcenter() { break; case 3: { #if TARGET_PC - if (!dusk::version::isRegionJpn() || (dusk::version::isRegionJpn() && field_0x142 == 1)) -#else - if (field_0x142 == 1) + if (!dusk::version::isRegionJpn()) { + field_0x138 = 0.5f * pReference->getLineSpace(); + var_f31 += field_0x138; + break; + } #endif - { + if (field_0x142 == 1) { int nowPageLine = pReference->getNowPageLine(); field_0x138 = pReference->getLineSpace() * (0.5f * (pReference->getLineMax() - (s16)nowPageLine)); var_f31 += field_0x138; diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index 2f3970bb2f..bf906f9285 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -337,11 +337,15 @@ void dName_c::_move() { mDoAud_seStart(Z2SE_SY_DUMMY, 0, 0, 0); mPrevMojiSet = mMojiSet; mMojiSet++; - #if REGION_JPN - if (mMojiSet > MOJI_EIGO) { + + #if TARGET_PC + if ((dusk::version::isRegionJpn() && mMojiSet > MOJI_EIGO) || (!dusk::version::isRegionJpn() && mMojiSet > MOJI_KATA)) + #elif REGION_JPN + if (mMojiSet > MOJI_EIGO) #else - if (mMojiSet > MOJI_KATA) { + if (mMojiSet > MOJI_KATA) #endif + { mMojiSet = MOJI_HIRA; } mojiListChange();