diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-06-18 20:14:26 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-06-18 20:14:26 -0400 |
| commit | ede01ca07bb0b79f27369f82cda41e5cb13697a8 (patch) | |
| tree | f571e952d80852011c36d84898c5a153b91994ff /src | |
| parent | 264ee5d6e1cacf0c3bae2dd1a83fe15052d35b94 (diff) | |
daPy_lk_c::draw and linkDraw matched on retail with (void)0 assert, d_a_figure OK
Diffstat (limited to 'src')
| -rw-r--r-- | src/JSystem/JAudio/JAISeMgr.cpp | 2 | ||||
| -rw-r--r-- | src/JSystem/JAudio/JAISoundTable.cpp | 2 | ||||
| -rw-r--r-- | src/d/actor/d_a_obj_figure.cpp | 2 | ||||
| -rw-r--r-- | src/d/actor/d_a_player_main.cpp | 1 |
4 files changed, 2 insertions, 5 deletions
diff --git a/src/JSystem/JAudio/JAISeMgr.cpp b/src/JSystem/JAudio/JAISeMgr.cpp index 936edcaf..ca7f941f 100644 --- a/src/JSystem/JAudio/JAISeMgr.cpp +++ b/src/JSystem/JAudio/JAISeMgr.cpp @@ -106,7 +106,7 @@ JAInter::SeParameter::SeParameter() {} void JAInter::SeMgr::startSeSequence() { seHandle = NULL; JAIBasic::msBasic->startSoundActor(0x80000800, &seHandle, NULL, 1, 4); - JUT_ASSERT_MSG(149, JAISeMgr::seHandle, "SEシーケンスの再生に失敗しました。\n") + JUT_ASSERT_MSG(149, JAISeMgr::seHandle, "SEシーケンスの再生に失敗しました。\n"); } /* 80293508-80293530 .text processGFrameSe__Q27JAInter5SeMgrFv */ diff --git a/src/JSystem/JAudio/JAISoundTable.cpp b/src/JSystem/JAudio/JAISoundTable.cpp index 699627f8..3d294bba 100644 --- a/src/JSystem/JAudio/JAISoundTable.cpp +++ b/src/JSystem/JAudio/JAISoundTable.cpp @@ -42,7 +42,7 @@ SoundInfo* JAInter::SoundTable::getInfoPointer(u32 param_1) { switch (param_1 & JAISoundID_TypeMask) { case JAISoundID_Type_Se: _category = param_1 >> 12 & 0xff; - JUT_ASSERT_MSG(61, (_category<JAIGlobalParameter::getParamSeCategoryMax()), "getInfoPointer 登録されていないSEカテゴリーナンバーが指定されました。\n") + JUT_ASSERT_MSG(61, (_category<JAIGlobalParameter::getParamSeCategoryMax()), "getInfoPointer 登録されていないSEカテゴリーナンバーが指定されました。\n"); break; case JAISoundID_Type_Sequence: _category = 16; diff --git a/src/d/actor/d_a_obj_figure.cpp b/src/d/actor/d_a_obj_figure.cpp index b8c8d317..3066b903 100644 --- a/src/d/actor/d_a_obj_figure.cpp +++ b/src/d/actor/d_a_obj_figure.cpp @@ -1049,8 +1049,6 @@ static BOOL daSampleIsDelete(void*) { /* 00001B08-00002148 .text linkDraw__FP14mDoExt_McaMorf */ void linkDraw(mDoExt_McaMorf* pMorf) { - /* Nonmatching - retail-only regalloc (maybe the same issue as daPy_lk_c::draw?) */ - pMorf->calc(); #if VERSION > VERSION_DEMO J3DModel* model = pMorf->getModel(); diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index ae1671e8..3e06472f 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -1671,7 +1671,6 @@ void daPy_lk_c::onBodyEffect() { /* 80107308-80108204 .text draw__9daPy_lk_cFv */ BOOL daPy_lk_c::draw() { - /* Nonmatching - retail-only regalloc (maybe the same issue as linkDraw in d_a_obj_figure.cpp?) */ if (mSightPacket.getDrawFlg()) { mSightPacket.setSight(); } |