mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-07 13:23:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use fopAcStts enum everywhere

Browse Source
This commit is contained in:
LagoLunatic
2023-10-07 02:26:59 -04:00
parent 7767b9544c
commit 8d4a9545e1
35 changed files with 61 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/f_op/f_op_actor.h
+7 -1
View File
@@ -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,
};
include/f_op/f_op_actor_mng.h
+3 -3
View File
@@ -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) {
src/d/actor/d_a_agbsw0.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_alldie.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_am.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_andsw0.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_andsw2.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_arrow.cpp
+4 -4
View File
@@ -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,
};
src/d/actor/d_a_boss_item.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_branch.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_disappear.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_item.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_kaji.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_kytag04.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_kytag05.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_kytag06.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_magma.cpp
+1 -1
View File
@@ -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
};
src/d/actor/d_a_mbdoor.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_mozo.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_nh.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_obj_Ygush00.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_obj_barrier.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_obj_mknjd.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_obj_movebox.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_obj_paper.cpp
+3 -3
View File
@@ -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,
};
src/d/actor/d_a_obj_toripost.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_rectangle.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_scene_change.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_shop_item.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_swc00.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_tag_kb_item.cpp
+1 -1
View File
@@ -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,
};
src/d/actor/d_a_tag_ret.cpp
+14 -14
View File
@@ -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,
};
src/d/d_throwstone.cpp
+1 -1
View File
@@ -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,
};
src/f_op/f_op_actor.cpp
+1 -1
View File
@@ -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);
src/f_op/f_op_actor_mng.cpp
+1 -1
View File
@@ -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);
}
}
}