d_a_bg_obj equivalent + misc (#2509)

* d_a_bg_obj equivalent + misc

* More Z2LinkMgr Matches
This commit is contained in:
hatal175
2025-06-30 06:38:04 +03:00
committed by GitHub
parent 0144dddcf4
commit e9672fd355
16 changed files with 399 additions and 268 deletions
+11
View File
@@ -0,0 +1,11 @@
#ifndef Z2AUDIOCS_H
#define Z2AUDIOCS_H
#include "global.h"
class Z2AudioCS {
public:
static int startLevel(s32 param_1, s32 param_2);
};
#endif
+1 -1
View File
@@ -44,7 +44,7 @@ public:
void setInWater(bool status) { mInWater = status; }
bool isInWater() { return mInWater; }
u8 getLinkState() const { return mLinkState; }
u8 getLinkState() { return mLinkState; }
u8 getMoveSpeed() const { return mMoveSpeed; }
bool isRiding() const { return mRiding; }
void setLinkState(u8 i_state) { mLinkState = i_state; }
+1 -1
View File
@@ -33,7 +33,7 @@ public:
bool isSceneExist() { return sceneExist; }
int getCurrentSceneNum() { return sceneNum; }
s8 getCurrentRoomNum() { return roomNum; }
bool isInGame() const { return inGame; }
bool isInGame() { return inGame; }
void setInGame(bool i_inGame) { inGame = i_inGame; }
bool isInDarkness() const { return inDarkness; }
s8 getRoomReverb() { return dComIfGp_getReverb(roomNum); }
+2 -2
View File
@@ -21,12 +21,12 @@ struct Z2StatusMgr : public JASGlobalInstance<Z2StatusMgr> {
void setCameraGroupInfo(u8);
void setCameraInWaterDepth(float);
u8 getDemoStatus() const { return mDemoStatus; }
u8 getDemoStatus() { return mDemoStatus; }
void setHour(s32 hour) { mHour = hour; }
void setMinute(s32 min) { mMinute = min; }
void setWeekday(s32 day) { mWeekday = day; }
f32 getCameraInWaterDepth() { return mUnderwaterDepth; }
f32 getCameraInWaterDepthRatio() const { return mCameraInWaterDepthRatio; }
f32 getCameraInWaterDepthRatio() { return mCameraInWaterDepthRatio; }
u8 getHour() { return mHour; }
bool isPaused() { return mPauseFlag; }
bool isHeartGuageOn() { return mHeartGaugeOn; }
+14 -7
View File
@@ -216,6 +216,13 @@ enum dKy_LIGHT_SIZE {
LIGHT_SIZE_LL,
};
struct dKy_Odour_Data {
/* 0x0 */ u8 mOdourPacketStatus;
/* 0x1 */ u8 field_0xf21;
/* 0x4 */ int field_0xf24;
/* 0x8 */ dKankyo_odour_Packet* mpOdourPacket;
};
class dScnKy_env_light_c {
public:
/* 8019F2E8 */ dScnKy_env_light_c();
@@ -325,10 +332,7 @@ public:
/* 0x0ED4 */ EF_THUNDER mThunderEff;
/* 0x0F18 */ u8 field_0xf18[4];
/* 0x0F1C */ dKankyo_shstar_Packet* mpShstarPacket;
/* 0x0F20 */ u8 mOdourPacketStatus;
/* 0x0F21 */ u8 field_0xf21;
/* 0x0F24 */ int field_0xf24;
/* 0x0F28 */ dKankyo_odour_Packet* mpOdourPacket;
/* 0x0F20 */ dKy_Odour_Data mOdourData;
/* 0x0F2C */ u8 field_0xf2c;
/* 0x0F30 */ J3DModel* undwater_ef_model;
/* 0x0F34 */ f32 field_0xf34;
@@ -503,9 +507,12 @@ inline dScnKy_env_light_c* dKy_getEnvlight() {
class dKankyo_HIO_c {
public:
u8 pad[0xB4];
/* 0xB4 */ u8 field_0xB4;
/* 0xB8 */ f32 field_0xB8;
/* 0x000 */ u8 pad[0xB4];
/* 0x0B4 */ u8 field_0xB4;
/* 0x0B8 */ f32 field_0xB8;
/* 0x0BC */ u8 field_0xBC[0x3F4 - 0xbc];
/* 0x3F4 */ f32 field_0x3f4;
/* 0x3F8 */ f32 field_0x3f8;
};
extern dKankyo_HIO_c g_kankyoHIO;