mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-06 02:38:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_menu_dmap almost matching for demo

Browse Source
This commit is contained in:
LagoLunatic
2026-08-26 15:43:30 -04:00
parent 3688caff6e
commit 519652534f
15 changed files with 373 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_com_inf_game.h
+4
View File
@@ -3375,6 +3375,10 @@ inline void dComIfGp_roomControl_setStayNo(int stayNo) {
dStage_roomControl_c::setStayNo(stayNo);
}
inline int dComIfGp_roomControl_getDarkMode() {
return dStage_roomControl_c::getDarkMode();
}
inline dBgW* dComIfGp_roomControl_getBgW(int i_roomNo) {
return g_dComIfG_gameInfo.play.getRoomControl()->getBgW(i_roomNo);
}
include/d/d_map.h
+17 -1
View File
@@ -334,6 +334,22 @@ public:
class dMap_Dmap_c : public dDlst_base_c {
public:
virtual ~dMap_Dmap_c() {}
void changeTlutDblBufNo() {}
void getLoadTlutDblBufNo() {}
void setTlutDblBufNo(int) {}
void setAlpha(u8 alpha) { field_0x2B6 = alpha; }
void setArchive(JKRArchive* i_arc) { mpArc = i_arc; }
void setMapPos(s16 x, s16 y) {
field_0x364 = x;
field_0x366 = y;
}
void setMaskPos(s16 x, s16 y) {
field_0x35C = x;
field_0x35E = y;
}
void setTlut(dmap_dmap_tlut_s*, u8, u8, u8, f32);
void setFloorTextureOne(u8);
void init(s16, s16, s16, s16, s16, s16, s16, s16, s16, u8, u8, u8, u8, u8);
@@ -341,7 +357,7 @@ public:
public:
/* 0x004 */ u8 field_0x4[0x2A0 - 0x4];
/* 0x2A0 */ JKRArchive* field_0x2A0;
/* 0x2A0 */ JKRArchive* mpArc;
/* 0x2A4 */ u8 field_0x2A4[0x2B6 - 0x2A4];
/* 0x2B6 */ u8 field_0x2B6;
/* 0x2B7 */ u8 field_0x2B7[0x35C - 0x2B7];
include/d/d_stage.h
+8 -8
View File
@@ -883,7 +883,7 @@ public:
void zoneCountCheck(int) const;
void checkDrawArea() const;
static dStage_darkStatus_c* getDarkStatus();
static s32 getDarkMode();
static int getDarkMode();
dKy_tevstr_c* getTevStr(int i_roomNo) { return &mStatus[i_roomNo].mTevStr; }
BOOL checkStatusFlag(int i_roomNo, u8 flag) const { return cLib_checkBit(mStatus[i_roomNo].mFlags, flag); }
@@ -896,7 +896,7 @@ public:
static void SetTimePass(int);
static JKRExpHeap* getMemoryBlock(int);
static void setStayNo(int);
static s32 GetTimePass();
static int GetTimePass();
static void setZoneNo(int i_roomNo, int i_zoneNo) { mStatus[i_roomNo].mZoneNo = i_zoneNo; }
static int getZoneNo(int i_roomNo) { return mStatus[i_roomNo].mZoneNo; }
static void setZoneCount(int i_roomNo, int count) { mStatus[i_roomNo].mZoneCount = count; }
@@ -929,7 +929,7 @@ public:
static fpc_ProcID mProcID;
static s8 mStayNo;
static s8 mOldStayNo;
static s8 m_time_pass;
static u8 m_time_pass;
static char mDemoArcName[8];
private:
@@ -1020,11 +1020,11 @@ inline u8 dStage_stagInfo_DefaultCameraType(stage_stag_info_class* p_info) {
return p_info->mCameraMapToolID;
}
inline s32 dStage_stagInfo_ChkKeyDisp(stage_stag_info_class* i_stagInfo) {
inline u32 dStage_stagInfo_ChkKeyDisp(stage_stag_info_class* i_stagInfo) {
return i_stagInfo->mProp & 1;
}
inline s32 dStage_stagInfo_GetSaveTbl(stage_stag_info_class* i_stagInfo) {
inline int dStage_stagInfo_GetSaveTbl(stage_stag_info_class* i_stagInfo) {
return (i_stagInfo->mProp >> 1) & 0x7F;
}
@@ -1071,15 +1071,15 @@ inline u32 dStage_roomRead_dt_c_GetReverb(roomRead_data_class& room) {
return room.field_0x1 & 0x7F;
}
inline s32 dStage_roomRead_dt_c_GetTimePass(roomRead_data_class& data) {
inline u32 dStage_roomRead_dt_c_GetTimePass(roomRead_data_class& data) {
return data.field_0x2 & 0x03;
}
inline s32 dStage_sclsInfo_getWipe(stage_scls_info_class* p_info) {
inline u32 dStage_sclsInfo_getWipe(stage_scls_info_class* p_info) {
return p_info->mWipe & 0xF;
}
inline s32 dStage_FileList_dt_CheckDarkOn(dStage_FileList_dt_c* i_fili) {
inline u32 dStage_FileList_dt_CheckDarkOn(dStage_FileList_dt_c* i_fili) {
return i_fili->mParam & 0x00000001;
}