d_s_room / d_s_name / d_a_title debug work (#3123)

* d_s_room / d_s_name debug work

* camera_class rtti fix

* d_a_title debug / handle shield rel changes

* fix shield build

* fix regressions
This commit is contained in:
TakaRikka
2026-03-06 22:30:25 -08:00
committed by GitHub
parent a2b179f952
commit 8e2545f2ec
140 changed files with 1293 additions and 1042 deletions
+16 -15
View File
@@ -10,8 +10,9 @@ struct fopCamM_prm_class {
/* 0x00 */ fopAcM_prmBase_class base;
}; // Size: 0x18
class camera_process_class : public view_class {
class camera_class {
public:
/* 0x000 */ view_class view;
/* 0x210 */ create_tag_class create_tag;
/* 0x224 */ leafdraw_method_class* submethod;
/* 0x228 */ u8 field_0x228[4];
@@ -23,7 +24,7 @@ public:
/* 0x238 */ int field_0x238;
};
class camera_class : public camera_process_class {
class camera_process_class : public camera_class {
public:
/* 0x23C */ int field_0x23c;
/* 0x240 */ request_of_phase_process_class phase_request;
@@ -39,35 +40,35 @@ inline void fopCamM_SetAngleY(camera_class* i_camera, s16 angle) {
}
inline void fopCamM_SetNear(camera_class* i_this, f32 near) {
i_this->near = near;
i_this->view.near = near;
}
inline void fopCamM_SetFar(camera_class* i_this, f32 far) {
i_this->far = far;
i_this->view.far = far;
}
inline void fopCamM_SetFovy(camera_class* i_this, f32 fovy) {
i_this->fovy = fovy;
i_this->view.fovy = fovy;
}
inline void fopCamM_SetAspect(camera_class* i_this, f32 aspect) {
i_this->aspect = aspect;
i_this->view.aspect = aspect;
}
inline void fopCamM_SetEye(camera_class* i_this, f32 x, f32 y, f32 z) {
i_this->lookat.eye.set(x, y, z);
i_this->view.lookat.eye.set(x, y, z);
}
inline void fopCamM_SetCenter(camera_class* i_this, f32 x, f32 y, f32 z) {
i_this->lookat.center.set(x, y, z);
i_this->view.lookat.center.set(x, y, z);
}
inline void fopCamM_SetUp(camera_class* i_this, f32 x, f32 y, f32 z) {
i_this->lookat.up.set(x, y, z);
i_this->view.lookat.up.set(x, y, z);
}
inline void fopCamM_SetBank(camera_class* i_this, s16 bank) {
i_this->bank = bank;
i_this->view.bank = bank;
}
inline void fopCamM_SetPrm1(camera_class* i_this, int prm1) {
@@ -95,23 +96,23 @@ inline s16 fopCamM_GetAngleZ(camera_class* i_camera) {
}
inline f32 fopCamM_GetFovy(camera_class* i_camera) {
return i_camera->fovy;
return i_camera->view.fovy;
}
inline cXyz* fopCamM_GetEye_p(camera_class* i_camera) {
return &i_camera->lookat.eye;
return &i_camera->view.lookat.eye;
}
inline cXyz* fopCamM_GetCenter_p(camera_class* i_camera) {
return &i_camera->lookat.center;
return &i_camera->view.lookat.center;
}
inline cXyz* fopCamM_GetUp_p(camera_class* i_camera) {
return &i_camera->lookat.up;
return &i_camera->view.lookat.up;
}
inline s16 fopCamM_GetBank(camera_class* i_camera) {
return i_camera->bank;
return i_camera->view.bank;
}
fpc_ProcID fopCamM_Create(int i_cameraIdx, s16 i_procName, void* i_append);