Skip to content

Commit 5de2ffc

Browse files
YunataSaviormeintte
authored andcommitted
Continued cleanup of d_ev_camera functions (zeldaret#2458)
1 parent a1083bb commit 5de2ffc

File tree

3 files changed

+864
-744
lines changed

3 files changed

+864
-744
lines changed

include/d/d_camera.h

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -444,12 +444,12 @@ class dCamera_c {
444444

445445
static engine_fn engine_tbl[];
446446

447+
/* 0x000 */ camera_class* field_0x0;
447448
#if VERSION == VERSION_SHIELD_DEBUG
448-
// In the debug rom, there's D8 bytes preceeding all other members.
449+
// In the debug rom, there's D8 bytes preceeding the following members.
449450
// The following is a stopgap:
450451
u8 mFillerBytes[0xD8];
451452
#endif
452-
/* 0x000 */ camera_class* field_0x0;
453453
/* 0x004 */ int mRoomNo;
454454
/* 0x008 */ u8 field_0x8[0x20 - 0x8];
455455
/* 0x020 */ u8 field_0x20;
@@ -975,7 +975,8 @@ class dCamera_c {
975975
/* 0x03C */ cSGlobe field_0x3c;
976976
/* 0x044 */ cXyz field_0x44;
977977
/* 0x050 */ cXyz field_0x50;
978-
/* 0x100 */ cSGlobe field_0x100;
978+
/* 0x05C */ u8 field_0x5C[8];
979+
/* 0x064 */ cSGlobe field_0x64;
979980
} getItem;
980981
struct possessed {
981982
/* 0x00 */ int field_0x0;
@@ -991,12 +992,13 @@ class dCamera_c {
991992
/* 0x24 */ fopAc_ac_c* mTargetActor;
992993
/* 0x28 */ cSGlobe field_0x28;
993994
} possessed;
994-
struct {
995+
struct fixedFrames {
995996
/* 0x00 */ bool field_0x0;
996997
/* 0x04 */ cXyz field_0x4;
997998
/* 0x10 */ cXyz field_0x10;
998999
/* 0x1C */ cXyz* field_0x1c[2];
999-
/* 0x24 */ f32* field_0x24[2];
1000+
/* 0x24 */ f32* field_0x24;
1001+
/* 0x28 */ f32 field_0x28;
10001002
/* 0x2C */ fopAc_ac_c* mRelActor;
10011003
/* 0x30 */ char mRelUseMask;
10021004
/* 0x31 */ char field_0x31;
@@ -1014,7 +1016,7 @@ class dCamera_c {
10141016
/* 0x18 */ u8 field_0x18[4];
10151017
/* 0x1c */ bool field_0x1c;
10161018
} bSpline;
1017-
struct {
1019+
struct twoActor0 {
10181020
/* 0x00 */ fopAc_ac_c* mActor1;
10191021
/* 0x04 */ fopAc_ac_c* mActor2;
10201022
/* 0x08 */ u8 field_0x8[4];
@@ -1044,7 +1046,7 @@ class dCamera_c {
10441046
/* 0x04 */ int mType;
10451047
/* 0x08 */ int field_0x8;
10461048
/* 0x0C */ f32 field_0xc;
1047-
/* 0x10 */ s8 field_0x10;
1049+
/* 0x10 */ u8 field_0x10;
10481050
/* 0x11 */ u8 field_0x11[3];
10491051
/* 0x14 */ cXyz field_0x14;
10501052
/* 0x20 */ cXyz field_0x20;

include/d/d_spline_path.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ class d2DBSplinePath {
3232
/* 80097A6C */ cXyz Calc(cXyz*);
3333
/* 80097B68 */ f32 Spot(f32*, f32);
3434
/* 801828D4 */ virtual ~d2DBSplinePath() {}
35+
36+
bool Last() { return field_0x08 == 3; }
3537
};
3638

3739
#endif /* D_D_SPLINE_PATH_H */

0 commit comments

Comments
 (0)