mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-10 11:55:14 -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) {