diff options
279 files changed, 689 insertions, 861 deletions
diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index aa75f7a1..722321bf 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/src/d/actor/d_a_agb.cpp @@ -1804,8 +1804,8 @@ static actor_method_class l_daAgb_Method = { actor_process_profile_definition g_profile_AGB = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_AGB, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daAgb_c), diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp index ff348058..99c75dc5 100644 --- a/src/d/actor/d_a_agbsw0.cpp +++ b/src/d/actor/d_a_agbsw0.cpp @@ -2547,7 +2547,6 @@ static int daAgbsw0_Create(fopAc_ac_c* i_this) { return static_cast<daAgbsw0_c*>(i_this)->create(); } - static actor_method_class l_daAgbsw0_Method = { (process_method_func)daAgbsw0_Create, (process_method_func)daAgbsw0_Delete, @@ -2557,18 +2556,18 @@ static actor_method_class l_daAgbsw0_Method = { }; actor_process_profile_definition g_profile_AGBSW0 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_AGBSW0, - &g_fpcLf_Method.base, - sizeof(daAgbsw0_c), - 0, - 0, - &g_fopAc_Method.base, - 0x000D, - &l_daAgbsw0_Method, - fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_AGBSW0, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daAgbsw0_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x000D, + /* Actor SubMtd */ &l_daAgbsw0_Method, + /* Status */ fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp index 6cfddc2c..e368eb67 100644 --- a/src/d/actor/d_a_alldie.cpp +++ b/src/d/actor/d_a_alldie.cpp @@ -117,18 +117,18 @@ static actor_method_class l_daAlldie_Method = { }; actor_process_profile_definition g_profile_ALLDIE = { - fpcLy_CURRENT_e, - 2, - fpcPi_CURRENT_e, - PROC_ALLDIE, - &g_fpcLf_Method.base, - sizeof(daAlldie_c), - 0, - 0, - &g_fopAc_Method.base, - 0x011D, - &l_daAlldie_Method, - fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_6_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0002, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_ALLDIE, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daAlldie_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x011D, + /* Actor SubMtd */ &l_daAlldie_Method, + /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index 563a8bfd..7844ecb3 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -1356,7 +1356,7 @@ static actor_method_class l_daAM_Method = { actor_process_profile_definition g_profile_AM = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_AM, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index 52ea0f96..34342b7c 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -1497,7 +1497,7 @@ static actor_method_class l_daAM2_Method = { actor_process_profile_definition g_profile_AM2 = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_AM2, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_andsw0.cpp b/src/d/actor/d_a_andsw0.cpp index e8577e07..ad600418 100644 --- a/src/d/actor/d_a_andsw0.cpp +++ b/src/d/actor/d_a_andsw0.cpp @@ -346,18 +346,18 @@ static actor_method_class l_daAndsw0_Method = { }; actor_process_profile_definition g_profile_ANDSW0 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_ANDSW0, - &g_fpcLf_Method.base, - sizeof(andsw0_class), - 0, - 0, - &g_fopAc_Method.base, - 0x0135, - &l_daAndsw0_Method, - fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_ANDSW0, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(andsw0_class), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x0135, + /* Actor SubMtd */ &l_daAndsw0_Method, + /* Status */ fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp index 18e7f2b5..b8e73e78 100644 --- a/src/d/actor/d_a_andsw2.cpp +++ b/src/d/actor/d_a_andsw2.cpp @@ -263,7 +263,7 @@ static actor_method_class l_daAndsw2_Method = { actor_process_profile_definition g_profile_ANDSW2 = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_ANDSW2, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index 85d25a6a..ac020581 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -1305,8 +1305,8 @@ static actor_method_class daArrowMethodTable = { actor_process_profile_definition g_profile_ARROW = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 9, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0009, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_ARROW, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daArrow_c), diff --git a/src/d/actor/d_a_arrow_iceeff.cpp b/src/d/actor/d_a_arrow_iceeff.cpp index c0167743..af673d3c 100644 --- a/src/d/actor/d_a_arrow_iceeff.cpp +++ b/src/d/actor/d_a_arrow_iceeff.cpp @@ -302,18 +302,18 @@ static actor_method_class daArrow_IceeffMethodTable = { }; actor_process_profile_definition g_profile_ARROW_ICEEFF = { - fpcLy_CURRENT_e, - 9, - fpcPi_CURRENT_e, - PROC_ARROW_ICEEFF, - &g_fpcLf_Method.base, - sizeof(daArrow_Iceeff_c), - 0, - 0, - &g_fopAc_Method.base, - 0x01C0, - &daArrow_IceeffMethodTable, - fopAcStts_UNK40000_e | fopAcStts_UNK4000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0009, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_ARROW_ICEEFF, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daArrow_Iceeff_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x01C0, + /* Actor SubMtd */ &daArrow_IceeffMethodTable, + /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_arrow_lighteff.cpp b/src/d/actor/d_a_arrow_lighteff.cpp index f5474117..10599309 100644 --- a/src/d/actor/d_a_arrow_lighteff.cpp +++ b/src/d/actor/d_a_arrow_lighteff.cpp @@ -408,18 +408,18 @@ static actor_method_class daArrow_LighteffMethodTable = { }; actor_process_profile_definition g_profile_ARROW_LIGHTEFF = { - fpcLy_CURRENT_e, - 9, - fpcPi_CURRENT_e, - PROC_ARROW_LIGHTEFF, - &g_fpcLf_Method.base, - sizeof(daArrow_Lighteff_c), - 0, - 0, - &g_fopAc_Method.base, - 0x01C1, - &daArrow_LighteffMethodTable, - fopAcStts_UNK40000_e | fopAcStts_UNK4000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0009, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_ARROW_LIGHTEFF, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daArrow_Lighteff_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x01C1, + /* Actor SubMtd */ &daArrow_LighteffMethodTable, + /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_atdoor.cpp b/src/d/actor/d_a_atdoor.cpp index a78a4f43..fe32a4a8 100644 --- a/src/d/actor/d_a_atdoor.cpp +++ b/src/d/actor/d_a_atdoor.cpp @@ -86,7 +86,6 @@ static s32 daAtdoor_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daAtdoor_Method = { (process_method_func)daAtdoor_Create, (process_method_func)daAtdoor_Delete, diff --git a/src/d/actor/d_a_bb.cpp b/src/d/actor/d_a_bb.cpp index 87c0379a..ca3b7a89 100644 --- a/src/d/actor/d_a_bb.cpp +++ b/src/d/actor/d_a_bb.cpp @@ -167,7 +167,6 @@ static s32 daBb_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daBb_Method = { (process_method_func)daBb_Create, (process_method_func)daBb_Delete, diff --git a/src/d/actor/d_a_bdk.cpp b/src/d/actor/d_a_bdk.cpp index bf92e178..8ccf2d90 100644 --- a/src/d/actor/d_a_bdk.cpp +++ b/src/d/actor/d_a_bdk.cpp @@ -312,7 +312,6 @@ static s32 daBdk_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daBdk_Method = { (process_method_func)daBdk_Create, (process_method_func)daBdk_Delete, diff --git a/src/d/actor/d_a_bdkobj.cpp b/src/d/actor/d_a_bdkobj.cpp index 8a84c253..8e11a92c 100644 --- a/src/d/actor/d_a_bdkobj.cpp +++ b/src/d/actor/d_a_bdkobj.cpp @@ -67,7 +67,6 @@ static s32 daBdkobj_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daBdkobj_Method = { (process_method_func)daBdkobj_Create, (process_method_func)daBdkobj_Delete, diff --git a/src/d/actor/d_a_beam.cpp b/src/d/actor/d_a_beam.cpp index 591c85bd..f7c64026 100644 --- a/src/d/actor/d_a_beam.cpp +++ b/src/d/actor/d_a_beam.cpp @@ -107,7 +107,6 @@ static BOOL daBeamIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daBeamMethodTable = { (process_method_func)daBeamCreate, (process_method_func)daBeamDelete, diff --git a/src/d/actor/d_a_bgn.cpp b/src/d/actor/d_a_bgn.cpp index 3e8ea47a..1f436566 100644 --- a/src/d/actor/d_a_bgn.cpp +++ b/src/d/actor/d_a_bgn.cpp @@ -273,7 +273,6 @@ static s32 daBgn_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daBgn_Method = { (process_method_func)daBgn_Create, (process_method_func)daBgn_Delete, diff --git a/src/d/actor/d_a_bgn2.cpp b/src/d/actor/d_a_bgn2.cpp index 20572d15..f5602adf 100644 --- a/src/d/actor/d_a_bgn2.cpp +++ b/src/d/actor/d_a_bgn2.cpp @@ -146,7 +146,6 @@ static s32 daBgn2_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daBgn2_Method = { (process_method_func)daBgn2_Create, (process_method_func)daBgn2_Delete, diff --git a/src/d/actor/d_a_bgn3.cpp b/src/d/actor/d_a_bgn3.cpp index e8331e73..c793cbf5 100644 --- a/src/d/actor/d_a_bgn3.cpp +++ b/src/d/actor/d_a_bgn3.cpp @@ -146,7 +146,6 @@ static s32 daBgn3_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daBgn3_Method = { (process_method_func)daBgn3_Create, (process_method_func)daBgn3_Delete, diff --git a/src/d/actor/d_a_bita.cpp b/src/d/actor/d_a_bita.cpp index de17695d..7c0f17d1 100644 --- a/src/d/actor/d_a_bita.cpp +++ b/src/d/actor/d_a_bita.cpp @@ -313,7 +313,7 @@ static actor_method_class l_daBita_Method = { actor_process_profile_definition g_profile_BITA = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, + /* ListID */ 0x0003, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_BITA, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -323,7 +323,7 @@ actor_process_profile_definition g_profile_BITA = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0096, /* Actor SubMtd */ &l_daBita_Method, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_UNK4000_e | fopAcStts_CULL_e, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENV_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index a4feea62..8a03e1c8 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -2784,7 +2784,7 @@ static actor_method_class l_daBk_Method = { actor_process_profile_definition g_profile_BK = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_BK, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_bl.cpp b/src/d/actor/d_a_bl.cpp index af1384b7..edd281cf 100644 --- a/src/d/actor/d_a_bl.cpp +++ b/src/d/actor/d_a_bl.cpp @@ -156,7 +156,6 @@ static s32 daBL_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daBL_Method = { (process_method_func)daBL_Create, (process_method_func)daBL_Delete, diff --git a/src/d/actor/d_a_bmd.cpp b/src/d/actor/d_a_bmd.cpp index 8926f12b..bd070d23 100644 --- a/src/d/actor/d_a_bmd.cpp +++ b/src/d/actor/d_a_bmd.cpp @@ -151,7 +151,6 @@ static s32 daBmd_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daBmd_Method = { (process_method_func)daBmd_Create, (process_method_func)daBmd_Delete, diff --git a/src/d/actor/d_a_bmdfoot.cpp b/src/d/actor/d_a_bmdfoot.cpp index 900b733f..2fff98a9 100644 --- a/src/d/actor/d_a_bmdfoot.cpp +++ b/src/d/actor/d_a_bmdfoot.cpp @@ -107,7 +107,6 @@ static s32 daBmdfoot_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daBmdfoot_Method = { (process_method_func)daBmdfoot_Create, (process_method_func)daBmdfoot_Delete, diff --git a/src/d/actor/d_a_bmdhand.cpp b/src/d/actor/d_a_bmdhand.cpp index 88a8842f..0394b5b5 100644 --- a/src/d/actor/d_a_bmdhand.cpp +++ b/src/d/actor/d_a_bmdhand.cpp @@ -121,7 +121,6 @@ static s32 daBmdhand_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daBmdhand_Method = { (process_method_func)daBmdhand_Create, (process_method_func)daBmdhand_Delete, diff --git a/src/d/actor/d_a_boko.cpp b/src/d/actor/d_a_boko.cpp index 4aa4b0d2..900d7139 100644 --- a/src/d/actor/d_a_boko.cpp +++ b/src/d/actor/d_a_boko.cpp @@ -274,8 +274,8 @@ static actor_method_class l_daBoko_Method = { actor_process_profile_definition g_profile_BOKO = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 9, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0009, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_BOKO, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daBoko_c), diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index a4aebf9a..886bcbf2 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -1333,8 +1333,7 @@ namespace daBomb2 { return true; } - //global visibility according to objdiff - actor_method_class Mthd_Table = { + static actor_method_class Mthd_Table = { (process_method_func)Mthd_Create, (process_method_func)Mthd_Delete, (process_method_func)Mthd_Execute, @@ -1345,18 +1344,18 @@ namespace daBomb2 { } actor_process_profile_definition g_profile_Bomb2 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Bomb2, - &g_fpcLf_Method.base, - sizeof(daBomb2::Act_c), - 0, - 0, - &g_fopAc_Method.base, - 0x0116, - &daBomb2::Mthd_Table, - fopAcStts_CULL_e | fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_Bomb2, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBomb2::Act_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x0116, + /* Actor SubMtd */ &daBomb2::Mthd_Table, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_boss_item.cpp b/src/d/actor/d_a_boss_item.cpp index a06826fa..e46a9b96 100644 --- a/src/d/actor/d_a_boss_item.cpp +++ b/src/d/actor/d_a_boss_item.cpp @@ -41,24 +41,24 @@ static s32 daBossItem_Create(fopAc_ac_c* i_this) { static actor_method_class daBossItem_METHODS = { (process_method_func)daBossItem_Create, (process_method_func)daBossItem_Delete, - (process_method_func)0, + (process_method_func)NULL, (process_method_func)daBossItem_IsDelete, - (process_method_func)0, + (process_method_func)NULL, }; actor_process_profile_definition g_profile_BOSSITEM = { - fpcLy_CURRENT_e, - 7, - fpcLy_CURRENT_e, - PROC_BOSSITEM, - &g_fpcLf_Method.base, - sizeof(bossitem_class), - 0, - 0, - &g_fopAc_Method.base, - 0x00FB, - &daBossItem_METHODS, - fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_BOSSITEM, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(bossitem_class), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x00FB, + /* Actor SubMtd */ &daBossItem_METHODS, + /* Status */ fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_bpw.cpp b/src/d/actor/d_a_bpw.cpp index 07c757c3..881e908f 100644 --- a/src/d/actor/d_a_bpw.cpp +++ b/src/d/actor/d_a_bpw.cpp @@ -286,7 +286,6 @@ static s32 daBPW_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daBPW_Method = { (process_method_func)daBPW_Create, (process_method_func)daBPW_Delete, diff --git a/src/d/actor/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp index 2496053e..192af043 100644 --- a/src/d/actor/d_a_branch.cpp +++ b/src/d/actor/d_a_branch.cpp @@ -242,18 +242,18 @@ static actor_method_class l_daBranch_Method = { }; actor_process_profile_definition g_profile_BRANCH = { - fpcLy_CURRENT_e, - 7, - fpcLy_CURRENT_e, - PROC_BRANCH, - &g_fpcLf_Method.base, - sizeof(daBranch_c), - 0, - 0, - &g_fopAc_Method.base, - 0x0193, - &l_daBranch_Method, - fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_BRANCH, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBranch_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x0193, + /* Actor SubMtd */ &l_daBranch_Method, + /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_bridge.cpp b/src/d/actor/d_a_bridge.cpp index c866e4a3..8c8db0a7 100644 --- a/src/d/actor/d_a_bridge.cpp +++ b/src/d/actor/d_a_bridge.cpp @@ -97,7 +97,6 @@ static s32 daBridge_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daBridge_Method = { (process_method_func)daBridge_Create, (process_method_func)daBridge_Delete, diff --git a/src/d/actor/d_a_bst.cpp b/src/d/actor/d_a_bst.cpp index 94991cae..13fb3193 100644 --- a/src/d/actor/d_a_bst.cpp +++ b/src/d/actor/d_a_bst.cpp @@ -212,7 +212,6 @@ static s32 daBst_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daBst_Method = { (process_method_func)daBst_Create, (process_method_func)daBst_Delete, diff --git a/src/d/actor/d_a_btd.cpp b/src/d/actor/d_a_btd.cpp index da7bab09..3b6925e1 100644 --- a/src/d/actor/d_a_btd.cpp +++ b/src/d/actor/d_a_btd.cpp @@ -222,7 +222,6 @@ static s32 daBtd_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daBtd_Method = { (process_method_func)daBtd_Create, (process_method_func)daBtd_Delete, diff --git a/src/d/actor/d_a_bwd.cpp b/src/d/actor/d_a_bwd.cpp index 7d0755db..847c367c 100644 --- a/src/d/actor/d_a_bwd.cpp +++ b/src/d/actor/d_a_bwd.cpp @@ -156,7 +156,6 @@ static s32 daBwd_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daBwd_Method = { (process_method_func)daBwd_Create, (process_method_func)daBwd_Delete, diff --git a/src/d/actor/d_a_bwdg.cpp b/src/d/actor/d_a_bwdg.cpp index 9dc4b56b..a1aaeeac 100644 --- a/src/d/actor/d_a_bwdg.cpp +++ b/src/d/actor/d_a_bwdg.cpp @@ -260,7 +260,7 @@ static actor_method_class l_daBwdg_Method = { actor_process_profile_definition g_profile_BWDG = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_BWDG, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_bwds.cpp b/src/d/actor/d_a_bwds.cpp index 65256919..31e8f1a3 100644 --- a/src/d/actor/d_a_bwds.cpp +++ b/src/d/actor/d_a_bwds.cpp @@ -96,7 +96,6 @@ static s32 daBwds_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daBwds_Method = { (process_method_func)daBwds_Create, (process_method_func)daBwds_Delete, diff --git a/src/d/actor/d_a_cc.cpp b/src/d/actor/d_a_cc.cpp index 7abd3aa2..34cdeade 100644 --- a/src/d/actor/d_a_cc.cpp +++ b/src/d/actor/d_a_cc.cpp @@ -166,7 +166,6 @@ static s32 daCC_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daCC_Method = { (process_method_func)daCC_Create, (process_method_func)daCC_Delete, diff --git a/src/d/actor/d_a_daiocta.cpp b/src/d/actor/d_a_daiocta.cpp index 2eb6c840..741fd90c 100644 --- a/src/d/actor/d_a_daiocta.cpp +++ b/src/d/actor/d_a_daiocta.cpp @@ -287,7 +287,6 @@ static BOOL daDaioctaIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daDaioctaMethodTable = { (process_method_func)daDaioctaCreate, (process_method_func)daDaioctaDelete, diff --git a/src/d/actor/d_a_daiocta_eye.cpp b/src/d/actor/d_a_daiocta_eye.cpp index d12d2823..b344b802 100644 --- a/src/d/actor/d_a_daiocta_eye.cpp +++ b/src/d/actor/d_a_daiocta_eye.cpp @@ -137,7 +137,6 @@ static BOOL daDaiocta_EyeIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daDaiocta_EyeMethodTable = { (process_method_func)daDaiocta_EyeCreate, (process_method_func)daDaiocta_EyeDelete, diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index ebfa9854..b5a98103 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -91,7 +91,6 @@ static s32 daDemo00_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daDemo00_Method = { (process_method_func)daDemo00_Create, (process_method_func)daDemo00_Delete, diff --git a/src/d/actor/d_a_demo_dk.cpp b/src/d/actor/d_a_demo_dk.cpp index ab669a9e..c6da6514 100644 --- a/src/d/actor/d_a_demo_dk.cpp +++ b/src/d/actor/d_a_demo_dk.cpp @@ -51,7 +51,6 @@ static s32 daDEMO_DK_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daDEMO_DK_Method = { (process_method_func)daDEMO_DK_Create, (process_method_func)daDEMO_DK_Delete, diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index 20dd33da..bd967d87 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -541,7 +541,7 @@ static actor_method_class l_daDitem_Method = { actor_process_profile_definition g_profile_Demo_Item = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Demo_Item, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_demo_kmm.cpp b/src/d/actor/d_a_demo_kmm.cpp index b7d1b41e..ffd8ce91 100644 --- a/src/d/actor/d_a_demo_kmm.cpp +++ b/src/d/actor/d_a_demo_kmm.cpp @@ -66,7 +66,6 @@ static s32 daDemo_Kmm_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daDemo_Kmm_Method = { (process_method_func)daDemo_Kmm_Create, (process_method_func)daDemo_Kmm_Delete, diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index 6ae70890..7073374c 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -123,18 +123,18 @@ static actor_method_class l_daDisappear_Method = { }; actor_process_profile_definition g_profile_DISAPPEAR = { - fpcLy_CURRENT_e, - 7, - fpcLy_CURRENT_e, - PROC_DISAPPEAR, - &g_fpcLf_Method.base, - sizeof(disappear_class), - 0, - 0, - &g_fopAc_Method.base, - 0x0188, - &l_daDisappear_Method, - fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_DISAPPEAR, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(disappear_class), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x0188, + /* Actor SubMtd */ &l_daDisappear_Method, + /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_dk.cpp b/src/d/actor/d_a_dk.cpp index 650ae3cb..3da16a29 100644 --- a/src/d/actor/d_a_dk.cpp +++ b/src/d/actor/d_a_dk.cpp @@ -77,7 +77,6 @@ static s32 daDk_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daDk_Method = { (process_method_func)daDk_Create, (process_method_func)daDk_Delete, diff --git a/src/d/actor/d_a_door10.cpp b/src/d/actor/d_a_door10.cpp index da284ae5..c14d78fc 100644 --- a/src/d/actor/d_a_door10.cpp +++ b/src/d/actor/d_a_door10.cpp @@ -186,7 +186,6 @@ static s32 daDoor10_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daDoor10_Method = { (process_method_func)daDoor10_Create, (process_method_func)daDoor10_Delete, diff --git a/src/d/actor/d_a_door12.cpp b/src/d/actor/d_a_door12.cpp index a1a1ce5c..2b1f2af0 100644 --- a/src/d/actor/d_a_door12.cpp +++ b/src/d/actor/d_a_door12.cpp @@ -196,7 +196,6 @@ static s32 daDoor12_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daDoor12_Method = { (process_method_func)daDoor12_Create, (process_method_func)daDoor12_Delete, diff --git a/src/d/actor/d_a_dr.cpp b/src/d/actor/d_a_dr.cpp index 709b10ca..11a2d27c 100644 --- a/src/d/actor/d_a_dr.cpp +++ b/src/d/actor/d_a_dr.cpp @@ -281,7 +281,7 @@ static actor_method_class l_daDr_Method = { actor_process_profile_definition g_profile_DR = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_DR, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_dr2.cpp b/src/d/actor/d_a_dr2.cpp index bf2428e8..d38a1b9e 100644 --- a/src/d/actor/d_a_dr2.cpp +++ b/src/d/actor/d_a_dr2.cpp @@ -97,7 +97,6 @@ static s32 daDr2_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daDr2_Method = { (process_method_func)daDr2_Create, (process_method_func)daDr2_Delete, diff --git a/src/d/actor/d_a_dummy.cpp b/src/d/actor/d_a_dummy.cpp index fa4c1dc8..79204da6 100644 --- a/src/d/actor/d_a_dummy.cpp +++ b/src/d/actor/d_a_dummy.cpp @@ -86,8 +86,8 @@ namespace daDummy { actor_process_profile_definition g_profile_Dummy = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Dummy, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daDummy::Act_c), diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp index bb9cf071..26e7668f 100644 --- a/src/d/actor/d_a_ep.cpp +++ b/src/d/actor/d_a_ep.cpp @@ -81,7 +81,6 @@ static s32 daEp_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daEp_Method = { (process_method_func)daEp_Create, (process_method_func)daEp_Delete, diff --git a/src/d/actor/d_a_esa.cpp b/src/d/actor/d_a_esa.cpp index 76a12599..a50adadd 100644 --- a/src/d/actor/d_a_esa.cpp +++ b/src/d/actor/d_a_esa.cpp @@ -290,7 +290,7 @@ static actor_method_class l_daEsa_Method = { actor_process_profile_definition g_profile_ESA = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_ESA, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -300,7 +300,7 @@ actor_process_profile_definition g_profile_ESA = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x00D0, /* Actor SubMtd */ &l_daEsa_Method, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_UNK4000_e | fopAcStts_CULL_e, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_fallrock_tag.cpp b/src/d/actor/d_a_fallrock_tag.cpp index 4b108064..9656f2c1 100644 --- a/src/d/actor/d_a_fallrock_tag.cpp +++ b/src/d/actor/d_a_fallrock_tag.cpp @@ -41,7 +41,6 @@ void daFallRockTag_c::getData() { /* Nonmatching */ } - static actor_method_class l_daFallRockTag_Method = { (process_method_func)daFallRockTag_Create, (process_method_func)daFallRockTag_Delete, diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp index 923990be..49cf7af2 100644 --- a/src/d/actor/d_a_fan.cpp +++ b/src/d/actor/d_a_fan.cpp @@ -292,7 +292,7 @@ static actor_method_class daFanMethodTable = { actor_process_profile_definition g_profile_FAN = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_FAN, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -300,9 +300,9 @@ actor_process_profile_definition g_profile_FAN = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0011B, + /* Priority */ 0x011B, /* Actor SubMtd */ &daFanMethodTable, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_UNK4000_e | fopAcStts_CULL_e, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_fganon.cpp b/src/d/actor/d_a_fganon.cpp index 02fcd8d8..f503091e 100644 --- a/src/d/actor/d_a_fganon.cpp +++ b/src/d/actor/d_a_fganon.cpp @@ -196,7 +196,6 @@ static s32 daFganon_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daFganon_Method = { (process_method_func)daFganon_Create, (process_method_func)daFganon_Delete, diff --git a/src/d/actor/d_a_floor.cpp b/src/d/actor/d_a_floor.cpp index a6a5666d..90794b7d 100644 --- a/src/d/actor/d_a_floor.cpp +++ b/src/d/actor/d_a_floor.cpp @@ -150,7 +150,7 @@ static actor_method_class daFloorMethodTable = { actor_process_profile_definition g_profile_FLOOR = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, + /* ListID */ 0x0003, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_FLOOR, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -160,7 +160,7 @@ actor_process_profile_definition g_profile_FLOOR = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0092, /* Actor SubMtd */ &daFloorMethodTable, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_CULL_e, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_fm.cpp b/src/d/actor/d_a_fm.cpp index 21134f3c..397017c0 100644 --- a/src/d/actor/d_a_fm.cpp +++ b/src/d/actor/d_a_fm.cpp @@ -566,7 +566,6 @@ static BOOL daFmIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daFmMethodTable = { (process_method_func)daFmCreate, (process_method_func)daFmDelete, diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp index fb191a17..a0a92c15 100644 --- a/src/d/actor/d_a_ghostship.cpp +++ b/src/d/actor/d_a_ghostship.cpp @@ -462,18 +462,18 @@ static actor_method_class daGhostshipMethodTable = { }; actor_process_profile_definition g_profile_AYUSH = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_AYUSH, - &g_fpcLf_Method.base, - sizeof(daGhostship_c), - 0, - 0, - &g_fopAc_Method.base, - 0x009E, - &daGhostshipMethodTable, - fopAcStts_UNK40000_e | fopAcStts_SHOWMAP_e | 0x3, - fopAc_ACTOR_e, - fopAc_CULLBOX_4_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_AYUSH, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daGhostship_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x009E, + /* Actor SubMtd */ &daGhostshipMethodTable, + /* Status */ 0x03 | fopAcStts_SHOWMAP_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_gm.cpp b/src/d/actor/d_a_gm.cpp index f64d701d..14d95c2f 100644 --- a/src/d/actor/d_a_gm.cpp +++ b/src/d/actor/d_a_gm.cpp @@ -132,7 +132,6 @@ static s32 daGM_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daGM_Method = { (process_method_func)daGM_Create, (process_method_func)daGM_Delete, diff --git a/src/d/actor/d_a_gnd.cpp b/src/d/actor/d_a_gnd.cpp index d02e3303..9f01509c 100644 --- a/src/d/actor/d_a_gnd.cpp +++ b/src/d/actor/d_a_gnd.cpp @@ -196,7 +196,6 @@ static s32 daGnd_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daGnd_Method = { (process_method_func)daGnd_Create, (process_method_func)daGnd_Delete, diff --git a/src/d/actor/d_a_goal_flag.cpp b/src/d/actor/d_a_goal_flag.cpp index 812033d8..28f645e2 100644 --- a/src/d/actor/d_a_goal_flag.cpp +++ b/src/d/actor/d_a_goal_flag.cpp @@ -126,7 +126,6 @@ static BOOL daGoal_FlagIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daGoal_FlagMethodTable = { (process_method_func)daGoal_FlagCreate, (process_method_func)daGoal_FlagDelete, diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index 0837165a..34092fba 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -204,18 +204,18 @@ static actor_method_class daGrass_METHODS = { }; actor_process_profile_definition g_profile_GRASS = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_GRASS, - &g_fpcLf_Method.base, - sizeof(grass_class), - 0, - 0, - &g_fopAc_Method.base, - 0x01BD, - &daGrass_METHODS, - fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_GRASS, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(grass_class), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x01BD, + /* Actor SubMtd */ &daGrass_METHODS, + /* Status */ fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_gy.cpp b/src/d/actor/d_a_gy.cpp index 97a04ba5..6085b50b 100644 --- a/src/d/actor/d_a_gy.cpp +++ b/src/d/actor/d_a_gy.cpp @@ -241,7 +241,6 @@ static BOOL daGyIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daGyMethodTable = { (process_method_func)daGyCreate, (process_method_func)daGyDelete, diff --git a/src/d/actor/d_a_gy_ctrl.cpp b/src/d/actor/d_a_gy_ctrl.cpp index f4e43f0f..c66b99dc 100644 --- a/src/d/actor/d_a_gy_ctrl.cpp +++ b/src/d/actor/d_a_gy_ctrl.cpp @@ -171,7 +171,6 @@ static BOOL daGy_CtrlIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daGy_CtrlMethodTable = { (process_method_func)daGy_CtrlCreate, (process_method_func)daGy_CtrlDelete, diff --git a/src/d/actor/d_a_himo3.cpp b/src/d/actor/d_a_himo3.cpp index 03bb0329..db6cacf4 100644 --- a/src/d/actor/d_a_himo3.cpp +++ b/src/d/actor/d_a_himo3.cpp @@ -61,7 +61,6 @@ static s32 daHimo3_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daHimo3_Method = { (process_method_func)daHimo3_Create, (process_method_func)daHimo3_Delete, diff --git a/src/d/actor/d_a_hitobj.cpp b/src/d/actor/d_a_hitobj.cpp index 7fb7d51e..ef814395 100644 --- a/src/d/actor/d_a_hitobj.cpp +++ b/src/d/actor/d_a_hitobj.cpp @@ -97,18 +97,18 @@ static actor_method_class l_daHitobj_Method = { }; actor_process_profile_definition g_profile_HITOBJ = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_HITOBJ, - &g_fpcLf_Method.base, - sizeof(hitobj_class), - 0, - 0, - &g_fopAc_Method.base, - 0x00AB, - &l_daHitobj_Method, - fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_HITOBJ, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(hitobj_class), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x00AB, + /* Actor SubMtd */ &l_daHitobj_Method, + /* Status */ fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp index 62c5cd38..647a51be 100644 --- a/src/d/actor/d_a_hookshot.cpp +++ b/src/d/actor/d_a_hookshot.cpp @@ -399,8 +399,8 @@ static actor_method_class l_daHookshot_Method = { actor_process_profile_definition g_profile_HOOKSHOT = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 6, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0006, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_HOOKSHOT, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daHookshot_c), diff --git a/src/d/actor/d_a_hot_floor.cpp b/src/d/actor/d_a_hot_floor.cpp index 111cae61..5457503c 100644 --- a/src/d/actor/d_a_hot_floor.cpp +++ b/src/d/actor/d_a_hot_floor.cpp @@ -120,7 +120,7 @@ static BOOL daHot_FloorIsDelete(void* i_this) { return TRUE; } -static actor_method_class l_daHot_Floor_Method = { +static actor_method_class daHot_FloorMethodTable = { (process_method_func)daHot_FloorCreate, (process_method_func)daHot_FloorDelete, (process_method_func)daHot_FloorExecute, @@ -130,7 +130,7 @@ static actor_method_class l_daHot_Floor_Method = { actor_process_profile_definition g_profile_Hot_Floor = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Hot_Floor, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -139,8 +139,8 @@ actor_process_profile_definition g_profile_Hot_Floor = { /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x00DB, - /* Actor SubMtd */ &l_daHot_Floor_Method, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_CULL_e, + /* Actor SubMtd */ &daHot_FloorMethodTable, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp index c90991d2..82e66725 100644 --- a/src/d/actor/d_a_ib.cpp +++ b/src/d/actor/d_a_ib.cpp @@ -523,8 +523,8 @@ static actor_method_class l_daIball_Method = { actor_process_profile_definition g_profile_Iball = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Iball, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daIball_c), diff --git a/src/d/actor/d_a_ikari.cpp b/src/d/actor/d_a_ikari.cpp index c39a15ae..bee24590 100644 --- a/src/d/actor/d_a_ikari.cpp +++ b/src/d/actor/d_a_ikari.cpp @@ -168,24 +168,26 @@ static BOOL daIkariIsDelete(void* i_this) { } static actor_method_class daIkariMethodTable = { - (process_method_func)daIkariCreate, (process_method_func)daIkariDelete, - (process_method_func)daIkariExecute, (process_method_func)daIkariIsDelete, + (process_method_func)daIkariCreate, + (process_method_func)daIkariDelete, + (process_method_func)daIkariExecute, + (process_method_func)daIkariIsDelete, (process_method_func)daIkariDraw, }; actor_process_profile_definition g_profile_IKARI = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_IKARI, - &g_fpcLf_Method.base, - sizeof(daIkari_c), - 0, - 0, - &g_fopAc_Method.base, - 0x019d, - &daIkariMethodTable, - fopAcStts_CULL_e | fopAcStts_NOCULLEXEC_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_IKARI, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daIkari_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x019D, + /* Actor SubMtd */ &daIkariMethodTable, + /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp index adac7c55..661b78d6 100644 --- a/src/d/actor/d_a_item.cpp +++ b/src/d/actor/d_a_item.cpp @@ -1508,7 +1508,7 @@ static actor_method_class l_daItem_Method = { actor_process_profile_definition g_profile_ITEM = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_ITEM, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp index cba155a7..536f8d33 100644 --- a/src/d/actor/d_a_kaji.cpp +++ b/src/d/actor/d_a_kaji.cpp @@ -131,18 +131,18 @@ static actor_method_class daKajiMethodTable = { }; actor_process_profile_definition g_profile_Kaji = { - fpcLy_CURRENT_e, - 3, - fpcLy_CURRENT_e, - PROC_Kaji, - &g_fpcLf_Method.base, - sizeof(daKaji_c), - 0, - 0, - &g_fopAc_Method.base, - 0x01AC, - &daKajiMethodTable, - fopAcStts_CULL_e | fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0003, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_Kaji, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daKaji_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x01AC, + /* Actor SubMtd */ &daKajiMethodTable, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_kamome.cpp b/src/d/actor/d_a_kamome.cpp index 70f903ce..a8b02b53 100644 --- a/src/d/actor/d_a_kamome.cpp +++ b/src/d/actor/d_a_kamome.cpp @@ -137,7 +137,6 @@ static s32 daKamome_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daKamome_Method = { (process_method_func)daKamome_Create, (process_method_func)daKamome_Delete, diff --git a/src/d/actor/d_a_kanban.cpp b/src/d/actor/d_a_kanban.cpp index 5f604a25..7d54bae1 100644 --- a/src/d/actor/d_a_kanban.cpp +++ b/src/d/actor/d_a_kanban.cpp @@ -107,7 +107,6 @@ static s32 daKanban_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daKanban_Method = { (process_method_func)daKanban_Create, (process_method_func)daKanban_Delete, diff --git a/src/d/actor/d_a_kantera.cpp b/src/d/actor/d_a_kantera.cpp index 89fe5fb8..1040fe52 100644 --- a/src/d/actor/d_a_kantera.cpp +++ b/src/d/actor/d_a_kantera.cpp @@ -61,7 +61,6 @@ static s32 daKantera_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daKantera_Method = { (process_method_func)daKantera_Create, (process_method_func)daKantera_Delete, diff --git a/src/d/actor/d_a_kb.cpp b/src/d/actor/d_a_kb.cpp index d62082be..2e8072b4 100644 --- a/src/d/actor/d_a_kb.cpp +++ b/src/d/actor/d_a_kb.cpp @@ -182,7 +182,6 @@ static s32 daKb_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daKb_Method = { (process_method_func)daKb_Create, (process_method_func)daKb_Delete, diff --git a/src/d/actor/d_a_ki.cpp b/src/d/actor/d_a_ki.cpp index 11ae2283..ed671164 100644 --- a/src/d/actor/d_a_ki.cpp +++ b/src/d/actor/d_a_ki.cpp @@ -117,7 +117,6 @@ static s32 daKi_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daKi_Method = { (process_method_func)daKi_Create, (process_method_func)daKi_Delete, diff --git a/src/d/actor/d_a_knob00.cpp b/src/d/actor/d_a_knob00.cpp index f23f88a4..110798f7 100644 --- a/src/d/actor/d_a_knob00.cpp +++ b/src/d/actor/d_a_knob00.cpp @@ -186,7 +186,6 @@ static s32 daKnob00_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daKnob00_Method = { (process_method_func)daKnob00_Create, (process_method_func)daKnob00_Delete, diff --git a/src/d/actor/d_a_kokiie.cpp b/src/d/actor/d_a_kokiie.cpp index 4f520fba..0bc30de8 100644 --- a/src/d/actor/d_a_kokiie.cpp +++ b/src/d/actor/d_a_kokiie.cpp @@ -51,7 +51,6 @@ static s32 daKokiie_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daKokiie_Method = { (process_method_func)daKokiie_Create, (process_method_func)daKokiie_Delete, diff --git a/src/d/actor/d_a_ks.cpp b/src/d/actor/d_a_ks.cpp index f405a8e2..7a3ce918 100644 --- a/src/d/actor/d_a_ks.cpp +++ b/src/d/actor/d_a_ks.cpp @@ -126,7 +126,6 @@ static s32 daKS_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daKS_Method = { (process_method_func)daKS_Create, (process_method_func)daKS_Delete, diff --git a/src/d/actor/d_a_kui.cpp b/src/d/actor/d_a_kui.cpp index 8d28e81e..18b1a2ac 100644 --- a/src/d/actor/d_a_kui.cpp +++ b/src/d/actor/d_a_kui.cpp @@ -68,7 +68,6 @@ static s32 daKui_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daKui_Method = { (process_method_func)daKui_Create, (process_method_func)daKui_Delete, diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp index c3cf58af..d75ec97a 100644 --- a/src/d/actor/d_a_kytag00.cpp +++ b/src/d/actor/d_a_kytag00.cpp @@ -410,18 +410,18 @@ static actor_method_class l_daKytag00_Method = { }; actor_process_profile_definition g_profile_KYTAG00 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG00, - &g_fpcLf_Method.base, - sizeof(kytag00_class), - 0, - 0, - &g_fopAc_Method.base, - 0xA0, - &l_daKytag00_Method, - fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_KYTAG00, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag00_class), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x00A0, + /* Actor SubMtd */ &l_daKytag00_Method, + /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp index 27a68965..e26e1324 100644 --- a/src/d/actor/d_a_kytag01.cpp +++ b/src/d/actor/d_a_kytag01.cpp @@ -105,7 +105,7 @@ static actor_method_class l_daKytag01_Method = { actor_process_profile_definition g_profile_KYTAG01 = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_KYTAG01, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_kytag02.cpp b/src/d/actor/d_a_kytag02.cpp index b75e8fcd..7785723b 100644 --- a/src/d/actor/d_a_kytag02.cpp +++ b/src/d/actor/d_a_kytag02.cpp @@ -56,7 +56,6 @@ static s32 daKytag02_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daKytag02_Method = { (process_method_func)daKytag02_Create, (process_method_func)daKytag02_Delete, diff --git a/src/d/actor/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp index 0ed52e74..01c6c09b 100644 --- a/src/d/actor/d_a_kytag03.cpp +++ b/src/d/actor/d_a_kytag03.cpp @@ -41,7 +41,6 @@ static s32 daKytag03_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daKytag03_Method = { (process_method_func)daKytag03_Create, (process_method_func)daKytag03_Delete, diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index 33a4c69d..3b507672 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/src/d/actor/d_a_kytag04.cpp @@ -68,18 +68,18 @@ static actor_method_class l_daKytag04_Method = { }; actor_process_profile_definition g_profile_KYTAG04 = { - fpcLy_CURRENT_e, - 7, - fpcLy_CURRENT_e, - PROC_KYTAG04, - &g_fpcLf_Method.base, - sizeof(kytag04_class), - 0, - 0, - &g_fopAc_Method.base, - 0xA4, - &l_daKytag04_Method, - fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_KYTAG04, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag04_class), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x00A4, + /* Actor SubMtd */ &l_daKytag04_Method, + /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index 09b091b3..bbb823dd 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -151,18 +151,18 @@ static actor_method_class l_daKytag05_Method = { }; actor_process_profile_definition g_profile_KYTAG05 = { - fpcLy_CURRENT_e, - 7, - fpcLy_CURRENT_e, - PROC_KYTAG05, - &g_fpcLf_Method.base, - sizeof(kytag05_class), - 0, - 0, - &g_fopAc_Method.base, - 0xA5, - &l_daKytag05_Method, - fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_KYTAG05, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag05_class), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x00A5, + /* Actor SubMtd */ &l_daKytag05_Method, + /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index bbb7428a..08a3cca3 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -82,18 +82,18 @@ static actor_method_class l_daKytag06_Method = { }; actor_process_profile_definition g_profile_KYTAG06 = { - fpcLy_CURRENT_e, - 7, - fpcLy_CURRENT_e, - PROC_KYTAG06, - &g_fpcLf_Method.base, - sizeof(kytag06_class), - 0, - 0, - &g_fopAc_Method.base, - 0xA6, - &l_daKytag06_Method, - fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_KYTAG06, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag06_class), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x00A6, + /* Actor SubMtd */ &l_daKytag06_Method, + /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag07.cpp b/src/d/actor/d_a_kytag07.cpp index b4196b8d..dfe1fd3b 100644 --- a/src/d/actor/d_a_kytag07.cpp +++ b/src/d/actor/d_a_kytag07.cpp @@ -31,7 +31,6 @@ static s32 daKytag07_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daKytag07_Method = { (process_method_func)daKytag07_Create, (process_method_func)daKytag07_Delete, diff --git a/src/d/actor/d_a_lamp.cpp b/src/d/actor/d_a_lamp.cpp index 00d30e6c..4511bb67 100644 --- a/src/d/actor/d_a_lamp.cpp +++ b/src/d/actor/d_a_lamp.cpp @@ -216,8 +216,8 @@ static actor_method_class l_daLamp_Method = { actor_process_profile_definition g_profile_LAMP = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_LAMP, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(lamp_class), diff --git a/src/d/actor/d_a_lbridge.cpp b/src/d/actor/d_a_lbridge.cpp index 28464242..78237f4f 100644 --- a/src/d/actor/d_a_lbridge.cpp +++ b/src/d/actor/d_a_lbridge.cpp @@ -101,7 +101,6 @@ static BOOL daLbridge_IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daLbridgeMethodTable = { (process_method_func)daLbridge_Create, (process_method_func)daLbridge_Delete, diff --git a/src/d/actor/d_a_lod_bg.cpp b/src/d/actor/d_a_lod_bg.cpp index 24c8b701..cc3a2f94 100644 --- a/src/d/actor/d_a_lod_bg.cpp +++ b/src/d/actor/d_a_lod_bg.cpp @@ -76,7 +76,6 @@ static s32 daLodbg_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daLodbg_Method = { (process_method_func)daLodbg_Create, (process_method_func)daLodbg_Delete, diff --git a/src/d/actor/d_a_lstair.cpp b/src/d/actor/d_a_lstair.cpp index 773be804..91cb96db 100644 --- a/src/d/actor/d_a_lstair.cpp +++ b/src/d/actor/d_a_lstair.cpp @@ -106,7 +106,6 @@ static BOOL daLStair_IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daLStairMethodTable = { (process_method_func)daLStair_Create, (process_method_func)daLStair_Delete, diff --git a/src/d/actor/d_a_lwood.cpp b/src/d/actor/d_a_lwood.cpp index 90912afe..fe3afa4e 100644 --- a/src/d/actor/d_a_lwood.cpp +++ b/src/d/actor/d_a_lwood.cpp @@ -62,7 +62,6 @@ static BOOL daLwood_IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daLwoodMethodTable = { (process_method_func)daLwood_Create, (process_method_func)daLwood_Delete, diff --git a/src/d/actor/d_a_magma.cpp b/src/d/actor/d_a_magma.cpp index ec11d867..2d29fdfe 100644 --- a/src/d/actor/d_a_magma.cpp +++ b/src/d/actor/d_a_magma.cpp @@ -52,24 +52,24 @@ static s32 daMagma_Create(fopAc_ac_c* i_this) { static actor_method_class l_daMagma_Method = { (process_method_func)daMagma_Create, (process_method_func)daMagma_Delete, - (process_method_func)0, + (process_method_func)NULL, (process_method_func)daMagma_IsDelete, - (process_method_func)0, + (process_method_func)NULL, }; actor_process_profile_definition g_profile_MAGMA = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_MAGMA, - &g_fpcLf_Method.base, - sizeof(daMagma_c), - 0, - 0, - &g_fopAc_Method.base, - 0x01BC, - &l_daMagma_Method, - fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_MAGMA, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daMagma_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x01BC, + /* Actor SubMtd */ &l_daMagma_Method, + /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_majuu_flag.cpp b/src/d/actor/d_a_majuu_flag.cpp index 68134cac..05fed961 100644 --- a/src/d/actor/d_a_majuu_flag.cpp +++ b/src/d/actor/d_a_majuu_flag.cpp @@ -71,7 +71,6 @@ static s32 daMajuu_Flag_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daMajuu_Flag_Method = { (process_method_func)daMajuu_Flag_Create, (process_method_func)daMajuu_Flag_Delete, diff --git a/src/d/actor/d_a_mant.cpp b/src/d/actor/d_a_mant.cpp index e34c45b9..3144744c 100644 --- a/src/d/actor/d_a_mant.cpp +++ b/src/d/actor/d_a_mant.cpp @@ -56,7 +56,6 @@ static s32 daMant_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daMant_Method = { (process_method_func)daMant_Create, (process_method_func)daMant_Delete, diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp index fcad0704..6078fac9 100644 --- a/src/d/actor/d_a_mbdoor.cpp +++ b/src/d/actor/d_a_mbdoor.cpp @@ -593,7 +593,7 @@ static actor_method_class l_daMbdoor_Method = { actor_process_profile_definition g_profile_MBDOOR = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, + /* ListID */ 0x0003, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_MBDOOR, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_mdoor.cpp b/src/d/actor/d_a_mdoor.cpp index abdf1125..9f63d73f 100644 --- a/src/d/actor/d_a_mdoor.cpp +++ b/src/d/actor/d_a_mdoor.cpp @@ -136,7 +136,6 @@ static s32 daMdoor_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daMdoor_Method = { (process_method_func)daMdoor_Create, (process_method_func)daMdoor_Delete, diff --git a/src/d/actor/d_a_mgameboard.cpp b/src/d/actor/d_a_mgameboard.cpp index 5ff45b38..5397237f 100644 --- a/src/d/actor/d_a_mgameboard.cpp +++ b/src/d/actor/d_a_mgameboard.cpp @@ -91,7 +91,6 @@ static BOOL daMgBoard_IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daMgBoardMethodTable = { (process_method_func)daMgBoard_Create, (process_method_func)daMgBoard_Delete, diff --git a/src/d/actor/d_a_mmusic.cpp b/src/d/actor/d_a_mmusic.cpp index 4ee65c35..956d207f 100644 --- a/src/d/actor/d_a_mmusic.cpp +++ b/src/d/actor/d_a_mmusic.cpp @@ -183,7 +183,7 @@ namespace daMmusic { actor_process_profile_definition g_profile_Mmusic = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Mmusic, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_mo2.cpp b/src/d/actor/d_a_mo2.cpp index bf2b71c7..d4a52d1b 100644 --- a/src/d/actor/d_a_mo2.cpp +++ b/src/d/actor/d_a_mo2.cpp @@ -341,7 +341,6 @@ static s32 daMo2_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daMo2_Method = { (process_method_func)daMo2_Create, (process_method_func)daMo2_Delete, diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp index d057bb40..7e010cee 100644 --- a/src/d/actor/d_a_mozo.cpp +++ b/src/d/actor/d_a_mozo.cpp @@ -286,18 +286,18 @@ static actor_method_class l_daMozo_Method = { }; actor_process_profile_definition g_profile_MOZO = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_MOZO, - &g_fpcLf_Method.base, - sizeof(daMozo_c), - 0, - 0, - &g_fopAc_Method.base, - 0x00D1, - &l_daMozo_Method, - fopAcStts_CULL_e | fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_MOZO, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daMozo_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x00D1, + /* Actor SubMtd */ &l_daMozo_Method, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_mt.cpp b/src/d/actor/d_a_mt.cpp index 5de073c6..6d0b6ada 100644 --- a/src/d/actor/d_a_mt.cpp +++ b/src/d/actor/d_a_mt.cpp @@ -162,7 +162,6 @@ static s32 daMt_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daMt_Method = { (process_method_func)daMt_Create, (process_method_func)daMt_Delete, diff --git a/src/d/actor/d_a_mtoge.cpp b/src/d/actor/d_a_mtoge.cpp index 4962b00a..29451933 100644 --- a/src/d/actor/d_a_mtoge.cpp +++ b/src/d/actor/d_a_mtoge.cpp @@ -86,7 +86,6 @@ static s32 daMtoge_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daMtoge_Method = { (process_method_func)daMtoge_Create, (process_method_func)daMtoge_Delete, diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp index 51dfe2b4..2e25d2ff 100644 --- a/src/d/actor/d_a_nh.cpp +++ b/src/d/actor/d_a_nh.cpp @@ -508,8 +508,8 @@ static actor_method_class l_daNh_Method = { actor_process_profile_definition g_profile_NH = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_NH, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNh_c), diff --git a/src/d/actor/d_a_npc_ac1.cpp b/src/d/actor/d_a_npc_ac1.cpp index 5969fed4..cbf1efd2 100644 --- a/src/d/actor/d_a_npc_ac1.cpp +++ b/src/d/actor/d_a_npc_ac1.cpp @@ -331,7 +331,6 @@ static BOOL daNpc_Ac1_IsDelete(daNpc_Ac1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Ac1_Method = { (process_method_func)daNpc_Ac1_Create, (process_method_func)daNpc_Ac1_Delete, diff --git a/src/d/actor/d_a_npc_aj1.cpp b/src/d/actor/d_a_npc_aj1.cpp index b7af3f5e..554faaca 100644 --- a/src/d/actor/d_a_npc_aj1.cpp +++ b/src/d/actor/d_a_npc_aj1.cpp @@ -476,7 +476,6 @@ static BOOL daNpc_Aj1_IsDelete(daNpc_Aj1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Aj1_Method = { (process_method_func)daNpc_Aj1_Create, (process_method_func)daNpc_Aj1_Delete, diff --git a/src/d/actor/d_a_npc_auction.cpp b/src/d/actor/d_a_npc_auction.cpp index 3acd21e9..63e08d9a 100644 --- a/src/d/actor/d_a_npc_auction.cpp +++ b/src/d/actor/d_a_npc_auction.cpp @@ -217,7 +217,6 @@ static BOOL daNpc_AuctionIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daNpc_AuctionMethodTable = { (process_method_func)daNpc_AuctionCreate, (process_method_func)daNpc_AuctionDelete, diff --git a/src/d/actor/d_a_npc_ba1.cpp b/src/d/actor/d_a_npc_ba1.cpp index 5935199c..710ef677 100644 --- a/src/d/actor/d_a_npc_ba1.cpp +++ b/src/d/actor/d_a_npc_ba1.cpp @@ -521,7 +521,6 @@ static BOOL daNpc_Ba1_IsDelete(daNpc_Ba1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Ba1_Method = { (process_method_func)daNpc_Ba1_Create, (process_method_func)daNpc_Ba1_Delete, diff --git a/src/d/actor/d_a_npc_bj1.cpp b/src/d/actor/d_a_npc_bj1.cpp index fe0cc3ee..31873d81 100644 --- a/src/d/actor/d_a_npc_bj1.cpp +++ b/src/d/actor/d_a_npc_bj1.cpp @@ -626,7 +626,6 @@ static BOOL daNpc_Bj1_IsDelete(daNpc_Bj1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Bj1_Method = { (process_method_func)daNpc_Bj1_Create, (process_method_func)daNpc_Bj1_Delete, diff --git a/src/d/actor/d_a_npc_bm1.cpp b/src/d/actor/d_a_npc_bm1.cpp index fe7cd008..f565631c 100644 --- a/src/d/actor/d_a_npc_bm1.cpp +++ b/src/d/actor/d_a_npc_bm1.cpp @@ -836,7 +836,6 @@ static BOOL daNpc_Bm1_IsDelete(daNpc_Bm1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Bm1_Method = { (process_method_func)daNpc_Bm1_Create, (process_method_func)daNpc_Bm1_Delete, diff --git a/src/d/actor/d_a_npc_bms1.cpp b/src/d/actor/d_a_npc_bms1.cpp index f3af0488..db9b238b 100644 --- a/src/d/actor/d_a_npc_bms1.cpp +++ b/src/d/actor/d_a_npc_bms1.cpp @@ -271,7 +271,6 @@ static BOOL daNpc_Bms1_IsDelete(daNpc_Bms1_c*) { // /* Nonmatching */ // } - static actor_method_class l_daNpc_Bms1_Method = { (process_method_func)daNpc_Bms1_Create, (process_method_func)daNpc_Bms1_Delete, diff --git a/src/d/actor/d_a_npc_bmsw.cpp b/src/d/actor/d_a_npc_bmsw.cpp index 816a391a..0f0eb8da 100644 --- a/src/d/actor/d_a_npc_bmsw.cpp +++ b/src/d/actor/d_a_npc_bmsw.cpp @@ -276,7 +276,6 @@ static BOOL daNpc_Bmsw_IsDelete(daNpc_Bmsw_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Bmsw_Method = { (process_method_func)daNpc_Bmsw_Create, (process_method_func)daNpc_Bmsw_Delete, diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp index db48616d..444f8d20 100644 --- a/src/d/actor/d_a_npc_bs1.cpp +++ b/src/d/actor/d_a_npc_bs1.cpp @@ -2315,7 +2315,7 @@ static actor_method_class l_daNpc_Bs1_Method = { actor_process_profile_definition g_profile_NPC_BS1 = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_NPC_BS1, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_npc_btsw.cpp b/src/d/actor/d_a_npc_btsw.cpp index f32588ac..fe5d1ae7 100644 --- a/src/d/actor/d_a_npc_btsw.cpp +++ b/src/d/actor/d_a_npc_btsw.cpp @@ -282,7 +282,6 @@ static BOOL daNpc_Btsw_IsDelete(daNpc_Btsw_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Btsw_Method = { (process_method_func)daNpc_Btsw_Create, (process_method_func)daNpc_Btsw_Delete, diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp index 0400849b..50e5b1e2 100644 --- a/src/d/actor/d_a_npc_btsw2.cpp +++ b/src/d/actor/d_a_npc_btsw2.cpp @@ -721,8 +721,8 @@ static actor_method_class l_daNpc_Btsw2_Method = { actor_process_profile_definition g_profile_NPC_BTSW2 = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_NPC_BTSW2, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Btsw2_c), diff --git a/src/d/actor/d_a_npc_co1.cpp b/src/d/actor/d_a_npc_co1.cpp index 4e40d86a..efdb7dae 100644 --- a/src/d/actor/d_a_npc_co1.cpp +++ b/src/d/actor/d_a_npc_co1.cpp @@ -366,7 +366,6 @@ static BOOL daNpc_Co1_IsDelete(daNpc_Co1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Co1_Method = { (process_method_func)daNpc_Co1_Create, (process_method_func)daNpc_Co1_Delete, diff --git a/src/d/actor/d_a_npc_gk1.cpp b/src/d/actor/d_a_npc_gk1.cpp index 5306ddf1..8f8ed50a 100644 --- a/src/d/actor/d_a_npc_gk1.cpp +++ b/src/d/actor/d_a_npc_gk1.cpp @@ -316,7 +316,6 @@ static BOOL daNpc_Gk1_IsDelete(daNpc_Gk1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Gk1_Method = { (process_method_func)daNpc_Gk1_Create, (process_method_func)daNpc_Gk1_Delete, diff --git a/src/d/actor/d_a_npc_gp1.cpp b/src/d/actor/d_a_npc_gp1.cpp index 8a3181d4..f419e7ef 100644 --- a/src/d/actor/d_a_npc_gp1.cpp +++ b/src/d/actor/d_a_npc_gp1.cpp @@ -361,7 +361,6 @@ static BOOL daNpc_Gp1_IsDelete(daNpc_Gp1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Gp1_Method = { (process_method_func)daNpc_Gp1_Create, (process_method_func)daNpc_Gp1_Delete, diff --git a/src/d/actor/d_a_npc_hi1.cpp b/src/d/actor/d_a_npc_hi1.cpp index 026fed7d..ae9978da 100644 --- a/src/d/actor/d_a_npc_hi1.cpp +++ b/src/d/actor/d_a_npc_hi1.cpp @@ -311,7 +311,6 @@ static BOOL daNpc_Hi1_IsDelete(daNpc_Hi1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Hi1_Method = { (process_method_func)daNpc_Hi1_Create, (process_method_func)daNpc_Hi1_Delete, diff --git a/src/d/actor/d_a_npc_jb1.cpp b/src/d/actor/d_a_npc_jb1.cpp index 7c4e596c..7bfc28d7 100644 --- a/src/d/actor/d_a_npc_jb1.cpp +++ b/src/d/actor/d_a_npc_jb1.cpp @@ -231,7 +231,6 @@ static BOOL daNpc_Jb1_IsDelete(daNpc_Jb1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Jb1_Method = { (process_method_func)daNpc_Jb1_Create, (process_method_func)daNpc_Jb1_Delete, diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index df64c628..bd7bc611 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -3453,8 +3453,8 @@ static actor_method_class l_daNpc_Ji1_Method = { actor_process_profile_definition g_profile_NPC_JI1 = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_NPC_JI1, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Ji1_c), @@ -3467,4 +3467,3 @@ actor_process_profile_definition g_profile_NPC_JI1 = { /* Group */ fopAc_ENEMY_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; - diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index 28a51ef9..2a6fa653 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -1445,8 +1445,8 @@ static actor_method_class l_daNpc_kam_Method = { actor_process_profile_definition g_profile_NPC_KAM = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_NPC_KAM, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_kam_c), diff --git a/src/d/actor/d_a_npc_kf1.cpp b/src/d/actor/d_a_npc_kf1.cpp index d985e994..4623fb81 100644 --- a/src/d/actor/d_a_npc_kf1.cpp +++ b/src/d/actor/d_a_npc_kf1.cpp @@ -481,7 +481,6 @@ static BOOL daNpc_Kf1_IsDelete(daNpc_Kf1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Kf1_Method = { (process_method_func)daNpc_Kf1_Create, (process_method_func)daNpc_Kf1_Delete, diff --git a/src/d/actor/d_a_npc_kg1.cpp b/src/d/actor/d_a_npc_kg1.cpp index 6e253c23..32988bde 100644 --- a/src/d/actor/d_a_npc_kg1.cpp +++ b/src/d/actor/d_a_npc_kg1.cpp @@ -142,7 +142,6 @@ static BOOL daNpc_Kg1IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daNpc_Kg1MethodTable = { (process_method_func)daNpc_Kg1Create, (process_method_func)daNpc_Kg1Delete, diff --git a/src/d/actor/d_a_npc_kg2.cpp b/src/d/actor/d_a_npc_kg2.cpp index aa22898d..ac5b12ec 100644 --- a/src/d/actor/d_a_npc_kg2.cpp +++ b/src/d/actor/d_a_npc_kg2.cpp @@ -202,7 +202,6 @@ static BOOL daNpc_Kg2_IsDelete(daNpc_Kg2_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Kg2_Method = { (process_method_func)daNpc_Kg2_Create, (process_method_func)daNpc_Kg2_Delete, diff --git a/src/d/actor/d_a_npc_kk1.cpp b/src/d/actor/d_a_npc_kk1.cpp index 9192748d..37b0d895 100644 --- a/src/d/actor/d_a_npc_kk1.cpp +++ b/src/d/actor/d_a_npc_kk1.cpp @@ -591,7 +591,6 @@ static BOOL daNpc_Kk1_IsDelete(daNpc_Kk1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Kk1_Method = { (process_method_func)daNpc_Kk1_Create, (process_method_func)daNpc_Kk1_Delete, diff --git a/src/d/actor/d_a_npc_km1.cpp b/src/d/actor/d_a_npc_km1.cpp index 96701872..cd6b117c 100644 --- a/src/d/actor/d_a_npc_km1.cpp +++ b/src/d/actor/d_a_npc_km1.cpp @@ -247,7 +247,6 @@ static BOOL daNpc_Km1_IsDelete(daNpc_Km1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Km1_Method = { (process_method_func)daNpc_Km1_Create, (process_method_func)daNpc_Km1_Delete, diff --git a/src/d/actor/d_a_npc_ko1.cpp b/src/d/actor/d_a_npc_ko1.cpp index 283943a5..60a59192 100644 --- a/src/d/actor/d_a_npc_ko1.cpp +++ b/src/d/actor/d_a_npc_ko1.cpp @@ -701,7 +701,6 @@ static BOOL daNpc_Ko1_IsDelete(daNpc_Ko1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Ko1_Method = { (process_method_func)daNpc_Ko1_Create, (process_method_func)daNpc_Ko1_Delete, diff --git a/src/d/actor/d_a_npc_kp1.cpp b/src/d/actor/d_a_npc_kp1.cpp index f8361aa8..b4d43e14 100644 --- a/src/d/actor/d_a_npc_kp1.cpp +++ b/src/d/actor/d_a_npc_kp1.cpp @@ -262,7 +262,6 @@ static BOOL daNpc_Kp1_IsDelete(daNpc_Kp1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Kp1_Method = { (process_method_func)daNpc_Kp1_Create, (process_method_func)daNpc_Kp1_Delete, diff --git a/src/d/actor/d_a_npc_ls1.cpp b/src/d/actor/d_a_npc_ls1.cpp index 509550c1..92cf91d1 100644 --- a/src/d/actor/d_a_npc_ls1.cpp +++ b/src/d/actor/d_a_npc_ls1.cpp @@ -526,7 +526,6 @@ static BOOL daNpc_Ls1_IsDelete(daNpc_Ls1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Ls1_Method = { (process_method_func)daNpc_Ls1_Create, (process_method_func)daNpc_Ls1_Delete, diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index 1285b5e4..736a1b28 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -3122,8 +3122,8 @@ static actor_method_class l_daNpc_Md_Method = { actor_process_profile_definition g_profile_NPC_MD = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_NPC_MD, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Md_c), diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp index 8d8fe90d..b27bc4c8 100644 --- a/src/d/actor/d_a_npc_nz.cpp +++ b/src/d/actor/d_a_npc_nz.cpp @@ -986,7 +986,7 @@ static actor_method_class daNpc_NzMethodTable = { actor_process_profile_definition g_profile_NPC_NZ = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, + /* ListID */ 0x0003, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_NPC_NZ, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_npc_ob1.cpp b/src/d/actor/d_a_npc_ob1.cpp index 29068c95..3626216b 100644 --- a/src/d/actor/d_a_npc_ob1.cpp +++ b/src/d/actor/d_a_npc_ob1.cpp @@ -396,7 +396,6 @@ static BOOL daNpc_Ob1_IsDelete(daNpc_Ob1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Ob1_Method = { (process_method_func)daNpc_Ob1_Create, (process_method_func)daNpc_Ob1_Delete, diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index c8476e2e..c29b5d93 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/src/d/actor/d_a_npc_os.cpp @@ -2429,18 +2429,18 @@ static actor_method_class l_daNpc_Os_Method = { }; actor_process_profile_definition g_profile_NPC_OS = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_NPC_OS, - &g_fpcLf_Method.base, - sizeof(daNpc_Os_c), - 0, - 0, - &g_fopAc_Method.base, - 0x013D, - &l_daNpc_Os_Method, - fopAcStts_UNK8000000_e | fopAcStts_UNK2000000_e | fopAcStts_UNK40000_e | fopAcStts_UNK4000_e | fopAcStts_FREEZE_e | fopAcStts_CULL_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_NPC_OS, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Os_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x013D, + /* Actor SubMtd */ &l_daNpc_Os_Method, + /* Status */ fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_UNK2000000_e | fopAcStts_UNK8000000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_p1.cpp b/src/d/actor/d_a_npc_p1.cpp index af725345..c30a08f3 100644 --- a/src/d/actor/d_a_npc_p1.cpp +++ b/src/d/actor/d_a_npc_p1.cpp @@ -187,7 +187,6 @@ static s32 daNpc_P1_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_P1_Method = { (process_method_func)daNpc_P1_Create, (process_method_func)daNpc_P1_Delete, diff --git a/src/d/actor/d_a_npc_p2.cpp b/src/d/actor/d_a_npc_p2.cpp index 0fbde74a..c221b91a 100644 --- a/src/d/actor/d_a_npc_p2.cpp +++ b/src/d/actor/d_a_npc_p2.cpp @@ -492,7 +492,6 @@ void daNpc_P2_c::cutOmamoriEndProc(int) { /* Nonmatching */ } - static actor_method_class daNpc_P2MethodTable = { (process_method_func)daNpc_P2Create, (process_method_func)daNpc_P2Delete, diff --git a/src/d/actor/d_a_npc_pf1.cpp b/src/d/actor/d_a_npc_pf1.cpp index 56d831e0..774846c1 100644 --- a/src/d/actor/d_a_npc_pf1.cpp +++ b/src/d/actor/d_a_npc_pf1.cpp @@ -361,7 +361,6 @@ static BOOL daNpc_Pf1_IsDelete(daNpc_Pf1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Pf1_Method = { (process_method_func)daNpc_Pf1_Create, (process_method_func)daNpc_Pf1_Delete, diff --git a/src/d/actor/d_a_npc_photo.cpp b/src/d/actor/d_a_npc_photo.cpp index 05c07fe2..6c9bd30f 100644 --- a/src/d/actor/d_a_npc_photo.cpp +++ b/src/d/actor/d_a_npc_photo.cpp @@ -337,7 +337,6 @@ static BOOL daNpc_PhotoIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daNpc_PhotoMethodTable = { (process_method_func)daNpc_PhotoCreate, (process_method_func)daNpc_PhotoDelete, diff --git a/src/d/actor/d_a_npc_pm1.cpp b/src/d/actor/d_a_npc_pm1.cpp index ff83361b..4890650d 100644 --- a/src/d/actor/d_a_npc_pm1.cpp +++ b/src/d/actor/d_a_npc_pm1.cpp @@ -247,7 +247,6 @@ static BOOL daNpc_Pm1_IsDelete(daNpc_Pm1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Pm1_Method = { (process_method_func)daNpc_Pm1_Create, (process_method_func)daNpc_Pm1_Delete, diff --git a/src/d/actor/d_a_npc_sarace.cpp b/src/d/actor/d_a_npc_sarace.cpp index 808842cd..549180d2 100644 --- a/src/d/actor/d_a_npc_sarace.cpp +++ b/src/d/actor/d_a_npc_sarace.cpp @@ -162,7 +162,6 @@ static BOOL daNpc_Sarace_IsDelete(daNpc_Sarace_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Sarace_Method = { (process_method_func)daNpc_Sarace_Create, (process_method_func)daNpc_Sarace_Delete, diff --git a/src/d/actor/d_a_npc_ym1.cpp b/src/d/actor/d_a_npc_ym1.cpp index df16a5ee..6dd222f7 100644 --- a/src/d/actor/d_a_npc_ym1.cpp +++ b/src/d/actor/d_a_npc_ym1.cpp @@ -436,7 +436,6 @@ static BOOL daNpc_Ym1_IsDelete(daNpc_Ym1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Ym1_Method = { (process_method_func)daNpc_Ym1_Create, (process_method_func)daNpc_Ym1_Delete, diff --git a/src/d/actor/d_a_npc_yw1.cpp b/src/d/actor/d_a_npc_yw1.cpp index 5db711c1..a89c0fce 100644 --- a/src/d/actor/d_a_npc_yw1.cpp +++ b/src/d/actor/d_a_npc_yw1.cpp @@ -416,7 +416,6 @@ static BOOL daNpc_Yw1_IsDelete(daNpc_Yw1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Yw1_Method = { (process_method_func)daNpc_Yw1_Create, (process_method_func)daNpc_Yw1_Delete, diff --git a/src/d/actor/d_a_npc_zk1.cpp b/src/d/actor/d_a_npc_zk1.cpp index cbab2380..39ff253d 100644 --- a/src/d/actor/d_a_npc_zk1.cpp +++ b/src/d/actor/d_a_npc_zk1.cpp @@ -291,7 +291,6 @@ static BOOL daNpc_Zk1_IsDelete(daNpc_Zk1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Zk1_Method = { (process_method_func)daNpc_Zk1_Create, (process_method_func)daNpc_Zk1_Delete, diff --git a/src/d/actor/d_a_npc_zl1.cpp b/src/d/actor/d_a_npc_zl1.cpp index b2fd37b3..e3837163 100644 --- a/src/d/actor/d_a_npc_zl1.cpp +++ b/src/d/actor/d_a_npc_zl1.cpp @@ -677,7 +677,6 @@ static BOOL daNpc_Zl1_IsDelete(daNpc_Zl1_c*) { /* Nonmatching */ } - static actor_method_class l_daNpc_Zl1_Method = { (process_method_func)daNpc_Zl1_Create, (process_method_func)daNpc_Zl1_Delete, diff --git a/src/d/actor/d_a_nz.cpp b/src/d/actor/d_a_nz.cpp index 5a2bdae1..ad58a5d8 100644 --- a/src/d/actor/d_a_nz.cpp +++ b/src/d/actor/d_a_nz.cpp @@ -177,7 +177,6 @@ static s32 daNZ_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daNZ_Method = { (process_method_func)daNZ_Create, (process_method_func)daNZ_Delete, diff --git a/src/d/actor/d_a_obj_AjavW.cpp b/src/d/actor/d_a_obj_AjavW.cpp index f0aa9edc..94be21de 100644 --- a/src/d/actor/d_a_obj_AjavW.cpp +++ b/src/d/actor/d_a_obj_AjavW.cpp @@ -146,7 +146,7 @@ static actor_method_class l_daObjAjavW_Method = { actor_process_profile_definition g_profile_Obj_AjavW = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, + /* ListID */ 0x0003, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_AjavW, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_obj_Vteng.cpp b/src/d/actor/d_a_obj_Vteng.cpp index 820dd406..655452f8 100644 --- a/src/d/actor/d_a_obj_Vteng.cpp +++ b/src/d/actor/d_a_obj_Vteng.cpp @@ -156,7 +156,7 @@ static actor_method_class l_daObjVteng_Method = { actor_process_profile_definition g_profile_Obj_Vteng = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, + /* ListID */ 0x0003, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Vteng, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_obj_YLzou.cpp b/src/d/actor/d_a_obj_YLzou.cpp index 784a7543..5b8b79ea 100644 --- a/src/d/actor/d_a_obj_YLzou.cpp +++ b/src/d/actor/d_a_obj_YLzou.cpp @@ -201,7 +201,6 @@ static BOOL daObjYLzou_IsDelete(daObjYLzou_c*) { /* Nonmatching */ } - static actor_method_class l_daObjYLzou_Method = { (process_method_func)daObjYLzou_Create, (process_method_func)daObjYLzou_Delete, diff --git a/src/d/actor/d_a_obj_Yboil.cpp b/src/d/actor/d_a_obj_Yboil.cpp index 111ae3cc..086b6ea1 100644 --- a/src/d/actor/d_a_obj_Yboil.cpp +++ b/src/d/actor/d_a_obj_Yboil.cpp @@ -204,8 +204,8 @@ static actor_method_class daObj_YboilMethodTable = { actor_process_profile_definition g_profile_Obj_Yboil = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Yboil, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjYboil_c), diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp index 9f6f753d..3cba2862 100644 --- a/src/d/actor/d_a_obj_Ygush00.cpp +++ b/src/d/actor/d_a_obj_Ygush00.cpp @@ -160,7 +160,7 @@ static actor_method_class l_daObjYgush00_Method = { actor_process_profile_definition g_profile_Obj_Ygush00 = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, + /* ListID */ 0x0003, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Ygush00, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_obj_adnno.cpp b/src/d/actor/d_a_obj_adnno.cpp index 758553fa..607e3a30 100644 --- a/src/d/actor/d_a_obj_adnno.cpp +++ b/src/d/actor/d_a_obj_adnno.cpp @@ -141,7 +141,7 @@ static actor_method_class daObj_AdnnoMethodTable = { actor_process_profile_definition g_profile_Obj_Adnno = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Adnno, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -151,7 +151,7 @@ actor_process_profile_definition g_profile_Obj_Adnno = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x007E, /* Actor SubMtd */ &daObj_AdnnoMethodTable, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_CULL_e | fopAcStts_NOCULLEXEC_e, + /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_akabe.cpp b/src/d/actor/d_a_obj_akabe.cpp index c2d66a13..d8b94882 100644 --- a/src/d/actor/d_a_obj_akabe.cpp +++ b/src/d/actor/d_a_obj_akabe.cpp @@ -186,8 +186,8 @@ namespace daObjAkabe { actor_process_profile_definition g_profile_Obj_Akabe = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0003, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Akabe, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjAkabe::Act_c), @@ -196,7 +196,7 @@ actor_process_profile_definition g_profile_Obj_Akabe = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0033, /* Actor SubMtd */ &daObjAkabe::Mthd_Table, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_CULL_e | fopAcStts_NOCULLEXEC_e, + /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_apzl.cpp b/src/d/actor/d_a_obj_apzl.cpp index 66a1dd38..568ad265 100644 --- a/src/d/actor/d_a_obj_apzl.cpp +++ b/src/d/actor/d_a_obj_apzl.cpp @@ -116,7 +116,6 @@ static BOOL daObjApzl_IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daObj_ApzlMethodTable = { (process_method_func)daObjApzl_Create, (process_method_func)daObjApzl_Delete, diff --git a/src/d/actor/d_a_obj_balancelift.cpp b/src/d/actor/d_a_obj_balancelift.cpp index 4de3afbe..127efa6f 100644 --- a/src/d/actor/d_a_obj_balancelift.cpp +++ b/src/d/actor/d_a_obj_balancelift.cpp @@ -82,7 +82,6 @@ static BOOL daBalanceliftIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daBalanceliftMethodTable = { (process_method_func)daBalanceliftCreate, (process_method_func)daBalanceliftDelete, diff --git a/src/d/actor/d_a_obj_barrel.cpp b/src/d/actor/d_a_obj_barrel.cpp index b67ea8a0..0532e56a 100644 --- a/src/d/actor/d_a_obj_barrel.cpp +++ b/src/d/actor/d_a_obj_barrel.cpp @@ -245,7 +245,7 @@ actor_process_profile_definition g_profile_Obj_Barrel = { /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0109, - /* Actor SubMtd */ &daObjBarrel::daObjBarrel::Method::Table, + /* Actor SubMtd */ &daObjBarrel::Method::Table, /* Status */ fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e | fopAcStts_UNK8000000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, diff --git a/src/d/actor/d_a_obj_barrel2.cpp b/src/d/actor/d_a_obj_barrel2.cpp index 37b74980..7c2500f4 100644 --- a/src/d/actor/d_a_obj_barrel2.cpp +++ b/src/d/actor/d_a_obj_barrel2.cpp @@ -271,7 +271,6 @@ BOOL daObjBarrel2::Method::IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daObjBarrel2::Method::Table = { (process_method_func)daObjBarrel2::Method::Create, (process_method_func)daObjBarrel2::Method::Delete, @@ -291,7 +290,7 @@ actor_process_profile_definition g_profile_Obj_Barrel2 = { /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x010A, - /* Actor SubMtd */ &daObjBarrel2::daObjBarrel2::Method::Table, + /* Actor SubMtd */ &daObjBarrel2::Method::Table, /* Status */ 0x05 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index 6fe126ae..8206a411 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -609,14 +609,16 @@ static int daObjBarrier_IsDelete(daObjBarrier_c* i_this) { } static actor_method_class l_daObjBarrier_Method = { - (process_method_func)daObjBarrier_Create, (process_method_func)daObjBarrier_Delete, - (process_method_func)daObjBarrier_Execute, (process_method_func)daObjBarrier_IsDelete, + (process_method_func)daObjBarrier_Create, + (process_method_func)daObjBarrier_Delete, + (process_method_func)daObjBarrier_Execute, + (process_method_func)daObjBarrier_IsDelete, (process_method_func)daObjBarrier_Draw, }; actor_process_profile_definition g_profile_Obj_Barrier = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Barrier, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -624,7 +626,7 @@ actor_process_profile_definition g_profile_Obj_Barrier = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 131, + /* Priority */ 0x0083, /* Actor SubMtd */ &l_daObjBarrier_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 9207df38..39ea7053 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -216,7 +216,6 @@ static BOOL daBemosIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daBemosMethodTable = { (process_method_func)daBemosCreate, (process_method_func)daBemosDelete, diff --git a/src/d/actor/d_a_obj_bscurtain.cpp b/src/d/actor/d_a_obj_bscurtain.cpp index 140e60c5..321d2b94 100644 --- a/src/d/actor/d_a_obj_bscurtain.cpp +++ b/src/d/actor/d_a_obj_bscurtain.cpp @@ -131,7 +131,7 @@ static actor_method_class daObj_BscurtainMethodTable = { actor_process_profile_definition g_profile_Obj_Bscurtain = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, + /* ListID */ 0x0003, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Bscurtain, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -141,7 +141,7 @@ actor_process_profile_definition g_profile_Obj_Bscurtain = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x01BE, /* Actor SubMtd */ &daObj_BscurtainMethodTable, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_NOCULLEXEC_e, + /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_obj_cafelmp.cpp b/src/d/actor/d_a_obj_cafelmp.cpp index 33888c28..92859e25 100644 --- a/src/d/actor/d_a_obj_cafelmp.cpp +++ b/src/d/actor/d_a_obj_cafelmp.cpp @@ -105,7 +105,7 @@ static BOOL daObjCafelmp_IsDelete(void* i_this) { return TRUE; } -static actor_method_class l_daObjCafelmp_Method = { +static actor_method_class daObj_CafelmpMethodTable = { (process_method_func)daObjCafelmp_Create, (process_method_func)daObjCafelmp_Delete, (process_method_func)daObjCafelmp_Execute, @@ -115,7 +115,7 @@ static actor_method_class l_daObjCafelmp_Method = { actor_process_profile_definition g_profile_Obj_Cafelmp = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Cafelmp, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -124,8 +124,8 @@ actor_process_profile_definition g_profile_Obj_Cafelmp = { /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0077, - /* Actor SubMtd */ &l_daObjCafelmp_Method, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_CULL_e | fopAcStts_NOCULLEXEC_e, + /* Actor SubMtd */ &daObj_CafelmpMethodTable, + /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_canon.cpp b/src/d/actor/d_a_obj_canon.cpp index 24252968..2788291f 100644 --- a/src/d/actor/d_a_obj_canon.cpp +++ b/src/d/actor/d_a_obj_canon.cpp @@ -181,7 +181,6 @@ static BOOL daObj_CanonIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daObj_CanonMethodTable = { (process_method_func)daObj_CanonCreate, (process_method_func)daObj_CanonDelete, diff --git a/src/d/actor/d_a_obj_demo_barrel.cpp b/src/d/actor/d_a_obj_demo_barrel.cpp index 557f372d..67760987 100644 --- a/src/d/actor/d_a_obj_demo_barrel.cpp +++ b/src/d/actor/d_a_obj_demo_barrel.cpp @@ -51,7 +51,6 @@ static BOOL daObj_Demo_BarrelIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daObj_Demo_BarrelMethodTable = { (process_method_func)daObj_Demo_BarrelCreate, (process_method_func)daObj_Demo_BarrelDelete, diff --git a/src/d/actor/d_a_obj_dmgroom.cpp b/src/d/actor/d_a_obj_dmgroom.cpp index 70e4c7b6..00c1bf2f 100644 --- a/src/d/actor/d_a_obj_dmgroom.cpp +++ b/src/d/actor/d_a_obj_dmgroom.cpp @@ -126,7 +126,7 @@ static actor_method_class daObj_DmgroomMethodTable = { actor_process_profile_definition g_profile_Obj_Dmgroom = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Dmgroom, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_obj_doguu_demo.cpp b/src/d/actor/d_a_obj_doguu_demo.cpp index 3f385913..ca1d5353 100644 --- a/src/d/actor/d_a_obj_doguu_demo.cpp +++ b/src/d/actor/d_a_obj_doguu_demo.cpp @@ -131,14 +131,16 @@ static BOOL daObjDoguuD_IsDelete(void*) { } static actor_method_class daObj_DoguuDMethodTable = { - (process_method_func)daObjDoguuD_create, (process_method_func)daObjDoguuD_Delete, - (process_method_func)daObjDoguuD_Execute, (process_method_func)daObjDoguuD_IsDelete, + (process_method_func)daObjDoguuD_create, + (process_method_func)daObjDoguuD_Delete, + (process_method_func)daObjDoguuD_Execute, + (process_method_func)daObjDoguuD_IsDelete, (process_method_func)daObjDoguuD_Draw, }; actor_process_profile_definition g_profile_Obj_DoguuD = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_DoguuD, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -146,7 +148,7 @@ actor_process_profile_definition g_profile_Obj_DoguuD = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01c5, + /* Priority */ 0x01C5, /* Actor SubMtd */ &daObj_DoguuDMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_dragonhead.cpp b/src/d/actor/d_a_obj_dragonhead.cpp index f2110b01..ff575b16 100644 --- a/src/d/actor/d_a_obj_dragonhead.cpp +++ b/src/d/actor/d_a_obj_dragonhead.cpp @@ -230,7 +230,7 @@ static actor_method_class daObj_DragonheadMethodTable = { actor_process_profile_definition g_profile_Obj_Dragonhead = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, + /* ListID */ 0x0003, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Dragonhead, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -240,7 +240,7 @@ actor_process_profile_definition g_profile_Obj_Dragonhead = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0025, /* Actor SubMtd */ &daObj_DragonheadMethodTable, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_UNK4000_e, + /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_eayogn.cpp b/src/d/actor/d_a_obj_eayogn.cpp index d4dea993..6ff1fd24 100644 --- a/src/d/actor/d_a_obj_eayogn.cpp +++ b/src/d/actor/d_a_obj_eayogn.cpp @@ -150,7 +150,7 @@ namespace { actor_process_profile_definition g_profile_Obj_Eayogn = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, + /* ListID */ 0x0003, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Eayogn, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -160,7 +160,7 @@ actor_process_profile_definition g_profile_Obj_Eayogn = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x004C, /* Actor SubMtd */ &Eayogn_Mthd_Table, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_CULL_e | fopAcStts_NOCULLEXEC_e, + /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ferris.cpp b/src/d/actor/d_a_obj_ferris.cpp index c9d9f32b..7af67751 100644 --- a/src/d/actor/d_a_obj_ferris.cpp +++ b/src/d/actor/d_a_obj_ferris.cpp @@ -558,7 +558,7 @@ namespace daObjFerris { actor_process_profile_definition g_profile_Obj_Ferris = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, + /* ListID */ 0x0003, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Ferris, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -568,7 +568,7 @@ actor_process_profile_definition g_profile_Obj_Ferris = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x003C, /* Actor SubMtd */ &daObjFerris::Mthd_Table, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_CULL_e, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_flame.cpp b/src/d/actor/d_a_obj_flame.cpp index cb11d55a..7f20d8e4 100644 --- a/src/d/actor/d_a_obj_flame.cpp +++ b/src/d/actor/d_a_obj_flame.cpp @@ -180,7 +180,7 @@ actor_process_profile_definition g_profile_Obj_Flame = { /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0111, - /* Actor SubMtd */ &daObjFlame::daObjFlame::Method::Table, + /* Actor SubMtd */ &daObjFlame::Method::Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, diff --git a/src/d/actor/d_a_obj_ganonbed.cpp b/src/d/actor/d_a_obj_ganonbed.cpp index 9ee9876c..98995315 100644 --- a/src/d/actor/d_a_obj_ganonbed.cpp +++ b/src/d/actor/d_a_obj_ganonbed.cpp @@ -145,7 +145,7 @@ static actor_method_class l_daObjGbed_Method = { actor_process_profile_definition g_profile_Obj_Gbed = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, + /* ListID */ 0x0003, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Gbed, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_obj_gaship2.cpp b/src/d/actor/d_a_obj_gaship2.cpp index fda3b0fd..5a5e3b6b 100644 --- a/src/d/actor/d_a_obj_gaship2.cpp +++ b/src/d/actor/d_a_obj_gaship2.cpp @@ -117,7 +117,7 @@ namespace daObjGaship2 { return TRUE; } - actor_method_class Mthd_Table = { + static actor_method_class Mthd_Table = { (process_method_func) Mthd_Create, (process_method_func) Mthd_Delete, (process_method_func) Mthd_Execute, @@ -129,7 +129,7 @@ namespace daObjGaship2 { actor_process_profile_definition g_profile_Obj_Gaship2 = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, + /* ListID */ 0x0003, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Gaship2, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -141,5 +141,5 @@ actor_process_profile_definition g_profile_Obj_Gaship2 = { /* Actor SubMtd */ &daObjGaship2::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* Cull Type */ fopAc_CULLBOX_0_e, + /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_gong.cpp b/src/d/actor/d_a_obj_gong.cpp index 702ce99f..464f35d0 100644 --- a/src/d/actor/d_a_obj_gong.cpp +++ b/src/d/actor/d_a_obj_gong.cpp @@ -161,7 +161,7 @@ namespace daObjGong { actor_process_profile_definition g_profile_Obj_Gong = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Gong, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -171,7 +171,7 @@ actor_process_profile_definition g_profile_Obj_Gong = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0081, /* Actor SubMtd */ &daObjGong::Mthd_Table, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_CULL_e | fopAcStts_NOCULLEXEC_e, + /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gryw00.cpp b/src/d/actor/d_a_obj_gryw00.cpp index f1bc33e8..cf10e33b 100644 --- a/src/d/actor/d_a_obj_gryw00.cpp +++ b/src/d/actor/d_a_obj_gryw00.cpp @@ -121,7 +121,6 @@ static BOOL daObjGryw00_IsDelete(daObjGryw00_c*) { /* Nonmatching */ } - static actor_method_class l_daObjGryw00_Method = { (process_method_func)daObjGryw00_Create, (process_method_func)daObjGryw00_Delete, diff --git a/src/d/actor/d_a_obj_hami4.cpp b/src/d/actor/d_a_obj_hami4.cpp index 5f32820e..26c4269d 100644 --- a/src/d/actor/d_a_obj_hami4.cpp +++ b/src/d/actor/d_a_obj_hami4.cpp @@ -71,7 +71,6 @@ static BOOL daObjHami4_IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daObj_Hami4MethodTable = { (process_method_func)daObjHami4_Create, (process_method_func)daObjHami4_Delete, diff --git a/src/d/actor/d_a_obj_hfuck1.cpp b/src/d/actor/d_a_obj_hfuck1.cpp index 76fb3a54..6dcd8027 100644 --- a/src/d/actor/d_a_obj_hfuck1.cpp +++ b/src/d/actor/d_a_obj_hfuck1.cpp @@ -213,7 +213,7 @@ static actor_method_class l_daObjHfuck1_Method = { actor_process_profile_definition g_profile_Obj_Hfuck1 = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, + /* ListID */ 0x0003, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Hfuck1, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -223,7 +223,7 @@ actor_process_profile_definition g_profile_Obj_Hfuck1 = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x005B, /* Actor SubMtd */ &l_daObjHfuck1_Method, - /* Status */ fopAcStts_UNK200000_e | fopAcStts_UNK40000_e | fopAcStts_CULL_e, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_3_e, }; diff --git a/src/d/actor/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp index ae4ee573..9c77a797 100644 --- a/src/d/actor/d_a_obj_hole.cpp +++ b/src/d/actor/d_a_obj_hole.cpp @@ -314,18 +314,18 @@ static actor_method_class daObj_HoleMethodTable = { }; actor_process_profile_definition g_profile_OBJ_HOLE = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_OBJ_HOLE, - &g_fpcLf_Method.base, - sizeof(daObj_Hole_c), - 0, - 0, - &g_fopAc_Method.base, - 0x01B7, - &daObj_HoleMethodTable, - fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_4_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0003, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_OBJ_HOLE, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Hole_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x01B7, + /* Actor SubMtd */ &daObj_HoleMethodTable, + /* Status */ fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_obj_homensmoke.cpp b/src/d/actor/d_a_obj_homensmoke.cpp index 9e781698..094fc033 100644 --- a/src/d/actor/d_a_obj_homensmoke.cpp +++ b/src/d/actor/d_a_obj_homensmoke.cpp @@ -162,8 +162,8 @@ namespace daObjHomensmoke { actor_process_profile_definition g_profile_Obj_Homensmk = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0003, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Homensmk, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjHomensmoke::Act_c), diff --git a/src/d/actor/d_a_obj_hsehi1.cpp b/src/d/actor/d_a_obj_hsehi1.cpp index 26a683bf..ace91edc 100644 --- a/src/d/actor/d_a_obj_hsehi1.cpp +++ b/src/d/actor/d_a_obj_hsehi1.cpp @@ -276,7 +276,6 @@ static s32 daObj_hsh_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daObj_hsh_Method = { (process_method_func)daObj_hsh_Create, (process_method_func)daObj_hsh_Delete, diff --git a/src/d/actor/d_a_obj_iceisland.cpp b/src/d/actor/d_a_obj_iceisland.cpp index 5f45914b..28f24648 100644 --- a/src/d/actor/d_a_obj_iceisland.cpp +++ b/src/d/actor/d_a_obj_iceisland.cpp @@ -96,7 +96,6 @@ static BOOL daObjIceisland_IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daObj_IceislandMethodTable = { (process_method_func)daObjIceisland_Create, (process_method_func)daObjIceisland_Delete, diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index 73663d68..8b6d0853 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -301,7 +301,6 @@ static BOOL daObj_IkadaIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daObj_IkadaMethodTable = { (process_method_func)daObj_IkadaCreate, (process_method_func)daObj_IkadaDelete, diff --git a/src/d/actor/d_a_obj_kanat.cpp b/src/d/actor/d_a_obj_kanat.cpp index b303e7ae..d8abea1a 100644 --- a/src/d/actor/d_a_obj_kanat.cpp +++ b/src/d/actor/d_a_obj_kanat.cpp @@ -161,8 +161,8 @@ namespace daObjKanat { actor_process_profile_definition g_profile_Obj_Kanat = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0003, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Kanat, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjKanat::Act_c), diff --git a/src/d/actor/d_a_obj_lpalm.cpp b/src/d/actor/d_a_obj_lpalm.cpp index 2ceae33c..3b97d30b 100644 --- a/src/d/actor/d_a_obj_lpalm.cpp +++ b/src/d/actor/d_a_obj_lpalm.cpp @@ -57,7 +57,6 @@ static BOOL daObjLpalmIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daObjLpalmMethodTable = { (process_method_func)daObjLpalmCreate, (process_method_func)daObjLpalmDelete, diff --git a/src/d/actor/d_a_obj_magmarock.cpp b/src/d/actor/d_a_obj_magmarock.cpp index 266348b0..faf1489d 100644 --- a/src/d/actor/d_a_obj_magmarock.cpp +++ b/src/d/actor/d_a_obj_magmarock.cpp @@ -141,7 +141,6 @@ BOOL daObjMagmarock::Method::IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daObjMagmarock::Method::Table = { (process_method_func)daObjMagmarock::Method::Create, (process_method_func)daObjMagmarock::Method::Delete, @@ -161,7 +160,7 @@ actor_process_profile_definition g_profile_Obj_Magmarock = { /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x01A9, - /* Actor SubMtd */ &daObjMagmarock::daObjMagmarock::Method::Table, + /* Actor SubMtd */ &daObjMagmarock::Method::Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, diff --git a/src/d/actor/d_a_obj_majyuu_door.cpp b/src/d/actor/d_a_obj_majyuu_door.cpp index 9de8da32..f8c69a7e 100644 --- a/src/d/actor/d_a_obj_majyuu_door.cpp +++ b/src/d/actor/d_a_obj_majyuu_door.cpp @@ -117,7 +117,6 @@ static BOOL daObj_MjDoorIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daObj_MjDoorMethodTable = { (process_method_func)daObj_MjDoorCreate, (process_method_func)daObj_MjDoorDelete, diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp index 54d39067..717f9ae3 100644 --- a/src/d/actor/d_a_obj_mknjd.cpp +++ b/src/d/actor/d_a_obj_mknjd.cpp @@ -1014,18 +1014,18 @@ namespace daObjMknjD { } actor_process_profile_definition g_profile_Obj_MknjD = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_MknjD, - &g_fpcLf_Method.base, - sizeof(daObjMknjD::Act_c), - 0, - 0, - &g_fopAc_Method.base, - 0x01C6, - &daObjMknjD::Mthd_Table, - fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0003, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_Obj_MknjD, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMknjD::Act_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x01C6, + /* Actor SubMtd */ &daObjMknjD::Mthd_Table, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_monument.cpp b/src/d/actor/d_a_obj_monument.cpp index ddbfe789..962ef83a 100644 --- a/src/d/actor/d_a_obj_monument.cpp +++ b/src/d/actor/d_a_obj_monument.cpp @@ -156,7 +156,7 @@ namespace daObjMonument { actor_process_profile_definition g_profile_Obj_Monument = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Monument, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -166,7 +166,7 @@ actor_process_profile_definition g_profile_Obj_Monument = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0086, /* Actor SubMtd */ &daObjMonument::Mthd_Table, - /* Status */ 0x18 | fopAcStts_SHOWMAP_e | fopAcStts_UNK40000_e | fopAcStts_CULL_e | fopAcStts_NOCULLEXEC_e, + /* Status */ 0x18 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 630f85af..ad495a4f 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -1995,8 +1995,8 @@ namespace daObjMovebox { actor_process_profile_definition g_profile_Obj_Movebox = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0003, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Movebox, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjMovebox::Act_c), diff --git a/src/d/actor/d_a_obj_mtest.cpp b/src/d/actor/d_a_obj_mtest.cpp index 2961d2af..1b718be8 100644 --- a/src/d/actor/d_a_obj_mtest.cpp +++ b/src/d/actor/d_a_obj_mtest.cpp @@ -414,8 +414,8 @@ namespace daObjMtest { actor_process_profile_definition g_profile_Obj_Mtest = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0003, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Mtest, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjMtest::Act_c), diff --git a/src/d/actor/d_a_obj_ohatch.cpp b/src/d/actor/d_a_obj_ohatch.cpp index f8f374ab..2bb06640 100644 --- a/src/d/actor/d_a_obj_ohatch.cpp +++ b/src/d/actor/d_a_obj_ohatch.cpp @@ -96,7 +96,6 @@ static BOOL daObjOhatch_IsDelete(daObjOhatch_c*) { /* Nonmatching */ } - static actor_method_class l_daObjOhatch_Method = { (process_method_func)daObjOhatch_Create, (process_method_func)daObjOhatch_Delete, diff --git a/src/d/actor/d_a_obj_ojtree.cpp b/src/d/actor/d_a_obj_ojtree.cpp index 94ce8faa..2065ade1 100644 --- a/src/d/actor/d_a_obj_ojtree.cpp +++ b/src/d/actor/d_a_obj_ojtree.cpp @@ -141,8 +141,8 @@ namespace daObjOjtree { actor_process_profile_definition g_profile_Obj_Ojtree = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0003, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Ojtree, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjOjtree::Act_c), @@ -151,7 +151,7 @@ actor_process_profile_definition g_profile_Obj_Ojtree = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x002D, /* Actor SubMtd */ &daObjOjtree::Mthd_Table, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_CULL_e | fopAcStts_NOCULLEXEC_e, + /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_otble.cpp b/src/d/actor/d_a_obj_otble.cpp index a4ed77cd..4b8ebc14 100644 --- a/src/d/actor/d_a_obj_otble.cpp +++ b/src/d/actor/d_a_obj_otble.cpp @@ -80,7 +80,7 @@ actor_process_profile_definition g_profile_OBJ_OTBLE = { /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x01B0, - /* Actor SubMtd */ &daObj_Otble::daObj_Otble::Mthd::Table, + /* Actor SubMtd */ &daObj_Otble::Mthd::Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp index 98849f7e..b58bb489 100644 --- a/src/d/actor/d_a_obj_paper.cpp +++ b/src/d/actor/d_a_obj_paper.cpp @@ -323,18 +323,18 @@ namespace daObjPaper { } actor_process_profile_definition g_profile_Obj_Paper = { - fpcLy_CURRENT_e, - 7, - fpcLy_CURRENT_e, - PROC_Obj_Paper, - &g_fpcLf_Method.base, - sizeof(daObjPaper::Act_c), - 0, - 0, - &g_fopAc_Method.base, - 0x0108, - &daObjPaper::Mthd_Table, - fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLSPHERE_CUSTOM_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_Obj_Paper, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjPaper::Act_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x0108, + /* Actor SubMtd */ &daObjPaper::Mthd_Table, + /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_pbco.cpp b/src/d/actor/d_a_obj_pbco.cpp index c774defc..2bbaa312 100644 --- a/src/d/actor/d_a_obj_pbco.cpp +++ b/src/d/actor/d_a_obj_pbco.cpp @@ -124,15 +124,18 @@ static BOOL daObj_PbcoDraw(void* i_this) { static BOOL daObj_PbcoIsDelete(void*) { return TRUE; } + static actor_method_class daObj_PbcoMethodTable = { - (process_method_func)daObj_PbcoCreate, (process_method_func)daObj_PbcoDelete, - (process_method_func)daObj_PbcoExecute, (process_method_func)daObj_PbcoIsDelete, + (process_method_func)daObj_PbcoCreate, + (process_method_func)daObj_PbcoDelete, + (process_method_func)daObj_PbcoExecute, + (process_method_func)daObj_PbcoIsDelete, (process_method_func)daObj_PbcoDraw, }; actor_process_profile_definition g_profile_Obj_Pbco = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 2, + /* ListID */ 0x0002, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Pbco, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -142,7 +145,7 @@ actor_process_profile_definition g_profile_Obj_Pbco = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0021, /* Actor SubMtd */ &daObj_PbcoMethodTable, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_NOCULLEXEC_e, + /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_pbka.cpp b/src/d/actor/d_a_obj_pbka.cpp index 9fdfbf0a..a57692eb 100644 --- a/src/d/actor/d_a_obj_pbka.cpp +++ b/src/d/actor/d_a_obj_pbka.cpp @@ -115,17 +115,17 @@ static actor_method_class daObj_PbkaMethodTable = { actor_process_profile_definition g_profile_Obj_Pbka = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Pbka, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjPbka_c), /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x70, + /* Priority */ 0x0070, /* Actor SubMtd */ &daObj_PbkaMethodTable, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_CULL_e, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_pfall.cpp b/src/d/actor/d_a_obj_pfall.cpp index 3fbb7fc2..4696d035 100644 --- a/src/d/actor/d_a_obj_pfall.cpp +++ b/src/d/actor/d_a_obj_pfall.cpp @@ -146,7 +146,6 @@ static BOOL daObj_PfallIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daObj_PfallMethodTable = { (process_method_func)daObj_PfallCreate, (process_method_func)daObj_PfallDelete, diff --git a/src/d/actor/d_a_obj_pirateship.cpp b/src/d/actor/d_a_obj_pirateship.cpp index 569a4a1f..247d9fcd 100644 --- a/src/d/actor/d_a_obj_pirateship.cpp +++ b/src/d/actor/d_a_obj_pirateship.cpp @@ -118,7 +118,6 @@ BOOL daObjPirateship::Method::IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daObjPirateship::Method::Table = { (process_method_func)daObjPirateship::Method::Create, (process_method_func)daObjPirateship::Method::Delete, @@ -138,7 +137,7 @@ actor_process_profile_definition g_profile_Obj_Pirateship = { /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x01AA, - /* Actor SubMtd */ &daObjPirateship::daObjPirateship::Method::Table, + /* Actor SubMtd */ &daObjPirateship::Method::Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, diff --git a/src/d/actor/d_a_obj_quake.cpp b/src/d/actor/d_a_obj_quake.cpp index 4a14be90..2dc407aa 100644 --- a/src/d/actor/d_a_obj_quake.cpp +++ b/src/d/actor/d_a_obj_quake.cpp @@ -71,7 +71,6 @@ static BOOL daObjQuakeIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daObjQuakeMethodTable = { (process_method_func)daObjQuakeCreate, (process_method_func)daObjQuakeDelete, diff --git a/src/d/actor/d_a_obj_rcloud.cpp b/src/d/actor/d_a_obj_rcloud.cpp index b32311c6..f1179ebc 100644 --- a/src/d/actor/d_a_obj_rcloud.cpp +++ b/src/d/actor/d_a_obj_rcloud.cpp @@ -91,7 +91,6 @@ static BOOL daObjRcloud_IsDelete(daObjRcloud_c*) { /* Nonmatching */ } - static actor_method_class l_daObjRcloud_Method = { (process_method_func)daObjRcloud_Create, (process_method_func)daObjRcloud_Delete, diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp index a8d3dd97..4810dea7 100644 --- a/src/d/actor/d_a_obj_roten.cpp +++ b/src/d/actor/d_a_obj_roten.cpp @@ -61,7 +61,6 @@ static BOOL daObj_RotenIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daObj_RotenMethodTable = { (process_method_func)daObj_RotenCreate, (process_method_func)daObj_RotenDelete, diff --git a/src/d/actor/d_a_obj_search.cpp b/src/d/actor/d_a_obj_search.cpp index 19b19167..ad922c99 100644 --- a/src/d/actor/d_a_obj_search.cpp +++ b/src/d/actor/d_a_obj_search.cpp @@ -275,7 +275,7 @@ actor_process_profile_definition g_profile_OBJ_SEARCH = { /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x01B2, - /* Actor SubMtd */ &daObj_Search::daObj_Search::Mthd::Table, + /* Actor SubMtd */ &daObj_Search::Mthd::Table, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, diff --git a/src/d/actor/d_a_obj_stair.cpp b/src/d/actor/d_a_obj_stair.cpp index 6de4da68..c30f2a66 100644 --- a/src/d/actor/d_a_obj_stair.cpp +++ b/src/d/actor/d_a_obj_stair.cpp @@ -77,7 +77,6 @@ static BOOL daObj_StairIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daObj_StairMethodTable = { (process_method_func)daObj_StairCreate, (process_method_func)daObj_StairDelete, diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index 187119ae..16c13c82 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -996,7 +996,6 @@ static BOOL daObjTpostIsDelete(void*) { return TRUE; } - static actor_method_class daObjTpostMethodTable = { (process_method_func)daObjTpostCreate, (process_method_func)daObjTpostDelete, @@ -1006,18 +1005,18 @@ static actor_method_class daObjTpostMethodTable = { }; actor_process_profile_definition g_profile_OBJ_TORIPOST = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_OBJ_TORIPOST, - &g_fpcLf_Method.base, - sizeof(daObjTpost_c), - 0, - 0, - &g_fopAc_Method.base, - 0x01B3, - &daObjTpostMethodTable, - 0x18 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_4_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0003, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_OBJ_TORIPOST, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTpost_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x01B3, + /* Actor SubMtd */ &daObjTpostMethodTable, + /* Status */ 0x18 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_obj_vfan.cpp b/src/d/actor/d_a_obj_vfan.cpp index 857808d1..8018b062 100644 --- a/src/d/actor/d_a_obj_vfan.cpp +++ b/src/d/actor/d_a_obj_vfan.cpp @@ -235,16 +235,18 @@ static int Mthd_IsDelete(void* i_this) { } static actor_method_class Mthd_Vfan = { - (process_method_func)Mthd_Create, (process_method_func)Mthd_Delete, - (process_method_func)Mthd_Execute, (process_method_func)Mthd_IsDelete, + (process_method_func)Mthd_Create, + (process_method_func)Mthd_Delete, + (process_method_func)Mthd_Execute, + (process_method_func)Mthd_IsDelete, (process_method_func)Mthd_Draw, }; -}; // namespace -}; // namespace daObjVfan +}; // namespace +}; // namespace daObjVfan actor_process_profile_definition g_profile_Obj_Vfan = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, + /* ListID */ 0x0003, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Vfan, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -254,7 +256,7 @@ actor_process_profile_definition g_profile_Obj_Vfan = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0020, /* Actor SubMtd */ &daObjVfan::Mthd_Vfan, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e, + /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_warpt.cpp b/src/d/actor/d_a_obj_warpt.cpp index cb01e0b3..246d2ef6 100644 --- a/src/d/actor/d_a_obj_warpt.cpp +++ b/src/d/actor/d_a_obj_warpt.cpp @@ -227,7 +227,6 @@ static BOOL daObj_WarptIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daObj_WarptMethodTable = { (process_method_func)daObj_WarptCreate, (process_method_func)daObj_WarptDelete, diff --git a/src/d/actor/d_a_obj_wood.cpp b/src/d/actor/d_a_obj_wood.cpp index 5c7dfb05..d6282a67 100644 --- a/src/d/actor/d_a_obj_wood.cpp +++ b/src/d/actor/d_a_obj_wood.cpp @@ -68,7 +68,7 @@ namespace daObjWood { actor_process_profile_definition g_profile_Obj_Wood = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Wood, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -78,7 +78,7 @@ actor_process_profile_definition g_profile_Obj_Wood = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0110, /* Actor SubMtd */ &daObjWood::Method::Table, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_CULL_e | fopAcStts_NOCULLEXEC_e, + /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp index 61ee2d54..a79a7e26 100644 --- a/src/d/actor/d_a_obj_zouK.cpp +++ b/src/d/actor/d_a_obj_zouK.cpp @@ -347,7 +347,7 @@ namespace daObjZouk { actor_process_profile_definition g_profile_Obj_Zouk = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Zouk, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -357,7 +357,7 @@ actor_process_profile_definition g_profile_Obj_Zouk = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x00FA, /* Actor SubMtd */ &daObjZouk::Mthd_Table, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_CULL_e | fopAcStts_NOCULLEXEC_e, + /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e + /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_oq.cpp b/src/d/actor/d_a_oq.cpp index ea25af56..7ec3064f 100644 --- a/src/d/actor/d_a_oq.cpp +++ b/src/d/actor/d_a_oq.cpp @@ -112,7 +112,6 @@ static s32 daOQ_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daOQ_Method = { (process_method_func)daOQ_Create, (process_method_func)daOQ_Delete, diff --git a/src/d/actor/d_a_oship.cpp b/src/d/actor/d_a_oship.cpp index 61fa1e20..cae1ae98 100644 --- a/src/d/actor/d_a_oship.cpp +++ b/src/d/actor/d_a_oship.cpp @@ -236,7 +236,6 @@ static BOOL daOshipIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daOshipMethodTable = { (process_method_func)daOshipCreate, (process_method_func)daOshipDelete, diff --git a/src/d/actor/d_a_pedestal.cpp b/src/d/actor/d_a_pedestal.cpp index 2b73ba44..a3045767 100644 --- a/src/d/actor/d_a_pedestal.cpp +++ b/src/d/actor/d_a_pedestal.cpp @@ -180,7 +180,7 @@ actor_process_profile_definition g_profile_PEDESTAL = { /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0091, - /* Actor SubMtd */ &daPedestal::daPedestal::daActMethodTable, + /* Actor SubMtd */ &daPedestal::daActMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, diff --git a/src/d/actor/d_a_ph.cpp b/src/d/actor/d_a_ph.cpp index 2ebac6de..485277c3 100644 --- a/src/d/actor/d_a_ph.cpp +++ b/src/d/actor/d_a_ph.cpp @@ -171,7 +171,6 @@ static s32 daPH_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daPH_Method = { (process_method_func)daPH_Create, (process_method_func)daPH_Delete, diff --git a/src/d/actor/d_a_pirate_flag.cpp b/src/d/actor/d_a_pirate_flag.cpp index ee260635..51a8ac05 100644 --- a/src/d/actor/d_a_pirate_flag.cpp +++ b/src/d/actor/d_a_pirate_flag.cpp @@ -66,7 +66,6 @@ static s32 daPirate_Flag_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daPirate_Flag_Method = { (process_method_func)daPirate_Flag_Create, (process_method_func)daPirate_Flag_Delete, diff --git a/src/d/actor/d_a_pt.cpp b/src/d/actor/d_a_pt.cpp index cf04d1c2..1442d03a 100644 --- a/src/d/actor/d_a_pt.cpp +++ b/src/d/actor/d_a_pt.cpp @@ -116,7 +116,6 @@ static s32 daPt_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daPt_Method = { (process_method_func)daPt_Create, (process_method_func)daPt_Delete, diff --git a/src/d/actor/d_a_pz.cpp b/src/d/actor/d_a_pz.cpp index 71853f38..e57e207b 100644 --- a/src/d/actor/d_a_pz.cpp +++ b/src/d/actor/d_a_pz.cpp @@ -396,7 +396,6 @@ static BOOL daPzIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daPzMethodTable = { (process_method_func)daPzCreate, (process_method_func)daPzDelete, diff --git a/src/d/actor/d_a_race_item.cpp b/src/d/actor/d_a_race_item.cpp index 58f36153..15de48a0 100644 --- a/src/d/actor/d_a_race_item.cpp +++ b/src/d/actor/d_a_race_item.cpp @@ -263,32 +263,6 @@ static int daRaceItem_Create(fopAc_ac_c* i_this) { return static_cast<daRaceItem_c*>(i_this)->create(); } - -static actor_method_class l_daRaceItem_Method = { - (process_method_func)daRaceItem_Create, - (process_method_func)daRaceItem_Delete, - (process_method_func)daRaceItem_Execute, - (process_method_func)daRaceItem_IsDelete, - (process_method_func)daRaceItem_Draw, -}; - -extern actor_process_profile_definition g_profile_RACEITEM = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_RACEITEM, - &g_fpcLf_Method.base, - sizeof(daRaceItem_c), - 0, - 0, - &g_fopAc_Method.base, - 0x00FD, - &l_daRaceItem_Method, - 0x000C4100, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, -}; - static actor_method_class l_daRaceItem_Method = { (process_method_func)daRaceItem_Create, (process_method_func)daRaceItem_Delete, diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index 1e599741..167d60e7 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -1912,8 +1912,8 @@ static actor_method_class daRdMethodTable = { actor_process_profile_definition g_profile_RD = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_RD, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daRd_c), diff --git a/src/d/actor/d_a_rectangle.cpp b/src/d/actor/d_a_rectangle.cpp index fe74a95c..18bb31d2 100644 --- a/src/d/actor/d_a_rectangle.cpp +++ b/src/d/actor/d_a_rectangle.cpp @@ -43,15 +43,15 @@ static actor_method_class l_daRct_Method = { actor_process_profile_definition g_profile_RECTANGLE = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_RECTANGLE, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(RECTANGLE_class), /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x9F, + /* Priority */ 0x009F, /* Actor SubMtd */ &l_daRct_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_sail.cpp b/src/d/actor/d_a_sail.cpp index 3d3f6727..c4411e6a 100644 --- a/src/d/actor/d_a_sail.cpp +++ b/src/d/actor/d_a_sail.cpp @@ -581,7 +581,7 @@ static actor_method_class l_daSail_Method = { actor_process_profile_definition g_profile_SAIL = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_SAIL, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_saku.cpp b/src/d/actor/d_a_saku.cpp index 79fcbac0..12148761 100644 --- a/src/d/actor/d_a_saku.cpp +++ b/src/d/actor/d_a_saku.cpp @@ -154,7 +154,6 @@ static BOOL daSaku_Execute(daSaku_c*) { /* Nonmatching */ } - static actor_method_class l_daSaku_Method = { (process_method_func)daSaku_Create, (process_method_func)daSaku_Delete, diff --git a/src/d/actor/d_a_sbox.cpp b/src/d/actor/d_a_sbox.cpp index f2121e09..1e74cffe 100644 --- a/src/d/actor/d_a_sbox.cpp +++ b/src/d/actor/d_a_sbox.cpp @@ -136,7 +136,6 @@ static s32 daSbox_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daSbox_Method = { (process_method_func)daSbox_Create, (process_method_func)daSbox_Delete, diff --git a/src/d/actor/d_a_scene_change.cpp b/src/d/actor/d_a_scene_change.cpp index 93ad2caf..acb7122b 100644 --- a/src/d/actor/d_a_scene_change.cpp +++ b/src/d/actor/d_a_scene_change.cpp @@ -61,18 +61,18 @@ static actor_method_class daSceneChgMethodTable = { }; actor_process_profile_definition g_profile_SCENECHG = { - fpcLy_CURRENT_e, - 3, - fpcLy_CURRENT_e, - PROC_SCENECHG, - &g_fpcLf_Method.base, - sizeof(d_a_scene_change_c), - 0, - 0, - &g_fopAc_Method.base, - 0x01A1, - &daSceneChgMethodTable, - fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_4_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0003, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_SCENECHG, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(d_a_scene_change_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x01A1, + /* Actor SubMtd */ &daSceneChgMethodTable, + /* Status */ fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_sea.cpp b/src/d/actor/d_a_sea.cpp index 9d17f9b9..1a2cac06 100644 --- a/src/d/actor/d_a_sea.cpp +++ b/src/d/actor/d_a_sea.cpp @@ -398,7 +398,7 @@ static actor_method_class l_daSea_Method = { actor_process_profile_definition g_profile_SEA = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 2, + /* ListID */ 0x0002, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_SEA, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -406,7 +406,7 @@ actor_process_profile_definition g_profile_SEA = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0077, + /* Priority */ 0x009A, /* Actor SubMtd */ &l_daSea_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_seatag.cpp b/src/d/actor/d_a_seatag.cpp index f7bff090..b43d38d9 100644 --- a/src/d/actor/d_a_seatag.cpp +++ b/src/d/actor/d_a_seatag.cpp @@ -41,18 +41,18 @@ static actor_method_class l_daSeatag_Method = { }; actor_process_profile_definition g_profile_SEATAG = { - fpcLy_CURRENT_e, - 2, - fpcLy_CURRENT_e, - PROC_SEATAG, - &g_fpcLf_Method.base, - sizeof(daSeatag_c), - 0, - 0, - &g_fopAc_Method.base, - 0x01DF, - &l_daSeatag_Method, - fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0002, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_SEATAG, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSeatag_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x01DF, + /* Actor SubMtd */ &l_daSeatag_Method, + /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_shand.cpp b/src/d/actor/d_a_shand.cpp index cdf4bd7e..98b8247d 100644 --- a/src/d/actor/d_a_shand.cpp +++ b/src/d/actor/d_a_shand.cpp @@ -91,7 +91,6 @@ static s32 daShand_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daShand_Method = { (process_method_func)daShand_Create, (process_method_func)daShand_Delete, diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index dd7b6e43..e83d772d 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -310,18 +310,18 @@ static actor_method_class daShopItemMethodTable = { }; actor_process_profile_definition g_profile_ShopItem = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_ShopItem, - &g_fpcLf_Method.base, - sizeof(daShopItem_c), - 0, - 0, - &g_fopAc_Method.base, - 0x00FE, - &daShopItemMethodTable, - fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_ShopItem, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daShopItem_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x00FE, + /* Actor SubMtd */ &daShopItemMethodTable, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_shutter.cpp b/src/d/actor/d_a_shutter.cpp index 63c6efc5..714dad12 100644 --- a/src/d/actor/d_a_shutter.cpp +++ b/src/d/actor/d_a_shutter.cpp @@ -81,7 +81,6 @@ static BOOL daShutter_IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daShutterMethodTable = { (process_method_func)daShutter_Create, (process_method_func)daShutter_Delete, diff --git a/src/d/actor/d_a_shutter2.cpp b/src/d/actor/d_a_shutter2.cpp index 1a7700c5..127c7b13 100644 --- a/src/d/actor/d_a_shutter2.cpp +++ b/src/d/actor/d_a_shutter2.cpp @@ -76,7 +76,6 @@ static BOOL daShutter2_IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daShutter2MethodTable = { (process_method_func)daShutter2_Create, (process_method_func)daShutter2_Delete, diff --git a/src/d/actor/d_a_sie_flag.cpp b/src/d/actor/d_a_sie_flag.cpp index 4f76ad8c..1a0e8aae 100644 --- a/src/d/actor/d_a_sie_flag.cpp +++ b/src/d/actor/d_a_sie_flag.cpp @@ -76,7 +76,6 @@ static BOOL daSie_FlagIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daSie_FlagMethodTable = { (process_method_func)daSie_FlagCreate, (process_method_func)daSie_FlagDelete, diff --git a/src/d/actor/d_a_sitem.cpp b/src/d/actor/d_a_sitem.cpp index dbc9fe31..d5d9eb71 100644 --- a/src/d/actor/d_a_sitem.cpp +++ b/src/d/actor/d_a_sitem.cpp @@ -86,7 +86,6 @@ static s32 daSitem_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daSitem_Method = { (process_method_func)daSitem_Create, (process_method_func)daSitem_Delete, diff --git a/src/d/actor/d_a_spc_item01.cpp b/src/d/actor/d_a_spc_item01.cpp index 398ace6d..16d026e0 100644 --- a/src/d/actor/d_a_spc_item01.cpp +++ b/src/d/actor/d_a_spc_item01.cpp @@ -278,7 +278,7 @@ static actor_method_class l_daSpcItem01_Method = { actor_process_profile_definition g_profile_SPC_ITEM01 = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_SPC_ITEM01, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -288,7 +288,7 @@ actor_process_profile_definition g_profile_SPC_ITEM01 = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0100, /* Actor SubMtd */ &l_daSpcItem01_Method, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_UNK4000_e | fopAcStts_CULL_e | fopAcStts_NOCULLEXEC_e, + /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_spotbox.cpp b/src/d/actor/d_a_spotbox.cpp index 3a9cec48..59362e22 100644 --- a/src/d/actor/d_a_spotbox.cpp +++ b/src/d/actor/d_a_spotbox.cpp @@ -74,7 +74,7 @@ static actor_method_class l_daSpotbox_Method = { actor_process_profile_definition g_profile_SPOTBOX = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_SPOTBOX, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -84,7 +84,7 @@ actor_process_profile_definition g_profile_SPOTBOX = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x01C9, /* Actor SubMtd */ &l_daSpotbox_Method, - /* Status */ fopAcStts_CULL_e | fopAcStts_NOCULLEXEC_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, + /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_ss.cpp b/src/d/actor/d_a_ss.cpp index aeebc305..93abbd85 100644 --- a/src/d/actor/d_a_ss.cpp +++ b/src/d/actor/d_a_ss.cpp @@ -82,7 +82,6 @@ static s32 daSs_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daSs_Method = { (process_method_func)daSs_Create, (process_method_func)daSs_Delete, diff --git a/src/d/actor/d_a_sss.cpp b/src/d/actor/d_a_sss.cpp index df1ca16e..9910c0a4 100644 --- a/src/d/actor/d_a_sss.cpp +++ b/src/d/actor/d_a_sss.cpp @@ -96,7 +96,6 @@ static s32 daSss_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daSss_Method = { (process_method_func)daSss_Create, (process_method_func)daSss_Delete, diff --git a/src/d/actor/d_a_st.cpp b/src/d/actor/d_a_st.cpp index ad3a6a1d..29b45380 100644 --- a/src/d/actor/d_a_st.cpp +++ b/src/d/actor/d_a_st.cpp @@ -201,7 +201,6 @@ static s32 daSt_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daSt_Method = { (process_method_func)daSt_Create, (process_method_func)daSt_Delete, diff --git a/src/d/actor/d_a_stone.cpp b/src/d/actor/d_a_stone.cpp index ea5a12ff..dd0db104 100644 --- a/src/d/actor/d_a_stone.cpp +++ b/src/d/actor/d_a_stone.cpp @@ -255,7 +255,7 @@ actor_process_profile_definition g_profile_STONE = { /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0104, - /* Actor SubMtd */ &daStone::daStone::Method::Table, + /* Actor SubMtd */ &daStone::Method::Table, /* Status */ fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, diff --git a/src/d/actor/d_a_swattack.cpp b/src/d/actor/d_a_swattack.cpp index cac98208..697d0171 100644 --- a/src/d/actor/d_a_swattack.cpp +++ b/src/d/actor/d_a_swattack.cpp @@ -162,7 +162,7 @@ static actor_method_class daSwAtMethodTable = { actor_process_profile_definition g_profile_SW_ATTACK = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_SW_ATTACK, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -172,7 +172,7 @@ actor_process_profile_definition g_profile_SW_ATTACK = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0139, /* Actor SubMtd */ &daSwAtMethodTable, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_CULL_e, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index 614048a8..207d0049 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/src/d/actor/d_a_swc00.cpp @@ -71,22 +71,22 @@ static actor_method_class l_daSwc00_Method = { (process_method_func)daSwc00_Delete, (process_method_func)daSwc00_Execute, (process_method_func)daSwc00_IsDelete, - (process_method_func)0, + (process_method_func)NULL, }; actor_process_profile_definition g_profile_SWC00 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_SWC00, - &g_fpcLf_Method.base, - sizeof(swc00_class), - 0, - 0, - &g_fopAc_Method.base, - 0x011A, - &l_daSwc00_Method, - fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_SWC00, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(swc00_class), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x011A, + /* Actor SubMtd */ &l_daSwc00_Method, + /* Status */ fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index aba8b622..7cbcf18d 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -474,18 +474,18 @@ static actor_method_class l_daSwhit0_Method = { }; actor_process_profile_definition g_profile_SWHIT0 = { - fpcLy_CURRENT_e, - 8, - fpcPi_CURRENT_e, - PROC_SWHIT0, - &g_fpcLf_Method.base, - sizeof(daSwhit0_c), - 0, - 0, - &g_fopAc_Method.base, - 0x0119, - &l_daSwhit0_Method, - fopAcStts_UNK40000_e | fopAcStts_UNK4000_e | fopAcStts_CULL_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0008, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_SWHIT0, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSwhit0_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x0119, + /* Actor SubMtd */ &l_daSwhit0_Method, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_switem.cpp b/src/d/actor/d_a_switem.cpp index 2d313ce5..a088d827 100644 --- a/src/d/actor/d_a_switem.cpp +++ b/src/d/actor/d_a_switem.cpp @@ -212,8 +212,8 @@ static actor_method_class daSwItemMethodTable = { actor_process_profile_definition g_profile_SW_ITEM = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_SW_ITEM, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daSwItem_c), diff --git a/src/d/actor/d_a_swtact.cpp b/src/d/actor/d_a_swtact.cpp index 7e2d567f..5f63c68d 100644 --- a/src/d/actor/d_a_swtact.cpp +++ b/src/d/actor/d_a_swtact.cpp @@ -213,7 +213,7 @@ static actor_method_class daSwTactMethodTable = { actor_process_profile_definition g_profile_SW_TACT = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_SW_TACT, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_swtdoor.cpp b/src/d/actor/d_a_swtdoor.cpp index ce62f308..bd7e59d0 100644 --- a/src/d/actor/d_a_swtdoor.cpp +++ b/src/d/actor/d_a_swtdoor.cpp @@ -94,18 +94,18 @@ static actor_method_class l_daSwtdoor_Method = { }; actor_process_profile_definition g_profile_SWTDOOR = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_SWTDOOR, - &g_fpcLf_Method.base, - sizeof(swtdoor_class), - 0, - 0, - &g_fopAc_Method.base, - 0x00ED, - &l_daSwtdoor_Method, - fopAcStts_CULL_e | fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_SWTDOOR, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(swtdoor_class), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x00ED, + /* Actor SubMtd */ &l_daSwtdoor_Method, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_syan.cpp b/src/d/actor/d_a_syan.cpp index 9497ebd0..b56b03ae 100644 --- a/src/d/actor/d_a_syan.cpp +++ b/src/d/actor/d_a_syan.cpp @@ -47,7 +47,6 @@ static s32 daSyan_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daSyan_Method = { (process_method_func)daSyan_Create, (process_method_func)daSyan_Delete, diff --git a/src/d/actor/d_a_tag_ba1.cpp b/src/d/actor/d_a_tag_ba1.cpp index 0425d678..3f20733f 100644 --- a/src/d/actor/d_a_tag_ba1.cpp +++ b/src/d/actor/d_a_tag_ba1.cpp @@ -81,7 +81,6 @@ static BOOL daTag_Ba1_IsDelete(daTag_Ba1_c*) { /* Nonmatching */ } - static actor_method_class l_daTag_Ba1_Method = { (process_method_func)daTag_Ba1_Create, (process_method_func)daTag_Ba1_Delete, diff --git a/src/d/actor/d_a_tag_etc.cpp b/src/d/actor/d_a_tag_etc.cpp index 420188f9..7d23b24f 100644 --- a/src/d/actor/d_a_tag_etc.cpp +++ b/src/d/actor/d_a_tag_etc.cpp @@ -252,7 +252,7 @@ static actor_method_class l_daTag_Etc_Method = { actor_process_profile_definition g_profile_TAG_ETC = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_TAG_ETC, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -262,7 +262,7 @@ actor_process_profile_definition g_profile_TAG_ETC = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0122, /* Actor SubMtd */ &l_daTag_Etc_Method, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_UNK4000_e, + /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_tag_event.cpp b/src/d/actor/d_a_tag_event.cpp index 3a50e516..d1fc3f3a 100644 --- a/src/d/actor/d_a_tag_event.cpp +++ b/src/d/actor/d_a_tag_event.cpp @@ -562,7 +562,7 @@ static actor_method_class l_daTag_Event_Method = { actor_process_profile_definition g_profile_TAG_EVENT = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_TAG_EVENT, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_tag_ghostship.cpp b/src/d/actor/d_a_tag_ghostship.cpp index f50181c1..54c1fe2b 100644 --- a/src/d/actor/d_a_tag_ghostship.cpp +++ b/src/d/actor/d_a_tag_ghostship.cpp @@ -161,7 +161,6 @@ static BOOL daTag_GshipIsDelete(void*) { return true; } - static actor_method_class daTag_GshipMethodTable = { (process_method_func)daTag_GshipCreate, (process_method_func)daTag_GshipDelete, @@ -171,18 +170,18 @@ static actor_method_class daTag_GshipMethodTable = { }; actor_process_profile_definition g_profile_TAG_GSHIP = { - fpcLy_CURRENT_e, - 8, - fpcPi_CURRENT_e, - PROC_TAG_GSHIP, - &g_fpcLf_Method.base, - sizeof(daTag_Gship_c), - 0, - 0, - &g_fopAc_Method.base, - 0x0066, - &daTag_GshipMethodTable, - fopAcStts_UNK40000_e | fopAcStts_UNK4000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_4_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0008, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_TAG_GSHIP, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Gship_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x0066, + /* Actor SubMtd */ &daTag_GshipMethodTable, + /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_tag_island.cpp b/src/d/actor/d_a_tag_island.cpp index 30befe7d..5972f753 100644 --- a/src/d/actor/d_a_tag_island.cpp +++ b/src/d/actor/d_a_tag_island.cpp @@ -191,7 +191,6 @@ static s32 daTag_Island_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daTag_Island_Method = { (process_method_func)daTag_Island_Create, (process_method_func)daTag_Island_Delete, diff --git a/src/d/actor/d_a_tag_kb_item.cpp b/src/d/actor/d_a_tag_kb_item.cpp index d66147a4..75dbdf68 100644 --- a/src/d/actor/d_a_tag_kb_item.cpp +++ b/src/d/actor/d_a_tag_kb_item.cpp @@ -85,24 +85,26 @@ static int daTagKbItem_IsDelete(void* i_this) { } static actor_method_class daTagKbItemMethodTable = { - (process_method_func)daTagKbItem_Create, (process_method_func)daTagKbItem_Delete, - (process_method_func)daTagKbItem_Execute, (process_method_func)daTagKbItem_IsDelete, + (process_method_func)daTagKbItem_Create, + (process_method_func)daTagKbItem_Delete, + (process_method_func)daTagKbItem_Execute, + (process_method_func)daTagKbItem_IsDelete, (process_method_func)daTagKbItem_Draw, }; actor_process_profile_definition g_profile_TAG_KB_ITEM = { - fpcLy_CURRENT_e, - 7, - fpcLy_CURRENT_e, - PROC_TAG_KB_ITEM, - &g_fpcLf_Method.base, - sizeof(daTagKbItem_c), - 0, - 0, - &g_fopAc_Method.base, - 0x0127, - &daTagKbItemMethodTable, - fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_TAG_KB_ITEM, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagKbItem_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x0127, + /* Actor SubMtd */ &daTagKbItemMethodTable, + /* Status */ fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_kf1.cpp b/src/d/actor/d_a_tag_kf1.cpp index 9aa951ef..07d2fb09 100644 --- a/src/d/actor/d_a_tag_kf1.cpp +++ b/src/d/actor/d_a_tag_kf1.cpp @@ -166,7 +166,6 @@ static BOOL daTag_Kf1_IsDelete(daTag_Kf1_c*) { /* Nonmatching */ } - static actor_method_class l_daTag_Kf1_Method = { (process_method_func)daTag_Kf1_Create, (process_method_func)daTag_Kf1_Delete, diff --git a/src/d/actor/d_a_tag_kk1.cpp b/src/d/actor/d_a_tag_kk1.cpp index b0283cd6..cb4b8c74 100644 --- a/src/d/actor/d_a_tag_kk1.cpp +++ b/src/d/actor/d_a_tag_kk1.cpp @@ -61,7 +61,6 @@ static BOOL daTag_Kk1_IsDelete(daTag_Kk1_c*) { /* Nonmatching */ } - static actor_method_class l_daTag_Kk1_Method = { (process_method_func)daTag_Kk1_Create, (process_method_func)daTag_Kk1_Delete, diff --git a/src/d/actor/d_a_tag_md_cb.cpp b/src/d/actor/d_a_tag_md_cb.cpp index 24f108ca..df948b58 100644 --- a/src/d/actor/d_a_tag_md_cb.cpp +++ b/src/d/actor/d_a_tag_md_cb.cpp @@ -181,7 +181,6 @@ static s32 daTag_MdCb_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daTag_MdCb_Method = { (process_method_func)daTag_MdCb_Create, (process_method_func)daTag_MdCb_Delete, diff --git a/src/d/actor/d_a_tag_mk.cpp b/src/d/actor/d_a_tag_mk.cpp index f5d841dd..4ba17e0f 100644 --- a/src/d/actor/d_a_tag_mk.cpp +++ b/src/d/actor/d_a_tag_mk.cpp @@ -186,7 +186,6 @@ s32 daTag_Mk_c::create() { /* Nonmatching */ } - static actor_method_class l_daTag_Mk_Method = { (process_method_func)daTag_Mk_Create, (process_method_func)daTag_Mk_Delete, diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index 92578f4b..0455b6ff 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -305,7 +305,7 @@ static actor_method_class l_daTag_Msg_Method = { actor_process_profile_definition g_profile_TAG_MSG = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_TAG_MSG, /* Proc SubMtd */ &g_fpcLf_Method.base, diff --git a/src/d/actor/d_a_tag_photo.cpp b/src/d/actor/d_a_tag_photo.cpp index 3ff37775..9271ea50 100644 --- a/src/d/actor/d_a_tag_photo.cpp +++ b/src/d/actor/d_a_tag_photo.cpp @@ -151,7 +151,6 @@ static BOOL daTagPhotoIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daTagPhotoMethodTable = { (process_method_func)daTagPhotoCreate, (process_method_func)daTagPhotoDelete, diff --git a/src/d/actor/d_a_tag_ret.cpp b/src/d/actor/d_a_tag_ret.cpp index 9dc4ce11..e3e930bd 100644 --- a/src/d/actor/d_a_tag_ret.cpp +++ b/src/d/actor/d_a_tag_ret.cpp @@ -130,8 +130,8 @@ namespace daTagRet { actor_process_profile_definition g_profile_Tag_Ret = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0003, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Tag_Ret, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTagRet::Act_c), diff --git a/src/d/actor/d_a_tag_so.cpp b/src/d/actor/d_a_tag_so.cpp index 1fdbe44b..ad611444 100644 --- a/src/d/actor/d_a_tag_so.cpp +++ b/src/d/actor/d_a_tag_so.cpp @@ -66,7 +66,6 @@ static BOOL daTag_SoIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daTag_SoMethodTable = { (process_method_func)daTag_SoCreate, (process_method_func)daTag_SoDelete, diff --git a/src/d/actor/d_a_tag_volcano.cpp b/src/d/actor/d_a_tag_volcano.cpp index 4388074a..cb73bb60 100644 --- a/src/d/actor/d_a_tag_volcano.cpp +++ b/src/d/actor/d_a_tag_volcano.cpp @@ -218,7 +218,7 @@ namespace daTagvolcano { actor_process_profile_definition g_profile_Tag_Volcano = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 2, + /* ListID */ 0x0002, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Tag_Volcano, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -228,7 +228,7 @@ actor_process_profile_definition g_profile_Tag_Volcano = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0061, /* Actor SubMtd */ &daTagvolcano::Mthd_Table, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_UNK4000_e, + /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_waterlevel.cpp b/src/d/actor/d_a_tag_waterlevel.cpp index 62253cc0..8b83b3a7 100644 --- a/src/d/actor/d_a_tag_waterlevel.cpp +++ b/src/d/actor/d_a_tag_waterlevel.cpp @@ -145,8 +145,8 @@ namespace daTagWaterlevel { actor_process_profile_definition g_profile_Tag_Waterlevel = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 9, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0009, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Tag_Waterlevel, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTagWaterlevel::Act_c), @@ -155,7 +155,7 @@ actor_process_profile_definition g_profile_Tag_Waterlevel = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0128, /* Actor SubMtd */ &daTagWaterlevel::Mthd_Table, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_CULL_e, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tama.cpp b/src/d/actor/d_a_tama.cpp index a4959e4a..8f582a11 100644 --- a/src/d/actor/d_a_tama.cpp +++ b/src/d/actor/d_a_tama.cpp @@ -147,7 +147,7 @@ static actor_method_class l_daTama_Method = { actor_process_profile_definition g_profile_TAMA = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 9, + /* ListID */ 0x0009, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_TAMA, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -157,7 +157,7 @@ actor_process_profile_definition g_profile_TAMA = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x012C, /* Actor SubMtd */ &l_daTama_Method, - /* Status */ fopAcStts_UNK40000_e | fopAcStts_UNK4000_e, + /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 48acc686..2577f4fb 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -1335,18 +1335,18 @@ static actor_method_class l_daTbox_Method = { }; actor_process_profile_definition g_profile_TBOX = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TBOX, - &g_fpcLf_Method.base, - sizeof(daTbox_c), - 0, - 0, - &g_fopAc_Method.base, - 0x0113, - &l_daTbox_Method, - fopAcStts_UNK40000_e | fopAcStts_UNK4000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_TBOX, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTbox_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x0113, + /* Actor SubMtd */ &l_daTbox_Method, + /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index cbc064f5..78034d72 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -86,7 +86,6 @@ BOOL daTitle_proc_c::draw() { /* Nonmatching */ } - static actor_method_class l_daTitle_Method = { (process_method_func)daTitle_Create, (process_method_func)daTitle_Delete, diff --git a/src/d/actor/d_a_tn.cpp b/src/d/actor/d_a_tn.cpp index ccce7ef3..c6348d0d 100644 --- a/src/d/actor/d_a_tn.cpp +++ b/src/d/actor/d_a_tn.cpp @@ -307,7 +307,6 @@ static s32 daTn_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daTn_Method = { (process_method_func)daTn_Create, (process_method_func)daTn_Delete, diff --git a/src/d/actor/d_a_tori_flag.cpp b/src/d/actor/d_a_tori_flag.cpp index 6ed983dc..0acebd77 100644 --- a/src/d/actor/d_a_tori_flag.cpp +++ b/src/d/actor/d_a_tori_flag.cpp @@ -66,7 +66,6 @@ static BOOL daTori_FlagIsDelete(void*) { /* Nonmatching */ } - static actor_method_class daTori_FlagMethodTable = { (process_method_func)daTori_FlagCreate, (process_method_func)daTori_FlagDelete, diff --git a/src/d/actor/d_a_tornado.cpp b/src/d/actor/d_a_tornado.cpp index ac4fb9a8..769cfb64 100644 --- a/src/d/actor/d_a_tornado.cpp +++ b/src/d/actor/d_a_tornado.cpp @@ -72,7 +72,6 @@ static s32 daTornado_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daTornado_Method = { (process_method_func)daTornado_Create, (process_method_func)daTornado_Delete, diff --git a/src/d/actor/d_a_tsubo.cpp b/src/d/actor/d_a_tsubo.cpp index 41c70288..947c13aa 100644 --- a/src/d/actor/d_a_tsubo.cpp +++ b/src/d/actor/d_a_tsubo.cpp @@ -630,7 +630,7 @@ actor_process_profile_definition g_profile_TSUBO = { /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0103, - /* Actor SubMtd */ &daTsubo::daTsubo::Method::Table, + /* Actor SubMtd */ &daTsubo::Method::Table, /* Status */ fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp index af9ef58c..5e7fb913 100644 --- a/src/d/actor/d_a_vrbox.cpp +++ b/src/d/actor/d_a_vrbox.cpp @@ -204,8 +204,8 @@ static actor_method_class l_daVrbox_Method = { actor_process_profile_definition g_profile_VRBOX = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_VRBOX, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(vrbox_class), diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index 81ef1bfc..554d233d 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -295,8 +295,8 @@ static actor_method_class l_daVrbox2_Method = { actor_process_profile_definition g_profile_VRBOX2 = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, - /* ListPrio */ fpcLy_CURRENT_e, + /* ListID */ 0x0007, + /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_VRBOX2, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(vrbox2_class), diff --git a/src/d/actor/d_a_wall.cpp b/src/d/actor/d_a_wall.cpp index 04ba2fac..1b473705 100644 --- a/src/d/actor/d_a_wall.cpp +++ b/src/d/actor/d_a_wall.cpp @@ -360,14 +360,16 @@ static BOOL daWall_IsDelete(void*) { } static actor_method_class daWallMethodTable = { - (process_method_func)daWall_Create, (process_method_func)daWall_Delete, - (process_method_func)daWall_Execute, (process_method_func)daWall_IsDelete, + (process_method_func)daWall_Create, + (process_method_func)daWall_Delete, + (process_method_func)daWall_Execute, + (process_method_func)daWall_IsDelete, (process_method_func)daWall_Draw, }; actor_process_profile_definition g_profile_WALL = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 7, + /* ListID */ 0x0007, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_WALL, /* Proc SubMtd */ &g_fpcLf_Method.base, @@ -375,7 +377,7 @@ actor_process_profile_definition g_profile_WALL = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x198, + /* Priority */ 0x0198, /* Actor SubMtd */ &daWallMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_warpdm20.cpp b/src/d/actor/d_a_warpdm20.cpp index f0941560..194cefb1 100644 --- a/src/d/actor/d_a_warpdm20.cpp +++ b/src/d/actor/d_a_warpdm20.cpp @@ -191,7 +191,6 @@ static BOOL daWarpdm20_IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daWarpdm20MethodTable = { (process_method_func)daWarpdm20_Create, (process_method_func)daWarpdm20_Delete, diff --git a/src/d/actor/d_a_warpf.cpp b/src/d/actor/d_a_warpf.cpp index 701c4f31..0a00d05f 100644 --- a/src/d/actor/d_a_warpf.cpp +++ b/src/d/actor/d_a_warpf.cpp @@ -201,7 +201,6 @@ static BOOL daWarpf_IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daWarpfMethodTable = { (process_method_func)daWarpf_Create, (process_method_func)daWarpf_Delete, diff --git a/src/d/actor/d_a_warpfout.cpp b/src/d/actor/d_a_warpfout.cpp index 38786401..39860a1a 100644 --- a/src/d/actor/d_a_warpfout.cpp +++ b/src/d/actor/d_a_warpfout.cpp @@ -212,24 +212,26 @@ static BOOL daWarpfout_IsDelete(void*) { } static actor_method_class daWarpfoutMethodTable = { - (process_method_func)daWarpfout_Create, (process_method_func)daWarpfout_Delete, - (process_method_func)daWarpfout_Execute, (process_method_func)daWarpfout_IsDelete, + (process_method_func)daWarpfout_Create, + (process_method_func)daWarpfout_Delete, + (process_method_func)daWarpfout_Execute, + (process_method_func)daWarpfout_IsDelete, (process_method_func)daWarpfout_Draw, }; actor_process_profile_definition g_profile_WARPFOUT = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_WARPFOUT, - &g_fpcLf_Method.base, - sizeof(daWarpfout_c), - 0, - 0, - &g_fopAc_Method.base, - 0x01a3, - &daWarpfoutMethodTable, - fopAcStts_UNK40000_e | fopAcStts_CULL_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 0x0003, + /* ListPrio */ fpcPi_CURRENT_e, + /* ProcName */ PROC_WARPFOUT, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daWarpfout_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x01A3, + /* Actor SubMtd */ &daWarpfoutMethodTable, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_warpgn.cpp b/src/d/actor/d_a_warpgn.cpp index 3e9a4b8e..357cfcb1 100644 --- a/src/d/actor/d_a_warpgn.cpp +++ b/src/d/actor/d_a_warpgn.cpp @@ -176,7 +176,6 @@ static BOOL daWarpgn_IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daWarpgnMethodTable = { (process_method_func)daWarpgn_Create, (process_method_func)daWarpgn_Delete, diff --git a/src/d/actor/d_a_warphr.cpp b/src/d/actor/d_a_warphr.cpp index e03c799a..efa67590 100644 --- a/src/d/actor/d_a_warphr.cpp +++ b/src/d/actor/d_a_warphr.cpp @@ -166,7 +166,6 @@ static BOOL daWarphr_IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daWarphrMethodTable = { (process_method_func)daWarphr_Create, (process_method_func)daWarphr_Delete, diff --git a/src/d/actor/d_a_warpls.cpp b/src/d/actor/d_a_warpls.cpp index 8279c0f5..ba7ce214 100644 --- a/src/d/actor/d_a_warpls.cpp +++ b/src/d/actor/d_a_warpls.cpp @@ -101,7 +101,6 @@ static BOOL daWarpls_IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daWarplsMethodTable = { (process_method_func)daWarpls_Create, (process_method_func)daWarpls_Delete, diff --git a/src/d/actor/d_a_warpmj.cpp b/src/d/actor/d_a_warpmj.cpp index b14fbb58..89321c3f 100644 --- a/src/d/actor/d_a_warpmj.cpp +++ b/src/d/actor/d_a_warpmj.cpp @@ -146,7 +146,6 @@ static BOOL daWarpmj_IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daWarpmjMethodTable = { (process_method_func)daWarpmj_Create, (process_method_func)daWarpmj_Delete, diff --git a/src/d/actor/d_a_waterfall.cpp b/src/d/actor/d_a_waterfall.cpp index 4d4ce2de..3e66143e 100644 --- a/src/d/actor/d_a_waterfall.cpp +++ b/src/d/actor/d_a_waterfall.cpp @@ -126,7 +126,6 @@ static BOOL daWfall_IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daWfallMethodTable = { (process_method_func)daWfall_Create, (process_method_func)daWfall_Delete, diff --git a/src/d/actor/d_a_wbird.cpp b/src/d/actor/d_a_wbird.cpp index 5b561d52..126cbb97 100644 --- a/src/d/actor/d_a_wbird.cpp +++ b/src/d/actor/d_a_wbird.cpp @@ -71,7 +71,6 @@ static s32 daWbird_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daWbird_Method = { (process_method_func)daWbird_Create, (process_method_func)daWbird_Delete, diff --git a/src/d/actor/d_a_wind_tag.cpp b/src/d/actor/d_a_wind_tag.cpp index 3f18c7eb..912ba252 100644 --- a/src/d/actor/d_a_wind_tag.cpp +++ b/src/d/actor/d_a_wind_tag.cpp @@ -106,7 +106,6 @@ static BOOL daWindTag_IsDelete(void*) { /* Nonmatching */ } - static actor_method_class daWindTagMethodTable = { (process_method_func)daWindTag_Create, (process_method_func)daWindTag_Delete, @@ -126,7 +125,7 @@ actor_process_profile_definition g_profile_WindTag = { /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x00A8, - /* Actor SubMtd */ &daWindTag::daWindTagMethodTable, + /* Actor SubMtd */ &daWindTagMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, diff --git a/src/d/actor/d_a_wz.cpp b/src/d/actor/d_a_wz.cpp index 12bddbc6..f2daf7e6 100644 --- a/src/d/actor/d_a_wz.cpp +++ b/src/d/actor/d_a_wz.cpp @@ -142,7 +142,6 @@ static s32 daWZ_Create(fopAc_ac_c*) { /* Nonmatching */ } - static actor_method_class l_daWZ_Method = { (process_method_func)daWZ_Create, (process_method_func)daWZ_Delete, diff --git a/src/d/actor/d_a_yougan.cpp b/src/d/actor/d_a_yougan.cpp index 12b55f4a..4e90e82e 100644 --- a/src/d/actor/d_a_yougan.cpp +++ b/src/d/actor/d_a_yougan.cpp @@ -71,7 +71,6 @@ void daYougan_c::_daYougan_create() { /* Nonmatching */ } - static actor_method_class l_daYougan_Method = { (process_method_func)daYougan_Create, (process_method_func)daYougan_Delete, |