d_event work, build fix

This commit is contained in:
Jasper St. Pierre
2024-01-06 12:09:33 -08:00
parent 63f6eb00c4
commit 2dbee60cf5
8 changed files with 180 additions and 68 deletions
+4
View File
@@ -2400,6 +2400,10 @@ inline dEvent_manager_c* dComIfGp_getPEvtManager() {
return &g_dComIfG_gameInfo.play.getEvtManager();
}
inline u8 dComIfGp_event_getMode() {
return g_dComIfG_gameInfo.play.getEvent().getMode();
}
// Note: Some of the below functions call g_dComIfG_gameInfo.play.getEvtManager(), while others use
// dComIfGp_getPEvtManager(), without a clear pattern for which was chosen.
+1
View File
@@ -101,6 +101,7 @@ public:
void reset() { onEventFlag(8); }
bool runCheck() { return mMode != 0; }
u8 getMode() { return mMode; }
/* 0x00 */ dEvt_order_c mOrder[8];
/* 0xC0 */ s8 mOrderCount;
+46 -2
View File
@@ -30,6 +30,12 @@ public:
/* 0x2C */ s32 mSubstanceSize;
/* 0x30 */ s32 mNextIdx;
/* 0x34 */ u32 field_0x34[3];
char* getName() { return mName; }
s32 getNext() { return mNextIdx; }
s32 getNumber() { return mSubstanceSize; }
s32 getIndex() { return mSubstanceIdx; }
s32 getType() { return mSubstanceType; }
}; // Size: 0x40
class dEvDtCut_c {
@@ -38,12 +44,15 @@ public:
s32 getNext() { return mNextCutIdx; }
u32 getFlagId() { return mFlagIdx; }
u32 getTagId() { return mTagId; }
u32 getStartFlag(int idx) { return mStartFlag[idx]; }
u32 getDataTop() { return mFirstDataIdx; }
char* getName() { return mName; }
public:
/* 0x00 */ char mName[32];
/* 0x20 */ u32 mTagId;
/* 0x24 */ u32 mIndex;
/* 0x28 */ u32 mFlagCheck[3];
/* 0x28 */ u32 mStartFlag[3];
/* 0x34 */ u32 mFlagIdx;
/* 0x38 */ u32 mFirstDataIdx;
/* 0x3C */ u32 mNextCutIdx;
@@ -165,7 +174,42 @@ public:
void advanceCut(dEvDtEvent_c*);
bool advanceCutLocal(dEvDtStaff_c*);
dEvDtCut_c * getCutP(int idx) { return &mCutP[idx]; }
event_binary_data_header* getHeaderP() { return mHeaderP; }
dEvDtStaff_c* getStaffP(int i) { return &mStaffP[i]; }
dEvDtEvent_c* getEventP(int i) { return &mEventP[i]; }
dEvDtData_c* getDataP(int i) { return &mDataP[i]; }
dEvDtCut_c* getCutP(int i) { return &mCutP[i]; }
char* getEventName(int i) { return mEventP[i].getName(); }
int getStaffCurrentCut(int i) { return mStaffP[i].getCurrentCut(); }
dEvDtCut_c* getCutStaffCurrentCutP(int i) { return getCutP(getStaffCurrentCut(i)); }
int getStaffStartCut(int i) { return mStaffP[i].getStartCut(); }
dEvDtCut_c* getCutStaffStartCutP(int i) { return getCutP(getStaffStartCut(i)); }
int* getIDataP(int i) { return &mIDataP[i]; }
f32* getFDataP(int i) { return &mFDataP[i]; }
char* getSDataP(int i) { return &mSDataP[i]; }
u32 getEventTop() { return mHeaderP->eventTop; }
s32 getEventNum() { return mHeaderP->eventNum; }
u32 getStaffTop() { return mHeaderP->staffTop; }
s32 getStaffNum() { return mHeaderP->staffNum; }
u32 getCutTop() { return mHeaderP->cutTop; }
s32 getCutNum() { return mHeaderP->cutNum; }
u32 getDataTop() { return mHeaderP->dataTop; }
s32 getDataNum() { return mHeaderP->dataNum; }
u32 getFDataTop() { return mHeaderP->fDataTop; }
s32 getFDataNum() { return mHeaderP->fDataNum; }
u32 getIDataTop() { return mHeaderP->iDataTop; }
s32 getIDataNum() { return mHeaderP->iDataNum; }
u32 getSDataTop() { return mHeaderP->sDataTop; }
s32 getSDataNum() { return mHeaderP->sDataNum; }
void setHeaderP(event_binary_data_header* p_header) { mHeaderP = p_header; }
void setEventP(dEvDtEvent_c* p_event) { mEventP = p_event; }
void setStaffP(dEvDtStaff_c* p_staff) { mStaffP = p_staff; }
void setCutP(dEvDtCut_c* p_cut) { mCutP = p_cut; }
void setDataP(dEvDtData_c* p_data) { mDataP = p_data; }
void setFDataP(f32* p_fdata) { mFDataP = p_fdata; }
void setIDataP(int* p_idata) { mIDataP = p_idata; }
void setSDataP(char* p_sdata) { mSDataP = p_sdata; }
public:
/* 0x00 */ event_binary_data_header* mHeaderP;