diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 70d9ecf04..52959b612 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -16,11 +16,17 @@ struct actor_method_class { enum fopAc_Status_e { fopAcStts_SHOWMAP_e = 0x00000020, - fopAcStts_NOEXEC_e = 0x00000080, + fopAcStts_NOCULLEXEC_e = 0x00000080, fopAcStts_CULL_e = 0x00000100, fopAcStts_FREEZE_e = 0x00000400, + fopAcStts_UNK800_e = 0x00000800, fopAcStts_CARRY_e = 0x00002000, + fopAcStts_UNK4000_e = 0x00004000, fopAcStts_NOPAUSE_e = 0x00020000, + fopAcStts_UNK40000_e = 0x00040000, + fopAcStts_UNK80000_e = 0x00080000, + fopAcStts_HOOK_CARRY_e = 0x00100000, + fopAcStts_UNK200000_e = 0x00200000, fopAcStts_NODRAW_e = 0x01000000, fopAcStts_BOSS_e = 0x04000000, }; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 1fa7fd686..d7666f86b 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -100,7 +100,7 @@ enum fopAcM_CARRY { }; inline u32 fopAcM_checkHookCarryNow(fopAc_ac_c* pActor) { - return fopAcM_checkStatus(pActor, 0x100000); + return fopAcM_checkStatus(pActor, fopAcStts_HOOK_CARRY_e); } inline u32 fopAcM_GetParam(void* pActor) { @@ -184,11 +184,11 @@ inline void fopAcM_SetRoomNo(fopAc_ac_c* actor, s8 roomNo) { } inline void fopAcM_setHookCarryNow(fopAc_ac_c* actor) { - fopAcM_OnStatus(actor, 0x100000); + fopAcM_OnStatus(actor, fopAcStts_HOOK_CARRY_e); } inline void fopAcM_cancelHookCarryNow(fopAc_ac_c* actor) { - fopAcM_OffStatus(actor, 0x100000); + fopAcM_OffStatus(actor, fopAcStts_HOOK_CARRY_e); } inline s8 fopAcM_GetHomeRoomNo(fopAc_ac_c* pActor) { diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp index 02e1fcafa..cbfe40eca 100644 --- a/src/d/actor/d_a_agbsw0.cpp +++ b/src/d/actor/d_a_agbsw0.cpp @@ -2531,7 +2531,7 @@ extern actor_process_profile_definition g_profile_AGBSW0 = { &g_fopAc_Method.base, 0x000D, &l_daAgbsw0_Method, - 0x00040000, + fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp index 35a965fa8..49995f024 100644 --- a/src/d/actor/d_a_alldie.cpp +++ b/src/d/actor/d_a_alldie.cpp @@ -143,7 +143,7 @@ extern actor_process_profile_definition g_profile_ALLDIE = { &g_fopAc_Method.base, 0x011D, &l_daAlldie_Method, - 0x00044000, + fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index e5f20cc46..42196bb94 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -1469,7 +1469,7 @@ extern actor_process_profile_definition g_profile_AM = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x00BD, /* Actor SubMtd */ &l_daAM_Method, - /* Status */ 0x00040120, + /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_andsw0.cpp b/src/d/actor/d_a_andsw0.cpp index 737644320..81983cea5 100644 --- a/src/d/actor/d_a_andsw0.cpp +++ b/src/d/actor/d_a_andsw0.cpp @@ -366,7 +366,7 @@ extern actor_process_profile_definition g_profile_ANDSW0 = { &g_fopAc_Method.base, 0x0135, &l_daAndsw0_Method, - 0x00040000, + fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp index 7c60064f4..8d7c9e111 100644 --- a/src/d/actor/d_a_andsw2.cpp +++ b/src/d/actor/d_a_andsw2.cpp @@ -294,7 +294,7 @@ extern actor_process_profile_definition g_profile_ANDSW2 = { &g_fopAc_Method.base, 0x0136, &l_daAndsw2_Method, - 0x00044000, + fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index 576dd6fa1..672cd6eb0 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -679,7 +679,7 @@ BOOL daArrow_c::procMove() { } mCurrProcFunc = &procStop_BG; - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK4000_e); fopAcM_SetParam(this, 2); field_0x604 = 0x28; @@ -721,7 +721,7 @@ BOOL daArrow_c::procMove() { if (hitType > 0) { field_0x604 = 0x28; - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK4000_e); if (mPtclFollowCb.mpEmitter) { mPtclFollowCb.end(); @@ -780,7 +780,7 @@ BOOL daArrow_c::procMove() { } mCurrProcFunc = &procStop_BG; - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK4000_e); fopAcM_SetParam(this, 2); field_0x604 = 0x28; cM3dGPla* triPla = dComIfG_Bgsp()->i_GetTriPla(mLinChk); @@ -1302,7 +1302,7 @@ extern actor_process_profile_definition g_profile_ARROW = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x01BF, /* Actor SubMtd */ &daArrowMethodTable, - /* Status */ 0x00044000, + /* Status */ fopAcStts_UNK4000_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 92692c69b..3b8d44538 100644 --- a/src/d/actor/d_a_boss_item.cpp +++ b/src/d/actor/d_a_boss_item.cpp @@ -70,7 +70,7 @@ extern actor_process_profile_definition g_profile_BOSSITEM = { &g_fopAc_Method.base, 0x00FB, &daBossItem_METHODS, - 0x00040000, + fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp index 7d71368c1..ce5167061 100644 --- a/src/d/actor/d_a_branch.cpp +++ b/src/d/actor/d_a_branch.cpp @@ -271,7 +271,7 @@ extern actor_process_profile_definition g_profile_BRANCH = { &g_fopAc_Method.base, 0x0193, &l_daBranch_Method, - 0x00044000, + fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index b666600c6..f329452e8 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -142,7 +142,7 @@ extern actor_process_profile_definition g_profile_DISAPPEAR = { &g_fopAc_Method.base, 0x0188, &l_daDisappear_Method, - 0x00044000, + fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp index 194139443..904876029 100644 --- a/src/d/actor/d_a_item.cpp +++ b/src/d/actor/d_a_item.cpp @@ -1083,7 +1083,7 @@ extern actor_process_profile_definition g_profile_ITEM = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x00F5, /* Actor SubMtd */ &l_daItem_Method, - /* Status */ 0x000C0100, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp index 860484442..cf1cd76c5 100644 --- a/src/d/actor/d_a_kaji.cpp +++ b/src/d/actor/d_a_kaji.cpp @@ -164,7 +164,7 @@ extern actor_process_profile_definition g_profile_Kaji = { &g_fopAc_Method.base, 0x01AC, &daKajiMethodTable, - 0x00040100, + fopAcStts_CULL_e | fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index 6b68e4043..2d875e558 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/src/d/actor/d_a_kytag04.cpp @@ -89,7 +89,7 @@ extern actor_process_profile_definition g_profile_KYTAG04 = { &g_fopAc_Method.base, 0xA4, &l_daKytag04_Method, - 0x00044000, + fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index 203db190e..db68603c0 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -171,7 +171,7 @@ extern actor_process_profile_definition g_profile_KYTAG06 = { &g_fopAc_Method.base, 0xA5, &l_daKytag05_Method, - 0x00000044000, + fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, }; \ No newline at end of file diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index 25ffecec5..1743abcf8 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -93,7 +93,7 @@ extern actor_process_profile_definition g_profile_KYTAG06 = { &g_fopAc_Method.base, 0xA6, &l_daKytag06_Method, - 0x00044000, + fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, }; \ No newline at end of file diff --git a/src/d/actor/d_a_magma.cpp b/src/d/actor/d_a_magma.cpp index cf428ba22..b26e21441 100644 --- a/src/d/actor/d_a_magma.cpp +++ b/src/d/actor/d_a_magma.cpp @@ -74,7 +74,7 @@ extern actor_process_profile_definition g_profile_MAGMA = { &g_fopAc_Method.base, 0x01BC, &l_daMagma_Method, - 0x00040180, + fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_0_e }; diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp index c01529029..0db41691f 100644 --- a/src/d/actor/d_a_mbdoor.cpp +++ b/src/d/actor/d_a_mbdoor.cpp @@ -634,7 +634,7 @@ extern actor_process_profile_definition g_profile_MBDOOR = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x0132, /* Actor SubMtd */ &l_daMbdoor_Method, - /* Status */ 0x00044000, + /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp index d2e3775e1..925abd1fc 100644 --- a/src/d/actor/d_a_mozo.cpp +++ b/src/d/actor/d_a_mozo.cpp @@ -372,7 +372,7 @@ extern actor_process_profile_definition g_profile_MOZO = { &g_fopAc_Method.base, 0x00D1, &l_daMozo_Method, - 0x00040100, + fopAcStts_CULL_e | fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp index b436f08a7..c8691a402 100644 --- a/src/d/actor/d_a_nh.cpp +++ b/src/d/actor/d_a_nh.cpp @@ -628,7 +628,7 @@ extern actor_process_profile_definition g_profile_NH = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 0x013C, /* Actor SubMtd */ &l_daNh_Method, - /* Status */ 0x00040100, + /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp index 107a0955c..5ddf2d63a 100644 --- a/src/d/actor/d_a_obj_Ygush00.cpp +++ b/src/d/actor/d_a_obj_Ygush00.cpp @@ -197,7 +197,7 @@ extern actor_process_profile_definition g_profile_Obj_Ygush00 = { &g_fopAc_Method.base, 0x005E, &l_daObjYgush00_Method, - 0x00040100, + fopAcStts_CULL_e | fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index 702dd7e88..65cc39c82 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -727,7 +727,7 @@ extern actor_process_profile_definition g_profile_Obj_Barrier = { /* Leaf SubMtd */ &g_fopAc_Method.base, /* Priority */ 131, /* Actor SubMtd */ &l_daObjBarrier_Method, - /* Status */ 0x40000, + /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp index 7be6a4a9b..759f6b1c9 100644 --- a/src/d/actor/d_a_obj_mknjd.cpp +++ b/src/d/actor/d_a_obj_mknjd.cpp @@ -1131,7 +1131,7 @@ extern actor_process_profile_definition g_profile_Obj_MknjD = { &g_fopAc_Method.base, 0x01C6, &daObjMknjD::Mthd_Table, - 0x00044100, + fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index c3af525d9..b4077adb7 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -870,7 +870,7 @@ extern actor_process_profile_definition g_profile_Obj_Movebox = { &g_fopAc_Method.base, 0x0015, &daObjMovebox::Mthd_Table, - 0x00040524, + 0x04 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK40000_e, fopAc_ACTOR_e, 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 b70315b84..fcd838a3c 100644 --- a/src/d/actor/d_a_obj_paper.cpp +++ b/src/d/actor/d_a_obj_paper.cpp @@ -226,7 +226,7 @@ namespace daObjPaper { /* 00000730-00000748 .text mode_wait_init__Q210daObjPaper5Act_cFv */ void daObjPaper::Act_c::mode_wait_init() { - mStatus |= fopAcStts_NOEXEC_e; + mStatus |= fopAcStts_NOCULLEXEC_e; mMode = ActMode_WAIT_e; } @@ -242,7 +242,7 @@ namespace daObjPaper { /* 00000784-000007A4 .text mode_talk0_init__Q210daObjPaper5Act_cFv */ void daObjPaper::Act_c::mode_talk0_init() { - mStatus &= ~fopAcStts_NOEXEC_e; + mStatus &= ~fopAcStts_NOCULLEXEC_e; mMsgId = -1; mMode = ActMode_TALKBEGIN_e; } @@ -402,7 +402,7 @@ namespace daObjPaper { &g_fopAc_Method.base, 0x0108, &Mthd_Table, - 0x00040180, + fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index bcaa03409..df7c64d59 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -1104,7 +1104,7 @@ extern actor_process_profile_definition g_profile_OBJ_TORIPOST = { &g_fopAc_Method.base, 0x01B3, &daObjTpostMethodTable, - 0x00240138, + 0x18 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, fopAc_ACTOR_e, fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_rectangle.cpp b/src/d/actor/d_a_rectangle.cpp index 0da36052e..025195025 100644 --- a/src/d/actor/d_a_rectangle.cpp +++ b/src/d/actor/d_a_rectangle.cpp @@ -52,7 +52,7 @@ extern actor_process_profile_definition g_profile_RECTANGLE = { &g_fopAc_Method.base, 0x9F, &l_daRct_Method, - 0x00040000, + fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_scene_change.cpp b/src/d/actor/d_a_scene_change.cpp index c5c27798f..966545283 100644 --- a/src/d/actor/d_a_scene_change.cpp +++ b/src/d/actor/d_a_scene_change.cpp @@ -93,7 +93,7 @@ extern actor_process_profile_definition g_profile_SCENECHG = { &g_fopAc_Method.base, 0x01A1, &daSceneChgMethodTable, - 0x00040000, + fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 190153c48..e989a1f4a 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -261,7 +261,7 @@ extern actor_process_profile_definition g_profile_ShopItem = { &g_fopAc_Method.base, 0x00FE, &daShopItemMethodTable, - 0x00044100, + fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index 0bbc99bf1..846e41bce 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/src/d/actor/d_a_swc00.cpp @@ -87,7 +87,7 @@ extern actor_process_profile_definition g_profile_SWC00 = { &g_fopAc_Method.base, 0x011A, &l_daSwc00_Method, - 0x00040000, + fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_kb_item.cpp b/src/d/actor/d_a_tag_kb_item.cpp index 42a616b7f..076c64a08 100644 --- a/src/d/actor/d_a_tag_kb_item.cpp +++ b/src/d/actor/d_a_tag_kb_item.cpp @@ -125,7 +125,7 @@ extern actor_process_profile_definition g_profile_TAG_KB_ITEM = { &g_fopAc_Method.base, 0x0127, &daTagKbItemMethodTable, - 0x00040000, + fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_ret.cpp b/src/d/actor/d_a_tag_ret.cpp index 8817fb7f2..46666de6b 100644 --- a/src/d/actor/d_a_tag_ret.cpp +++ b/src/d/actor/d_a_tag_ret.cpp @@ -147,18 +147,18 @@ namespace daTagRet { }; extern actor_process_profile_definition g_profile_Tag_Ret = { - fpcLy_CURRENT_e, - 3, - fpcLy_CURRENT_e, - PROC_Tag_Ret, - &g_fpcLf_Method.mBase, - sizeof(daTagRet::Act_c), - 0, - 0, - &g_fopAc_Method.base, - 0x005F, - &daTagRet::Mthd_Table, - 0x00040000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* LayerID */ fpcLy_CURRENT_e, + /* ListID */ 3, + /* ListPrio */ fpcLy_CURRENT_e, + /* ProcName */ PROC_Tag_Ret, + /* Proc SubMtd */ &g_fpcLf_Method.mBase, + /* Size */ sizeof(daTagRet::Act_c), + /* SizeOther */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ 0x005F, + /* Actor SubMtd */ &daTagRet::Mthd_Table, + /* Status */ fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* CullType */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/d_throwstone.cpp b/src/d/d_throwstone.cpp index cf7dde4e4..9d1cf0076 100644 --- a/src/d/d_throwstone.cpp +++ b/src/d/d_throwstone.cpp @@ -141,7 +141,7 @@ actor_process_profile_definition g_profile_THROWSTONE = { &g_fopAc_Method.base, 0x01CE, &l_daThrowstone_Method, - 0x00040100, + fopAcStts_CULL_e | fopAcStts_UNK40000_e, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, }; diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index ed0c9404e..1b3f540f2 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -68,7 +68,7 @@ s32 fopAc_Execute(void* pProc) { s32 moveApproval = dComIfGp_event_moveApproval(actor); - if ((moveApproval == 2 || moveApproval != 0 || !fopAcM_checkStatus(actor, fopAc_ac_c::stopStatus)) && (!fopAcM_checkStatus(actor, fopAcStts_NOEXEC_e) || !fopAcM_CheckCondition(actor, fopAcCnd_NODRAW_e))) { + if ((moveApproval == 2 || moveApproval != 0 || !fopAcM_checkStatus(actor, fopAc_ac_c::stopStatus)) && (!fopAcM_checkStatus(actor, fopAcStts_NOCULLEXEC_e) || !fopAcM_CheckCondition(actor, fopAcCnd_NODRAW_e))) { fopAcM_OffCondition(actor, fopAcCnd_NOEXEC_e); actor->next = actor->current; ret = fpcMtd_Execute((process_method_class*)actor->mSubMtd, actor); diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index aa78cf4ce..3455cc0b0 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -994,7 +994,7 @@ void fopAcM_cancelCarryNow(fopAc_ac_c* i_this) { i_this->shape_angle.z = 0; if (dComIfGp_event_runCheck() && i_this->mGroup != fopAc_ENEMY_e) { - fopAcM_OnStatus(i_this, 0x800); + fopAcM_OnStatus(i_this, fopAcStts_UNK800_e); } } }