diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-07-24 11:57:07 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-07-24 11:57:07 -0400 |
| commit | 5faa15219c6c94622d5ed08b162fed09b85b8ffc (patch) | |
| tree | 914f13c3d69b4de95a185f7f5f1407edfc958387 /include | |
| parent | 26d9efe3b63ac38960f8b0c5afe461c4b96b0eb5 (diff) | |
Add camera profiles, fix camera struct sizes
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/d_camera.h | 7 | ||||
| -rw-r--r-- | include/f_op/f_op_camera.h | 2 | ||||
| -rw-r--r-- | include/f_op/f_op_view.h | 1 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/d/d_camera.h b/include/d/d_camera.h index d7a7913b..483d15ac 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -418,7 +418,9 @@ public: /* 0x5FC */ int mTrimSize; /* 0x600 */ int mTrimTypeForce; /* 0x604 */ f32 mWindowAspectRatio; +#if VERSION > VERSION_DEMO /* 0x608 */ f32 m608; +#endif /* 0x60C */ dCamSetup_c mCamSetup; /* 0x750 */ dCamParam_c mCamParam; /* 0x75C */ int mCamTypeField; @@ -429,7 +431,9 @@ public: /* 0x770 */ int mCamTypeBoatBattle; /* 0x774 */ int mCamTypeSubject; /* 0x778 */ int mCamTypeKeep; +#if VERSION > VERSION_DEMO /* 0x77C */ int mCamTypeRestrict; +#endif /* 0x780 */ u8 m780; /* 0x781 */ u8 m781; /* 0x782 */ u8 m782; @@ -442,7 +446,6 @@ public: /* 0x789 */ u8 m789; /* 0x78A */ u8 m78A; /* 0x78B */ u8 m78B; - /* 0x78C */ u8 m78C[0x800 - 0x78C]; public: dCamera_c(camera_class*); @@ -623,8 +626,6 @@ public: static const char* mvBGTypes[]; }; -STATIC_ASSERT(sizeof(dCamera_c) == 0x800); - bool dCam_isManual(camera_class* i_this); s16 dCam_getAngleY(camera_class*); s16 dCam_getAngleX(camera_class*); diff --git a/include/f_op/f_op_camera.h b/include/f_op/f_op_camera.h index 1b6cdf6d..61eaabb5 100644 --- a/include/f_op/f_op_camera.h +++ b/include/f_op/f_op_camera.h @@ -25,11 +25,11 @@ public: /* 0x23C */ request_of_phase_process_class phase_request; /* 0x244 */ dCamera_c mCamera; }; // size = 0xA44 -STATIC_ASSERT(sizeof(camera_class) == 0xA44); struct camera_process_profile_definition { /* 0x00 */ view_process_profile_definition base; /* 0x3C */ leafdraw_method_class* sub_method; // Subclass methods + /* 0x40 */ u32 unk40; }; extern leafdraw_method_class g_fopCam_Method; diff --git a/include/f_op/f_op_view.h b/include/f_op/f_op_view.h index 0dcb5b73..6fabaee5 100644 --- a/include/f_op/f_op_view.h +++ b/include/f_op/f_op_view.h @@ -9,7 +9,6 @@ struct view_process_profile_definition { /* 0x00 */ leaf_process_profile_definition base; /* 0x24 */ leafdraw_method_class* sub_method; // Subclass methods /* 0x28 */ u8 unk28; - /* 0x29 */ u8 unk29[3]; // pad /* 0x2C */ u32 unk2C; /* 0x30 */ u32 unk30; /* 0x34 */ u32 unk34; |