encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

some cleanup

Browse Source
This commit is contained in:
lepelog
2022-05-21 21:25:05 +02:00
parent ac5a31ff42
commit 132f0cbfb7
5 changed files with 156 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_stage.h
+3 -2
View File
@@ -237,7 +237,7 @@ struct dStage_DMap_c {
};
struct dStage_MapEvent_dt_c {
u8 _0;
u8 mType;
u8 field_0x1[3 - 1];
u8 field_0x3;
u8 field_0x4[7 - 4];
@@ -248,7 +248,8 @@ struct dStage_MapEvent_dt_c {
char mName[10];
u8 field_0x17;
u8 field_0x18;
u8 field_0x19[0x1C - 0x19];
u8 field_0x19[0x1B - 0x19];
u8 field_0x1B;
}; // SIZE = 0x1C
struct dStage_MapEventInfo_c {
include/d/event/d_event.h
+2 -2
View File
@@ -67,8 +67,8 @@ public:
u32 getPId(void*);
void* convPId(unsigned int);
void getStbDemoData(char*);
static u8* searchMapEventData(u8, s32); // ret type probably wrong, fix later
static u8* searchMapEventData(u8); // ret type probably wrong, fix later
static dStage_MapEvent_dt_c* searchMapEventData(u8, s32);
static dStage_MapEvent_dt_c* searchMapEventData(u8);
s16 runningEventID(s16);
void setPt1(void*);
void setPt2(void*);
include/d/event/d_event_manager.h
+5 -3
View File
@@ -69,23 +69,25 @@ public:
void setStartDemo(int param_0) { mEventException.setStartDemo(param_0); }
void setCameraPlay(int status) { mCameraPlay = status; }
dEvDtBase_c& getBase() { return mEventList[field_0x1b4]; }
dEvDtBase_c& getBase() { return mEventList[mCurrentEventType]; }
void setFlag(int flag) { mFlags.flagSet(flag); }
static int getIndexCompositId(s16 param_0) { return param_0 != -1 ? (u8)param_0 : -1; }
static int getTypeCompositId(s16 param_0) { return param_0 == -1 ? 0 : param_0 >> 8; }
static s16 makeCompositId(s16 a, int b) { return a | (b << 8); }
private:
/* 0x0000 */ dEvDtBase_c mEventList[11];
/* 0x018C */ s32 mCameraPlay;
/* 0x0190 */ dEvent_exception_c mEventException;
/* 0x019C */ cXyz mGoal;
/* 0x01A8 */ u8 field_0x1a8[2];
/* 0x01AA */ s16 field_0x1aa;
/* 0x01AA */ s16 mCurrentEventCompositId;
/* 0x01AC */ u8 field_0x1ac[4];
/* 0x01B0 */ int mRoomNo;
/* 0x01B4 */ u32 field_0x1b4;
/* 0x01B4 */ u32 mCurrentEventType;
/* 0x01B8 */ s32 field_0x1b8;
/* 0x01BC */ dEvDtFlag_c mFlags;
/* 0x06BC */ bool mDataLoaded;