mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-12 03:47:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_camera_map OK

Browse Source
This commit is contained in:
robojumper
2026-01-07 21:48:44 +01:00
parent ac48f9877b
commit fe54824a8b
9 changed files with 213 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_camera.h
-4
View File
@@ -197,10 +197,6 @@ private:
/* 0x728 */ dCameraGame_c mGameCam2;
/* 0xB9C */ dCameraEvent_c mEventCam;
/* 0xCD0 */ dCameraMap_c mMapCam;
/* 0xD8C */ u8 _0xD8C[0xD94 - 0xD8C];
/* 0xD94 */ f32 field_0xD94;
/* 0xD98 */ dCameraBase_c *mpCameras[CAM_MAX];
/* 0xDA8 */ s32 mActiveCameraIdx;
/* 0xDAC */ screen_shaker mScreenShaker;
include/d/lyt/d_lyt_map.h
+11 -2
View File
@@ -587,6 +587,7 @@ public:
void queueMapEvent(s32 mapEvent, s32 surfaceProvince, s32 c);
void startMapEvent(s32 mapEvent, s32 surfaceProvince, s32 c);
bool isVisibleNoIntro() const;
void fn_8013B350();
const dMapSaveObjDefinition *getSaveObjDefinition(s32 province, s32 statueIdx) const;
@@ -836,7 +837,7 @@ private:
/* 0x8C84 */ u8 field_0x8C84;
/* 0x8C88 */ f32 field_0x8C88;
/* 0x8C8C */ f32 field_0x8C8C;
/* 0x8C8C */ f32 mOutDuration;
/* 0x8C90 */ bool mMapUpDirection;
/* 0x8C91 */ bool mNextMapUpDirection;
/* 0x8C92 */ bool mMapUpDirectionAfterZoomToDetail;
@@ -850,7 +851,7 @@ private:
/* 0x8CA8 */ s32 mNextMapMode;
/* 0x8CAC */ u8 field_0x8CAC;
/* 0x8CAD */ bool mDoCameraTransition;
/* 0x8CAD */ bool mCameraTransitionPossible;
/* 0x8CAE */ bool field_0x8CAE;
/* 0x8CB0 */ u32 mEventTimer;
@@ -958,6 +959,14 @@ public:
return mMapMain.isVisibleNoIntro();
}
void doFn_8013B350() {
mMapMain.fn_8013B350();
}
f32 getOutDuration() const {
return mMapMain.mOutDuration;
}
bool build();
bool remove();
bool execute();
include/toBeSorted/d_camera_map.h
+17 -14
View File
@@ -1,13 +1,15 @@
#ifndef TO_BE_SORTED_D_CAMERA_MAP_H
#define TO_BE_SORTED_D_CAMERA_MAP_H
#include "common.h"
#include "m/m_vec.h"
#include "toBeSorted/d_camera_base.h"
class dAcObjBase_c;
class dCameraMap_c : public dCameraBase_c {
public:
dCameraMap_c() {}
dCameraMap_c() : field_0xC4(0.0f) {}
/* vt 0x08 */ virtual void onBecomeActive() override;
/* vt 0x0C */ virtual void onBecomeInactive() override;
/* vt 0x10 */ virtual bool create() override;
@@ -17,29 +19,30 @@ public:
/* vt 0x20 */ virtual ~dCameraMap_c() {}
/* vt 0x30 */ virtual void setView(const CamView &view) override;
// Not sure what this is...
/* vt 0x34 */ virtual bool vt_0x34() {
return true;
}
/* vt 0x34 */ virtual bool vt_0x34();
void fn_80093340();
void fn_80093360();
void fn_80093380();
bool fn_800932E0() const;
void fn_800932F0();
void setNoCameraTransition();
void setCameraTransition();
bool isActiveOrAnimating() const;
void startOut();
private:
/* 0x2C */ u8 _0x2C[0x40 - 0x2C];
/* 0x2C */ mVec3_c field_0x2C;
/* 0x38 */ f32 field_0x38;
/* 0x3C */ f32 field_0x3C;
/* 0x40 */ f32 field_0x40;
/* 0x44 */ dAcObjBase_c *field_0x44;
/* 0x48 */ CamView mView1;
/* 0x68 */ CamView mSourceView;
/* 0x88 */ CamView mTargetView;
/* 0xA8 */ u8 _0xA8[0xAC - 0xA8];
/* 0xAC */ u8 field_0xAC;
/* 0xAD */ u8 _0xAD[0xB4 - 0xAD];
/* 0xB4 */ u8 field_0xB4;
/* 0xB5 */ u8 _0xB5[0xB8 - 0xB5];
/* 0xB8 */ UNKWORD field_0xB8;
/* 0xAC */ bool mIsMovingOut;
/* 0xB0 */ UNKWORD field_0xB0;
/* 0xB4 */ bool mIsActiveOrAnimating;
/* 0xB8 */ s32 mTimer;
/* 0xBC */ u8 _0xBC[0xC4 - 0xBC];
/* 0xC4 */ f32 field_0xC4;
};
#endif