From 8787f8a1f7db457515254c8aa36fde9bff0eef3d Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sat, 27 Dec 2025 18:06:45 -0500 Subject: [PATCH] Resolve tevStr fakematches --- include/d/actor/d_a_kmon.h | 5 +++ src/d/actor/d_a_kmon.cpp | 64 +++++++++++++++++++++--------------- src/d/actor/d_a_obj_pbco.cpp | 18 ++++------ src/d/actor/d_a_obj_pbka.cpp | 15 ++++----- src/d/actor/d_a_obj_rflw.cpp | 16 ++++----- 5 files changed, 61 insertions(+), 57 deletions(-) diff --git a/include/d/actor/d_a_kmon.h b/include/d/actor/d_a_kmon.h index a9a384e37..f6b4023a2 100644 --- a/include/d/actor/d_a_kmon.h +++ b/include/d/actor/d_a_kmon.h @@ -10,6 +10,11 @@ public: cPhs_State CreateInit(); void checkTalk(); + inline cPhs_State _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); + static const char m_arcname[]; public: diff --git a/src/d/actor/d_a_kmon.cpp b/src/d/actor/d_a_kmon.cpp index d3208469a..6675dc5f9 100644 --- a/src/d/actor/d_a_kmon.cpp +++ b/src/d/actor/d_a_kmon.cpp @@ -94,16 +94,13 @@ void daKmon_c::checkTalk() { } } -/* 000006E8-000007F8 .text daKmonCreate__FPv */ -static cPhs_State daKmonCreate(void* i_this) { - daKmon_c* pKmon = static_cast(i_this); +cPhs_State daKmon_c::_create() { + fopAcM_SetupActor(this, daKmon_c); - fopAcM_SetupActor(pKmon, daKmon_c); - - cPhs_State state = dComIfG_resLoad(&pKmon->mPhase, daKmon_c::m_arcname); + cPhs_State state = dComIfG_resLoad(&mPhase, daKmon_c::m_arcname); if(state == cPhs_COMPLEATE_e) { - if(fopAcM_entrySolidHeap(pKmon, CheckCreateHeap, 0x10000)) { - state = pKmon->CreateInit(); + if(fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x10000)) { + state = CreateInit(); } else { state = cPhs_ERROR_e; } @@ -111,35 +108,48 @@ static cPhs_State daKmonCreate(void* i_this) { return state; } +/* 000006E8-000007F8 .text daKmonCreate__FPv */ +static cPhs_State daKmonCreate(void* i_this) { + return ((daKmon_c*)i_this)->_create(); +} + +BOOL daKmon_c::_delete() { + dComIfG_resDelete(&mPhase, daKmon_c::m_arcname); + return TRUE; +} + /* 00000968-00000998 .text daKmonDelete__FPv */ static BOOL daKmonDelete(void* i_this) { - daKmon_c* actor = static_cast(i_this); - dComIfG_resDelete(&actor->mPhase, daKmon_c::m_arcname); - return TRUE; + return ((daKmon_c*)i_this)->_delete(); +} + +BOOL daKmon_c::_execute() { + checkTalk(); + fopAcM_posMoveF(this, NULL); + mAcch.CrrPos(*dComIfG_Bgsp()); + mBckAnm.play(); + mBtkAnm.play(); + set_mtx(); + return FALSE; } /* 00000998-00000A00 .text daKmonExecute__FPv */ static BOOL daKmonExecute(void* i_this) { - daKmon_c* actor = static_cast(i_this); - actor->checkTalk(); - fopAcM_posMoveF(actor, NULL); - actor->mAcch.CrrPos(*dComIfG_Bgsp()); - actor->mBckAnm.play(); - actor->mBtkAnm.play(); - actor->set_mtx(); - return FALSE; + return ((daKmon_c*)i_this)->_execute(); +} + +BOOL daKmon_c::_draw() { + g_env_light.settingTevStruct(TEV_TYPE_BG1_PLIGHT, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType(mpModel, &tevStr); + mBckAnm.entry(mpModel->getModelData()); + mBtkAnm.entry(mpModel->getModelData()); + mDoExt_modelUpdateDL(mpModel); + return TRUE; } /* 00000A00-00000A9C .text daKmonDraw__FPv */ static BOOL daKmonDraw(void* i_this) { - daKmon_c* actor = static_cast(i_this); - dKy_tevstr_c* pTev; - g_env_light.settingTevStruct(TEV_TYPE_BG1_PLIGHT, &actor->current.pos, (pTev = &actor->tevStr)); - g_env_light.setLightTevColorType(actor->mpModel, pTev); - actor->mBckAnm.entry(actor->mpModel->getModelData()); - actor->mBtkAnm.entry(actor->mpModel->getModelData()); - mDoExt_modelUpdateDL(actor->mpModel); - return TRUE; + return ((daKmon_c*)i_this)->_draw(); } /* 00000A9C-00000AA4 .text daKmonIsDelete__FPv */ diff --git a/src/d/actor/d_a_obj_pbco.cpp b/src/d/actor/d_a_obj_pbco.cpp index 177d4b6c7..4bebd8df4 100644 --- a/src/d/actor/d_a_obj_pbco.cpp +++ b/src/d/actor/d_a_obj_pbco.cpp @@ -29,8 +29,7 @@ void daObj_Pbco_c::set_mtx() { /* 0000018C-000001AC .text CheckCreateHeap__FP10fopAc_ac_c */ static int CheckCreateHeap(fopAc_ac_c* i_this) { - daObj_Pbco_c* a_this = static_cast(i_this); - return a_this->CreateHeap(); + return ((daObj_Pbco_c*)i_this)->CreateHeap(); } /* 000001AC-00000348 .text CreateHeap__12daObj_Pbco_cFv */ @@ -80,7 +79,7 @@ cPhs_State daObj_Pbco_c::_create() { /* 000003A4-00000434 .text daObj_PbcoCreate__FPv */ static cPhs_State daObj_PbcoCreate(void* i_this) { - return static_cast(i_this)->_create(); + return ((daObj_Pbco_c*)i_this)->_create(); } bool daObj_Pbco_c::_delete() { @@ -93,8 +92,7 @@ bool daObj_Pbco_c::_delete() { /* 00000434-0000048C .text daObj_PbcoDelete__FPv */ static BOOL daObj_PbcoDelete(void* i_this) { - static_cast(i_this)->_delete(); - return TRUE; + return ((daObj_Pbco_c*)i_this)->_delete(); } bool daObj_Pbco_c::_execute() { @@ -106,21 +104,19 @@ bool daObj_Pbco_c::_execute() { /* 0000048C-000004D0 .text daObj_PbcoExecute__FPv */ static BOOL daObj_PbcoExecute(void* i_this) { - return static_cast(i_this)->_execute(); + return ((daObj_Pbco_c*)i_this)->_execute(); } bool daObj_Pbco_c::_draw() { - dKy_tevstr_c* pTevStr; - g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, pTevStr = &tevStr); // fakematch - g_env_light.setLightTevColorType(mpModel, pTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType(mpModel, &tevStr); mDoExt_modelUpdateDL(mpModel); return TRUE; } /* 000004D0-0000053C .text daObj_PbcoDraw__FPv */ static BOOL daObj_PbcoDraw(void* i_this) { - daObj_Pbco_c* a_this = (daObj_Pbco_c*)i_this; - return a_this->_draw(); + return ((daObj_Pbco_c*)i_this)->_draw(); } /* 0000053C-00000544 .text daObj_PbcoIsDelete__FPv */ diff --git a/src/d/actor/d_a_obj_pbka.cpp b/src/d/actor/d_a_obj_pbka.cpp index 3bffe3ec7..02d9b2455 100644 --- a/src/d/actor/d_a_obj_pbka.cpp +++ b/src/d/actor/d_a_obj_pbka.cpp @@ -61,7 +61,7 @@ cPhs_State daObjPbka_c::_create() { /* 0000024C-000002EC .text daObjPbka_Create__FPv */ static cPhs_State daObjPbka_Create(void* i_this) { - return static_cast(i_this)->_create(); + return ((daObjPbka_c*)i_this)->_create(); } bool daObjPbka_c::_delete() { @@ -71,14 +71,12 @@ bool daObjPbka_c::_delete() { /* 000002EC-0000031C .text daObjPbka_Delete__FPv */ static BOOL daObjPbka_Delete(void* i_this) { - static_cast(i_this)->_delete(); - return TRUE; + return ((daObjPbka_c*)i_this)->_delete(); } bool daObjPbka_c::_draw() { - dKy_tevstr_c * pTevStr; - g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, pTevStr = &tevStr); // fakematch - g_env_light.setLightTevColorType(mpModel, pTevStr); + g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType(mpModel, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); @@ -87,8 +85,7 @@ bool daObjPbka_c::_draw() { /* 0000031C-000003C0 .text daObjPbka_Draw__FPv */ static BOOL daObjPbka_Draw(void* i_this) { - daObjPbka_c* a_this = (daObjPbka_c*)i_this; - return a_this->_draw(); + return ((daObjPbka_c*)i_this)->_draw(); } bool daObjPbka_c::_execute() { @@ -101,7 +98,7 @@ bool daObjPbka_c::_execute() { /* 000003C0-00000450 .text daObjPbka_Execute__FPv */ static BOOL daObjPbka_Execute(void* i_this) { - return static_cast(i_this)->_execute(); + return ((daObjPbka_c*)i_this)->_execute(); } /* 00000450-00000458 .text daObjPbka_IsDelete__FPv */ diff --git a/src/d/actor/d_a_obj_rflw.cpp b/src/d/actor/d_a_obj_rflw.cpp index ca0b86b15..2b3d0a4a7 100644 --- a/src/d/actor/d_a_obj_rflw.cpp +++ b/src/d/actor/d_a_obj_rflw.cpp @@ -46,7 +46,7 @@ static BOOL nodeCallBack(J3DNode*, int); /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { - return static_cast(i_this)->CreateHeap(); + return ((daObjRflw_c*)i_this)->CreateHeap(); } /* 00000098-000001E0 .text CreateHeap__11daObjRflw_cFv */ @@ -133,9 +133,8 @@ inline BOOL daObjRflw_c::_delete() { } inline BOOL daObjRflw_c::_draw() { - dKy_tevstr_c* p_tev_str; - g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, p_tev_str = &tevStr); // fakematch - g_env_light.setLightTevColorType(mpModel, p_tev_str); + g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType(mpModel, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); @@ -179,20 +178,17 @@ inline BOOL daObjRflw_c::_execute() { /* 000003E8-0000051C .text daObjRflw_Create__FPv */ static cPhs_State daObjRflw_Create(void* i_this) { - daObjRflw_c* rflw = static_cast(i_this); - return rflw->_create(); + return ((daObjRflw_c*)i_this)->_create(); } /* 000006D4-00000704 .text daObjRflw_Delete__FPv */ static BOOL daObjRflw_Delete(void* i_this) { - daObjRflw_c* rflw = static_cast(i_this); - return rflw->_delete(); + return ((daObjRflw_c*)i_this)->_delete(); } /* 00000704-000007A8 .text daObjRflw_Draw__FPv */ static BOOL daObjRflw_Draw(void* i_this) { - daObjRflw_c* rflw = static_cast(i_this); - return rflw->_draw(); + return ((daObjRflw_c*)i_this)->_draw(); } /* 000007A8-000009EC .text daObjRflw_Execute__FPv */