d_cc_uty OK

This commit is contained in:
LagoLunatic
2024-01-20 19:27:19 -05:00
parent 29890bc07c
commit 25e69da75e
23 changed files with 337 additions and 67 deletions
+7 -7
View File
@@ -23,25 +23,25 @@ struct actor_method_class2 {
enum fopAc_Status_e {
// Note: The lowest 5 bits of the status field (& 0x1F) act as an index controlling the map icon type.
fopAcStts_SHOWMAP_e = 0x00000020,
fopAcStts_UNK40_e = 0x00000040,
fopAcStts_UNK40_e = 0x00000040, // Related to talking to the Killer Bees?
fopAcStts_NOCULLEXEC_e = 0x00000080,
fopAcStts_CULL_e = 0x00000100,
fopAcStts_FREEZE_e = 0x00000400,
fopAcStts_UNK800_e = 0x00000800,
fopAcStts_UNK1000_e = 0x00001000,
fopAcStts_UNK1000_e = 0x00001000, // Door related
fopAcStts_CARRY_e = 0x00002000,
fopAcStts_UNK4000_e = 0x00004000,
fopAcStts_FORCEMOVE_e = 0x00008000,
fopAcStts_NOPAUSE_e = 0x00020000,
fopAcStts_UNK40000_e = 0x00040000,
fopAcStts_UNK80000_e = 0x00080000,
fopAcStts_UNK80000_e = 0x00080000, // Hookshot related
fopAcStts_HOOK_CARRY_e = 0x00100000,
fopAcStts_UNK200000_e = 0x00200000,
fopAcStts_UNK200000_e = 0x00200000, // Hookshot related
fopAcStts_NODRAW_e = 0x01000000,
fopAcStts_UNK2000000_e = 0x02000000,
fopAcStts_BOSS_e = 0x04000000,
fopAcStts_UNK8000000_e = 0x08000000,
fopAcStts_UNK10000000_e = 0x10000000,
fopAcStts_UNK10000000_e = 0x10000000, // Hookshot related
};
enum fopAc_Condition_e {
@@ -281,8 +281,8 @@ public:
/* 0x284 */ s8 mMaxHealth;
/* 0x285 */ s8 mHealth;
/* 0x288 */ s32 mItemTableIdx;
/* 0x28C */ u8 mItemStealNum;
/* 0x28D */ s8 mItemStealLeft;
/* 0x28C */ u8 mStealItemBitNo; // For limited items (Blue Chu Jelly), this is the first itemBitNo to set.
/* 0x28D */ s8 mStealItemLeft;
fopAc_ac_c();
~fopAc_ac_c();
+2
View File
@@ -534,6 +534,8 @@ void* fopAcM_fastCreateItem(cXyz* p_pos, int i_itemNo, int i_roomNo, csXyz* p_an
cXyz* p_scale, f32 p_speedF, f32 p_speedY, f32 param_8,
int param_9 = -1, createFunc p_createFunc = NULL);
void* fopAcM_createStealItem(cXyz* p_pos, int i_tblNo, int i_roomNo, csXyz* p_angle, int i_itemBitNo);
BOOL stealItem_CB(void* actor);
fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo);