m_Do cleanup, d_resource, drawlist stuff (#145)

* d_resource / some d_stage

* setup dDlst_list_c / d_select_icon OK

* JUTXfb / some JUTVideo + various

* some J2D classes / JUTVideo/Fader attempts

* bunch of m_Do cleanup + matches / f_ap_game OK

* mDoLib_clipper::setup OK

* most of d_meter_HIO OK

* pane_class / kantera_icon_meter
This commit is contained in:
TakaRikka
2021-09-24 11:11:10 -04:00
committed by GitHub
parent ea42afb6f8
commit 7d271be857
261 changed files with 6757 additions and 10882 deletions
+8 -8
View File
@@ -31,12 +31,12 @@ typedef int (*SkipFunc)(void*, int);
class dEvt_control_c {
public:
dEvt_control_c();
void orderOld(u16, u16, u16, u16, void*, void*, void const*);
void order(u16, u16, u16, u16, void*, void*, s16, u8);
bool orderOld(u16, u16, u16, u16, void*, void*, void const*);
bool order(u16, u16, u16, u16, void*, void*, s16, u8);
void setParam(dEvt_order_c*);
s32 beforeFlagProc(dEvt_order_c*);
void afterFlagProc(dEvt_order_c*);
void commonCheck(dEvt_order_c*, u16, u16);
int commonCheck(dEvt_order_c*, u16, u16);
void talkCheck(dEvt_order_c*);
void talkXyCheck(dEvt_order_c*);
void catchCheck(dEvt_order_c*);
@@ -45,8 +45,8 @@ public:
void demoEnd();
s32 potentialCheck(dEvt_order_c*);
void doorCheck(dEvt_order_c*);
void itemCheck(dEvt_order_c*);
void endProc();
int itemCheck(dEvt_order_c*);
int endProc();
void change();
void entry();
void reset(void*);
@@ -60,15 +60,15 @@ public:
void skipper();
void Step();
void moveApproval(void*);
void compulsory(void*, char const*, u16);
bool compulsory(void*, char const*, u16);
void remove();
void* getStageEventDt(); // ret type probably wrong, fix later
void sceneChange(int);
u32 getPId(void*);
void convPId(unsigned int);
void getStbDemoData(char*);
void searchMapEventData(u8, s32);
void searchMapEventData(u8);
static void searchMapEventData(u8, s32);
static void searchMapEventData(u8);
s16 runningEventID(s16);
void setPt1(void*);
void setPt2(void*);
+2
View File
@@ -69,6 +69,8 @@ public:
void specialStaffProc(dEvDtStaff_c*);
/* 0x00 */ s32 mEventNum;
/* 0x04 */ u8 field_0x4[0xA0];
/* 0xA4 */ int field_0xa4;
};
class dEvDtFlag_c {
+6 -4
View File
@@ -25,8 +25,8 @@ public:
void getSubstance(dEvDtData_c*, int);
dEvent_manager_c();
~dEvent_manager_c() {}
void create();
void setObjectArchive(char*);
int create();
bool setObjectArchive(char*);
void demoInit();
void roomInit(int);
void roomFinish(int);
@@ -37,7 +37,7 @@ public:
void endProc(s16, int);
void Sequencer();
void Experts();
void getEventData(s16);
dEvDtEvent_c* getEventData(s16);
dEvDtEvent_c* getEventData(s16, int);
int getEventIdx(char const*, u8, s32);
void getEventIdx(fopAc_ac_c*, u8);
@@ -67,13 +67,15 @@ public:
void ChkPresentEnd();
void checkStartDemo();
void setStartDemo(int param_0) { mEventException.setStartDemo(param_0); }
private:
/* 0x0000 */ dEvDtBase_c mEventList[11];
/* 0x018C */ s32 mCameraPlay;
/* 0x0190 */ dEvent_exception_c mEventException;
/* 0x019C */ cXyz mGoal;
/* 0x01A8 */ u8 field_0x1a8[2];
/* 0x01AA */ u16 field_0x1aa;
/* 0x01AA */ s16 field_0x1aa;
/* 0x01AC */ u8 field_0x1ac[4];
/* 0x01B0 */ u32 field_0x1b0;
/* 0x01B4 */ u32 field_0x1b4;