Continued cleanup of d_ev_camera functions (#2458)

This commit is contained in:
YunataSavior 2025-05-27 02:50:32 -07:00 committed by GitHub
parent c9ee3d4861
commit 0f3dc461e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 871 additions and 751 deletions

View File

@ -444,12 +444,12 @@ public:
static engine_fn engine_tbl[];
/* 0x000 */ camera_class* field_0x0;
#if VERSION == VERSION_SHIELD_DEBUG
// In the debug rom, there's D8 bytes preceeding all other members.
// In the debug rom, there's D8 bytes preceeding the following members.
// The following is a stopgap:
u8 mFillerBytes[0xD8];
#endif
/* 0x000 */ camera_class* field_0x0;
/* 0x004 */ int mRoomNo;
/* 0x008 */ u8 field_0x8[0x20 - 0x8];
/* 0x020 */ u8 field_0x20;
@ -975,7 +975,8 @@ public:
/* 0x03C */ cSGlobe field_0x3c;
/* 0x044 */ cXyz field_0x44;
/* 0x050 */ cXyz field_0x50;
/* 0x100 */ cSGlobe field_0x100;
/* 0x05C */ u8 field_0x5C[8];
/* 0x064 */ cSGlobe field_0x64;
} getItem;
struct possessed {
/* 0x00 */ int field_0x0;
@ -991,12 +992,13 @@ public:
/* 0x24 */ fopAc_ac_c* mTargetActor;
/* 0x28 */ cSGlobe field_0x28;
} possessed;
struct {
struct fixedFrames {
/* 0x00 */ bool field_0x0;
/* 0x04 */ cXyz field_0x4;
/* 0x10 */ cXyz field_0x10;
/* 0x1C */ cXyz* field_0x1c[2];
/* 0x24 */ f32* field_0x24[2];
/* 0x24 */ f32* field_0x24;
/* 0x28 */ f32 field_0x28;
/* 0x2C */ fopAc_ac_c* mRelActor;
/* 0x30 */ char mRelUseMask;
/* 0x31 */ char field_0x31;
@ -1014,7 +1016,7 @@ public:
/* 0x18 */ u8 field_0x18[4];
/* 0x1c */ bool field_0x1c;
} bSpline;
struct {
struct twoActor0 {
/* 0x00 */ fopAc_ac_c* mActor1;
/* 0x04 */ fopAc_ac_c* mActor2;
/* 0x08 */ u8 field_0x8[4];
@ -1044,7 +1046,7 @@ public:
/* 0x04 */ int mType;
/* 0x08 */ int field_0x8;
/* 0x0C */ f32 field_0xc;
/* 0x10 */ s8 field_0x10;
/* 0x10 */ u8 field_0x10;
/* 0x11 */ u8 field_0x11[3];
/* 0x14 */ cXyz field_0x14;
/* 0x20 */ cXyz field_0x20;

View File

@ -32,6 +32,8 @@ public:
/* 80097A6C */ cXyz Calc(cXyz*);
/* 80097B68 */ f32 Spot(f32*, f32);
/* 801828D4 */ virtual ~d2DBSplinePath() {}
bool Last() { return field_0x08 == 3; }
};
#endif /* D_D_SPLINE_PATH_H */

File diff suppressed because it is too large Load Diff