summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2026-09-25 14:03:54 -0400
committerLagoLunatic <LagoLunatic@users.noreply.github.com>2026-09-25 14:03:54 -0400
commit96bbf3e97e11f8b3cd1ad758652834f7bb7a67cc (patch)
tree6294404b410b8514b9e69b9b0029049aab5b3b1a /include
parent624ab5f13c37737d971ae8d9bcc760a1f28e8fef (diff)
Add some more inlines
Diffstat (limited to 'include')
-rw-r--r--include/d/actor/d_a_andsw0.h2
-rw-r--r--include/d/actor/d_a_boss_item.h2
-rw-r--r--include/d/actor/d_a_esa.h2
-rw-r--r--include/d/actor/d_a_seatag.h2
-rw-r--r--include/d/actor/d_a_tag_kb_item.h16
-rw-r--r--include/d/actor/d_a_tag_photo.h6
-rw-r--r--include/d/actor/d_a_tpota.h3
7 files changed, 16 insertions, 17 deletions
diff --git a/include/d/actor/d_a_andsw0.h b/include/d/actor/d_a_andsw0.h
index e1710ea0..c920e0e4 100644
--- a/include/d/actor/d_a_andsw0.h
+++ b/include/d/actor/d_a_andsw0.h
@@ -5,7 +5,7 @@
struct andsw0_class {
/* 0x000 */ fopAc_ac_c actor;
- /* 0x290 */ u32 _pad[2];
+ /* 0x290 */ request_of_phase_process_class mPhase; // Unused
/* 0x298 */ s8 mAction;
/* 0x299 */ u8 mNumSwitchesToCheck;
/* 0x29A */ u8 mBehaviorType;
diff --git a/include/d/actor/d_a_boss_item.h b/include/d/actor/d_a_boss_item.h
index f84d75e2..e81d748e 100644
--- a/include/d/actor/d_a_boss_item.h
+++ b/include/d/actor/d_a_boss_item.h
@@ -6,7 +6,7 @@
struct bossitem_class {
/* 0x000 */ fopAc_ac_c actor;
- /* 0x290 */ u8 m290[0x298 - 0x290];
+ /* 0x290 */ request_of_phase_process_class mPhase; // Unused
}; // Size: 0x298
namespace daBossItem_prm {
diff --git a/include/d/actor/d_a_esa.h b/include/d/actor/d_a_esa.h
index 01666ce6..d530f9fa 100644
--- a/include/d/actor/d_a_esa.h
+++ b/include/d/actor/d_a_esa.h
@@ -7,7 +7,7 @@
class esa_class : public fopAc_ac_c {
public:
- /* 0x290 */ u8 field_0x290[0x298 - 0x290];
+ /* 0x290 */ request_of_phase_process_class mPhase; // Unused
/* 0x298 */ u8 field_0x298;
/* 0x29C */ f32 mGroundHeight;
/* 0x2A0 */ s8 mActionState;
diff --git a/include/d/actor/d_a_seatag.h b/include/d/actor/d_a_seatag.h
index 3ee77182..cbc0f7ab 100644
--- a/include/d/actor/d_a_seatag.h
+++ b/include/d/actor/d_a_seatag.h
@@ -10,7 +10,7 @@ public:
inline BOOL execute();
public:
- /* 0x290 */ u8 m290[0x298 - 0x290];
+ /* 0x290 */ request_of_phase_process_class mPhase; // Unused
};
#endif /* D_A_SEATAG_H */
diff --git a/include/d/actor/d_a_tag_kb_item.h b/include/d/actor/d_a_tag_kb_item.h
index ccef375f..7996d871 100644
--- a/include/d/actor/d_a_tag_kb_item.h
+++ b/include/d/actor/d_a_tag_kb_item.h
@@ -1,7 +1,7 @@
#ifndef D_A_TAG_KB_ITEM_H
#define D_A_TAG_KB_ITEM_H
-#include "f_op/f_op_actor_mng.h"
+#include "f_op/f_op_actor.h"
class daTagKbItem_c : public fopAc_ac_c {
public:
@@ -15,13 +15,13 @@ public:
bool _execute();
bool _draw();
- /* 0x290 */ u8 field_0x290[0x298 - 0x290];
- /* 0x298 */ u8 field_0x298;
- /* 0x299 */ u8 field_0x299;
- /* 0x29C */ s32 field_0x29c;
- /* 0x2A0 */ u8 field_0x2a0;
- /* 0x2A1 */ u8 field_0x2a1;
- /* 0x2A4 */ s32 field_0x2a4;
+ /* 0x290 */ request_of_phase_process_class mPhase; // Unused
+ /* 0x298 */ bool field_0x298;
+ /* 0x299 */ bool field_0x299;
+ /* 0x29C */ int mItemBitNo;
+ /* 0x2A0 */ u8 mItemNo;
+ /* 0x2A1 */ u8 mEnemyKind;
+ /* 0x2A4 */ int mSwBitNo;
/* 0x2A8 */ fopAc_ac_c* mpActor;
}; // Size: 0x2AC
diff --git a/include/d/actor/d_a_tag_photo.h b/include/d/actor/d_a_tag_photo.h
index 2867ebf1..e4a5cf3b 100644
--- a/include/d/actor/d_a_tag_photo.h
+++ b/include/d/actor/d_a_tag_photo.h
@@ -34,12 +34,12 @@ public:
u8 getPrmTagNo();
enum Prm_e {
- PRM_TAG_NO_W = 8,
+ PRM_TAG_NO_W = 0x08,
PRM_TAG_NO_S = 0x00,
};
+
public:
- /* Place member variables here */
- /* 0x290 */ request_of_phase_process_class mPhs;
+ /* 0x290 */ request_of_phase_process_class mPhase;
/* 0x298 */ fpc_ProcID mMsgID;
/* 0x29C */ msg_class* mpCurrMsg;
/* 0x2A0 */ u32 mMsgNo;
diff --git a/include/d/actor/d_a_tpota.h b/include/d/actor/d_a_tpota.h
index 89fb1e79..67161633 100644
--- a/include/d/actor/d_a_tpota.h
+++ b/include/d/actor/d_a_tpota.h
@@ -7,7 +7,6 @@ class JPABaseEmitter;
class JPABaseParticle;
class daTpota_c : public fopAc_ac_c {
-
struct unknown_struct {
JPABaseParticle* ptcl;
f32 pos_y;
@@ -24,7 +23,7 @@ public:
bool _draw();
public:
- /* 0x290 */ u8 field_0x290[0x298 - 0x290];
+ /* 0x290 */ request_of_phase_process_class mPhase; // Unused
/* 0x298 */ JPABaseEmitter* mpEmitters[2];
/* 0x2A0 */ cXyz mPositions[2];
/* 0x2B8 */ csXyz mAngles[2];