diff --git a/include/d/actor/d_a_npc_kf1.h b/include/d/actor/d_a_npc_kf1.h index 33b25c559..c7b66de83 100644 --- a/include/d/actor/d_a_npc_kf1.h +++ b/include/d/actor/d_a_npc_kf1.h @@ -87,9 +87,9 @@ public: void wait_action1(void*); void demo(); void shadowDraw(); - bool _draw(); - bool _execute(); - bool _delete(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); cPhs_State _create(); void bodyCreateHeap(); void itemCreateHeap(); diff --git a/include/d/actor/d_a_npc_kk1.h b/include/d/actor/d_a_npc_kk1.h index a823adfaa..67d368c75 100644 --- a/include/d/actor/d_a_npc_kk1.h +++ b/include/d/actor/d_a_npc_kk1.h @@ -113,9 +113,9 @@ public: void wait_action1(void*); void demo(); void shadowDraw(); - bool _draw(); - bool _execute(); - bool _delete(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); cPhs_State _create(); void bodyCreateHeap(); void effcCreateHeap(); diff --git a/include/d/actor/d_a_npc_km1.h b/include/d/actor/d_a_npc_km1.h index 99ec6f54a..061ed46b6 100644 --- a/include/d/actor/d_a_npc_km1.h +++ b/include/d/actor/d_a_npc_km1.h @@ -73,9 +73,9 @@ public: BOOL talk01(); int wait_action1(void*); u8 demo(); - bool _draw(); - bool _execute(); - bool _delete(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); cPhs_State _create(); BOOL CreateHeap(); diff --git a/include/d/actor/d_a_tag_kf1.h b/include/d/actor/d_a_tag_kf1.h index a22435b46..8443f1830 100644 --- a/include/d/actor/d_a_tag_kf1.h +++ b/include/d/actor/d_a_tag_kf1.h @@ -26,9 +26,9 @@ public: void wait01(); void wait02(); void wait_action1(void*); - bool _draw(); - bool _execute(); - bool _delete(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); cPhs_State _create(); public: diff --git a/src/d/actor/d_a_npc_kf1.cpp b/src/d/actor/d_a_npc_kf1.cpp index 9419eb935..1318b4e57 100644 --- a/src/d/actor/d_a_npc_kf1.cpp +++ b/src/d/actor/d_a_npc_kf1.cpp @@ -423,17 +423,17 @@ void daNpc_Kf1_c::shadowDraw() { } /* 00003884-0000397C .text _draw__11daNpc_Kf1_cFv */ -bool daNpc_Kf1_c::_draw() { +BOOL daNpc_Kf1_c::_draw() { /* Nonmatching */ } /* 0000397C-00003BC4 .text _execute__11daNpc_Kf1_cFv */ -bool daNpc_Kf1_c::_execute() { +BOOL daNpc_Kf1_c::_execute() { /* Nonmatching */ } /* 00003BC4-00003C18 .text _delete__11daNpc_Kf1_cFv */ -bool daNpc_Kf1_c::_delete() { +BOOL daNpc_Kf1_c::_delete() { /* Nonmatching */ } @@ -458,28 +458,28 @@ void daNpc_Kf1_c::CreateHeap() { } /* 00004590-000045B0 .text daNpc_Kf1_Create__FP10fopAc_ac_c */ -static cPhs_State daNpc_Kf1_Create(fopAc_ac_c*) { - /* Nonmatching */ +static cPhs_State daNpc_Kf1_Create(fopAc_ac_c* i_this) { + return ((daNpc_Kf1_c*)i_this)->_create(); } /* 000045B0-000045D0 .text daNpc_Kf1_Delete__FP11daNpc_Kf1_c */ -static BOOL daNpc_Kf1_Delete(daNpc_Kf1_c*) { - /* Nonmatching */ +static BOOL daNpc_Kf1_Delete(daNpc_Kf1_c* i_this) { + return ((daNpc_Kf1_c*)i_this)->_delete(); } /* 000045D0-000045F0 .text daNpc_Kf1_Execute__FP11daNpc_Kf1_c */ -static BOOL daNpc_Kf1_Execute(daNpc_Kf1_c*) { - /* Nonmatching */ +static BOOL daNpc_Kf1_Execute(daNpc_Kf1_c* i_this) { + return ((daNpc_Kf1_c*)i_this)->_execute(); } /* 000045F0-00004610 .text daNpc_Kf1_Draw__FP11daNpc_Kf1_c */ -static BOOL daNpc_Kf1_Draw(daNpc_Kf1_c*) { - /* Nonmatching */ +static BOOL daNpc_Kf1_Draw(daNpc_Kf1_c* i_this) { + return ((daNpc_Kf1_c*)i_this)->_draw(); } /* 00004610-00004618 .text daNpc_Kf1_IsDelete__FP11daNpc_Kf1_c */ static BOOL daNpc_Kf1_IsDelete(daNpc_Kf1_c*) { - /* Nonmatching */ + return TRUE; } static actor_method_class l_daNpc_Kf1_Method = { diff --git a/src/d/actor/d_a_npc_kk1.cpp b/src/d/actor/d_a_npc_kk1.cpp index 9c4a94049..a638ef7b7 100644 --- a/src/d/actor/d_a_npc_kk1.cpp +++ b/src/d/actor/d_a_npc_kk1.cpp @@ -533,17 +533,17 @@ void daNpc_Kk1_c::shadowDraw() { } /* 000055C4-00005798 .text _draw__11daNpc_Kk1_cFv */ -bool daNpc_Kk1_c::_draw() { +BOOL daNpc_Kk1_c::_draw() { /* Nonmatching */ } /* 00005798-000059EC .text _execute__11daNpc_Kk1_cFv */ -bool daNpc_Kk1_c::_execute() { +BOOL daNpc_Kk1_c::_execute() { /* Nonmatching */ } /* 000059EC-00005A58 .text _delete__11daNpc_Kk1_cFv */ -bool daNpc_Kk1_c::_delete() { +BOOL daNpc_Kk1_c::_delete() { /* Nonmatching */ } @@ -568,28 +568,28 @@ void daNpc_Kk1_c::CreateHeap() { } /* 00006684-000066A4 .text daNpc_Kk1_Create__FP10fopAc_ac_c */ -static cPhs_State daNpc_Kk1_Create(fopAc_ac_c*) { - /* Nonmatching */ +static cPhs_State daNpc_Kk1_Create(fopAc_ac_c* i_this) { + return ((daNpc_Kk1_c*)i_this)->_create(); } /* 000066A4-000066C4 .text daNpc_Kk1_Delete__FP11daNpc_Kk1_c */ -static BOOL daNpc_Kk1_Delete(daNpc_Kk1_c*) { - /* Nonmatching */ +static BOOL daNpc_Kk1_Delete(daNpc_Kk1_c* i_this) { + return ((daNpc_Kk1_c*)i_this)->_delete(); } /* 000066C4-000066E4 .text daNpc_Kk1_Execute__FP11daNpc_Kk1_c */ -static BOOL daNpc_Kk1_Execute(daNpc_Kk1_c*) { - /* Nonmatching */ +static BOOL daNpc_Kk1_Execute(daNpc_Kk1_c* i_this) { + return ((daNpc_Kk1_c*)i_this)->_execute(); } /* 000066E4-00006704 .text daNpc_Kk1_Draw__FP11daNpc_Kk1_c */ -static BOOL daNpc_Kk1_Draw(daNpc_Kk1_c*) { - /* Nonmatching */ +static BOOL daNpc_Kk1_Draw(daNpc_Kk1_c* i_this) { + return ((daNpc_Kk1_c*)i_this)->_draw(); } /* 00006704-0000670C .text daNpc_Kk1_IsDelete__FP11daNpc_Kk1_c */ static BOOL daNpc_Kk1_IsDelete(daNpc_Kk1_c*) { - /* Nonmatching */ + return TRUE; } static actor_method_class l_daNpc_Kk1_Method = { diff --git a/src/d/actor/d_a_npc_km1.cpp b/src/d/actor/d_a_npc_km1.cpp index 658be4ae2..02f71dfd4 100644 --- a/src/d/actor/d_a_npc_km1.cpp +++ b/src/d/actor/d_a_npc_km1.cpp @@ -618,7 +618,7 @@ u8 daNpc_Km1_c::demo() { } /* 00001548-000016AC .text _draw__11daNpc_Km1_cFv */ -bool daNpc_Km1_c::_draw() { +BOOL daNpc_Km1_c::_draw() { J3DModel *model = mpMorf->getModel(); J3DModelData *model_data = model->getModelData(); g_env_light.settingTevStruct(TEV_TYPE_ACTOR,¤t.pos,&tevStr); @@ -648,7 +648,7 @@ bool daNpc_Km1_c::_draw() { } /* 000016AC-00001808 .text _execute__11daNpc_Km1_cFv */ -bool daNpc_Km1_c::_execute() { +BOOL daNpc_Km1_c::_execute() { if(field_0x7B8 == 0){ field_0x774 = current.pos; @@ -679,7 +679,7 @@ bool daNpc_Km1_c::_execute() { } /* 00001808-0000188C .text _delete__11daNpc_Km1_cFv */ -bool daNpc_Km1_c::_delete() { +BOOL daNpc_Km1_c::_delete() { fopAcM_GetID(this); dComIfG_resDeleteDemo(&field_0x6C4,"Km"); @@ -787,23 +787,23 @@ BOOL daNpc_Km1_c::CreateHeap() { return FALSE; } /* 00002158-00002178 .text daNpc_Km1_Create__FP10fopAc_ac_c */ -static cPhs_State daNpc_Km1_Create(fopAc_ac_c* obj) { - (static_cast(obj))->_create(); +static cPhs_State daNpc_Km1_Create(fopAc_ac_c* i_this) { + return ((daNpc_Km1_c*)i_this)->_create(); } /* 00002178-00002198 .text daNpc_Km1_Delete__FP11daNpc_Km1_c */ -static BOOL daNpc_Km1_Delete(daNpc_Km1_c* obj) { - (static_cast(obj))->_delete(); +static BOOL daNpc_Km1_Delete(daNpc_Km1_c* i_this) { + return ((daNpc_Km1_c*)i_this)->_delete(); } /* 00002198-000021B8 .text daNpc_Km1_Execute__FP11daNpc_Km1_c */ -static BOOL daNpc_Km1_Execute(daNpc_Km1_c* obj) { - (static_cast(obj))->_execute(); +static BOOL daNpc_Km1_Execute(daNpc_Km1_c* i_this) { + return ((daNpc_Km1_c*)i_this)->_execute(); } /* 000021B8-000021D8 .text daNpc_Km1_Draw__FP11daNpc_Km1_c */ -static BOOL daNpc_Km1_Draw(daNpc_Km1_c* obj) { - (static_cast(obj))->_draw(); +static BOOL daNpc_Km1_Draw(daNpc_Km1_c* i_this) { + return ((daNpc_Km1_c*)i_this)->_draw(); } /* 000021D8-000021E0 .text daNpc_Km1_IsDelete__FP11daNpc_Km1_c */ diff --git a/src/d/actor/d_a_obj_table.cpp b/src/d/actor/d_a_obj_table.cpp index 8f1a66533..ead1999ea 100644 --- a/src/d/actor/d_a_obj_table.cpp +++ b/src/d/actor/d_a_obj_table.cpp @@ -135,27 +135,27 @@ namespace daObjTable { namespace { /* 00000608-00000628 .text Mthd_Create__Q210daObjTable27@unnamed@d_a_obj_table_cpp@FPv */ cPhs_State Mthd_Create(void* i_this) { - return ((Act_c*) i_this)->Mthd_Create(); + return ((daObjTable::Act_c*)i_this)->Mthd_Create(); } /* 00000628-00000648 .text Mthd_Delete__Q210daObjTable27@unnamed@d_a_obj_table_cpp@FPv */ BOOL Mthd_Delete(void* i_this) { - return ((Act_c*) i_this)->Mthd_Delete(); + return ((daObjTable::Act_c*)i_this)->Mthd_Delete(); } /* 00000648-00000668 .text Mthd_Execute__Q210daObjTable27@unnamed@d_a_obj_table_cpp@FPv */ BOOL Mthd_Execute(void* i_this) { - return ((Act_c*) i_this)->MoveBGExecute(); + return ((daObjTable::Act_c*)i_this)->MoveBGExecute(); } /* 00000668-00000694 .text Mthd_Draw__Q210daObjTable27@unnamed@d_a_obj_table_cpp@FPv */ BOOL Mthd_Draw(void* i_this) { - return ((Act_c*) i_this)->Draw(); + return ((daObjTable::Act_c*)i_this)->Draw(); } /* 00000694-000006C0 .text Mthd_IsDelete__Q210daObjTable27@unnamed@d_a_obj_table_cpp@FPv */ BOOL Mthd_IsDelete(void* i_this) { - return ((Act_c*) i_this)->IsDelete(); + return ((daObjTable::Act_c*)i_this)->IsDelete(); } static actor_method_class Mthd_Table = { diff --git a/src/d/actor/d_a_obj_tntrap.cpp b/src/d/actor/d_a_obj_tntrap.cpp index 8f72f68f8..b037343d5 100644 --- a/src/d/actor/d_a_obj_tntrap.cpp +++ b/src/d/actor/d_a_obj_tntrap.cpp @@ -148,28 +148,28 @@ bool daObjTnTrap_c::_draw() { } /* 00001BF0-00001C10 .text daObjTnTrap_Create__FP10fopAc_ac_c */ -static cPhs_State daObjTnTrap_Create(fopAc_ac_c*) { - /* Nonmatching */ +static cPhs_State daObjTnTrap_Create(fopAc_ac_c* i_this) { + return ((daObjTnTrap_c*)i_this)->_create(); } /* 00001C10-00001C34 .text daObjTnTrap_Delete__FP13daObjTnTrap_c */ -static BOOL daObjTnTrap_Delete(daObjTnTrap_c*) { - /* Nonmatching */ +static BOOL daObjTnTrap_Delete(daObjTnTrap_c* i_this) { + return ((daObjTnTrap_c*)i_this)->_delete(); } /* 00001C34-00001C58 .text daObjTnTrap_Execute__FP13daObjTnTrap_c */ -static BOOL daObjTnTrap_Execute(daObjTnTrap_c*) { - /* Nonmatching */ +static BOOL daObjTnTrap_Execute(daObjTnTrap_c* i_this) { + return ((daObjTnTrap_c*)i_this)->_execute(); } /* 00001C58-00001C7C .text daObjTnTrap_Draw__FP13daObjTnTrap_c */ -static BOOL daObjTnTrap_Draw(daObjTnTrap_c*) { - /* Nonmatching */ +static BOOL daObjTnTrap_Draw(daObjTnTrap_c* i_this) { + return ((daObjTnTrap_c*)i_this)->_draw(); } /* 00001C7C-00001C84 .text daObjTnTrap_IsDelete__FP13daObjTnTrap_c */ static BOOL daObjTnTrap_IsDelete(daObjTnTrap_c*) { - /* Nonmatching */ + return TRUE; } static actor_method_class l_daObjTnTrap_Method = { diff --git a/src/d/actor/d_a_tag_kf1.cpp b/src/d/actor/d_a_tag_kf1.cpp index e941aadf4..768095a91 100644 --- a/src/d/actor/d_a_tag_kf1.cpp +++ b/src/d/actor/d_a_tag_kf1.cpp @@ -123,17 +123,17 @@ void daTag_Kf1_c::wait_action1(void*) { } /* 00000BE8-00000BF0 .text _draw__11daTag_Kf1_cFv */ -bool daTag_Kf1_c::_draw() { +BOOL daTag_Kf1_c::_draw() { /* Nonmatching */ } /* 00000BF0-00000C68 .text _execute__11daTag_Kf1_cFv */ -bool daTag_Kf1_c::_execute() { +BOOL daTag_Kf1_c::_execute() { /* Nonmatching */ } /* 00000C68-00000CBC .text _delete__11daTag_Kf1_cFv */ -bool daTag_Kf1_c::_delete() { +BOOL daTag_Kf1_c::_delete() { /* Nonmatching */ } @@ -143,28 +143,28 @@ cPhs_State daTag_Kf1_c::_create() { } /* 000010C0-000010E0 .text daTag_Kf1_Create__FP10fopAc_ac_c */ -static cPhs_State daTag_Kf1_Create(fopAc_ac_c*) { - /* Nonmatching */ +static cPhs_State daTag_Kf1_Create(fopAc_ac_c* i_this) { + return ((daTag_Kf1_c*)i_this)->_create(); } /* 000010E0-00001100 .text daTag_Kf1_Delete__FP11daTag_Kf1_c */ -static BOOL daTag_Kf1_Delete(daTag_Kf1_c*) { - /* Nonmatching */ +static BOOL daTag_Kf1_Delete(daTag_Kf1_c* i_this) { + return ((daTag_Kf1_c*)i_this)->_delete(); } /* 00001100-00001120 .text daTag_Kf1_Execute__FP11daTag_Kf1_c */ -static BOOL daTag_Kf1_Execute(daTag_Kf1_c*) { - /* Nonmatching */ +static BOOL daTag_Kf1_Execute(daTag_Kf1_c* i_this) { + return ((daTag_Kf1_c*)i_this)->_execute(); } /* 00001120-00001140 .text daTag_Kf1_Draw__FP11daTag_Kf1_c */ -static BOOL daTag_Kf1_Draw(daTag_Kf1_c*) { - /* Nonmatching */ +static BOOL daTag_Kf1_Draw(daTag_Kf1_c* i_this) { + return ((daTag_Kf1_c*)i_this)->_draw(); } /* 00001140-00001148 .text daTag_Kf1_IsDelete__FP11daTag_Kf1_c */ static BOOL daTag_Kf1_IsDelete(daTag_Kf1_c*) { - /* Nonmatching */ + return TRUE; } static actor_method_class l_daTag_Kf1_Method = {