d_shop_camera, d_shop_item_ctrl OK (#2044)

This commit is contained in:
hatal175
2024-01-22 22:24:24 +02:00
committed by GitHub
parent 697cd08979
commit ea041b9d95
17 changed files with 436 additions and 1601 deletions
+4
View File
@@ -39,6 +39,10 @@ public:
/* 80037C1C */ cXyz* getPosP();
u8 getShopItemID() const { return mShopItemID; }
s16 getAngleX() const { return mAngleX; }
void setAngleX(s16 angle) { mAngleX = angle;}
s16 getAngleY() const { return mAngleY; }
void setAngleY(s16 angle) { mAngleY = angle;}
static ResourceData const mData[23];
+69
View File
@@ -2,5 +2,74 @@
#define D_SHOP_D_SHOP_CAMERA_H
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
struct ShopCam_action_c {
typedef int (ShopCam_action_c::*ShopCamFunc)();
/* 80195C9C */ int shop_cam_action_init();
/* 80195E18 */ int shop_cam_action();
/* 8019630C */ void Save();
/* 8019635C */ void EventRecoverNotime();
/* 801963B4 */ void Reset();
/* 801964C8 */ void move();
/* 80196544 */ void setCamDataIdx(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, cXyz*,
cXyz*);
/* 80196608 */ void setCamDataIdx2(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*,
fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, cXyz*, cXyz*);
/* 801966D4 */ void _debugSetCamera();
/* 801968B8 */ void setMasterCamCtrPos(cXyz*);
void setCamAction(ShopCamFunc func) {
field_0x0 = func;
}
void setCameraSpeed(f32 param_0, f32 param_1, f32 param_2, f32 param_3) {
field_0xc0 = param_0;
field_0xc4 = param_1;
field_0xc8 = param_2;
field_0xcc = param_3;
}
void SetSelectIdx(int param_0) {
field_0xd4 = param_0;
setCameraSpeed(0.25f, 20.0f, 0.25f, 5.0f);
}
/* 0x00 */ ShopCamFunc field_0x0;
/* 0x0c */ u8 field_0xc[0x18 - 0xc];
/* 0x18 */ fopAc_ac_c* field_0x18;
/* 0x1c */ fopAc_ac_c* field_0x1c;
/* 0x20 */ fopAc_ac_c* field_0x20;
/* 0x24 */ fopAc_ac_c* field_0x24;
/* 0x28 */ fopAc_ac_c* field_0x28;
/* 0x2c */ fopAc_ac_c* field_0x2c;
/* 0x30 */ fopAc_ac_c* field_0x30;
/* 0x34 */ fopAc_ac_c* field_0x34;
/* 0x38 */ cXyz field_0x38;
/* 0x44 */ cXyz field_0x44;
/* 0x50 */ f32 field_0x50;
/* 0x54 */ cXyz field_0x54;
/* 0x60 */ cXyz field_0x60;
/* 0x6c */ f32 field_0x6c;
/* 0x70 */ cXyz field_0x70;
/* 0x7C */ cXyz field_0x7c;
/* 0x88 */ cXyz field_0x88;
/* 0x94 */ f32 field_0x94;
/* 0x98 */ cXyz field_0x98;
/* 0xA4 */ cXyz field_0xa4;
/* 0xB0 */ cXyz field_0xb0;
/* 0xBC */ f32 field_0xbc;
/* 0x94 */ f32 field_0xc0;
/* 0x94 */ f32 field_0xc4;
/* 0x94 */ f32 field_0xc8;
/* 0x94 */ f32 field_0xcc;
/* 0x94 */ f32 field_0xd0;
/* 0xD4 */ s16 field_0xd4;
/* 0xD6 */ s16 field_0xd6;
/* 0xD8 */ s16 field_0xd8;
/* 0xD8 */ bool field_0xda;
};
#endif /* D_SHOP_D_SHOP_CAMERA_H */
+4
View File
@@ -68,6 +68,10 @@ inline cXyz* fopCamM_GetEye_p(camera_class* i_camera) {
return &i_camera->mLookat.mEye;
}
inline cXyz* fopCamM_GetCenter_p(camera_class* i_camera) {
return &i_camera->mLookat.mCenter;
}
u32 fopCamM_Create(int i_cameraIdx, s16 pProcName, void* param_3);
void fopCamM_Management(void);
u32 fopCamM_GetParam(camera_class* pCamera);