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

d_ky_thunder done / d_scope wip / m_Do_graphic wip (#308)

Browse Source 
* d_ky_thunder OK + misc build fixes

* d_scope mostly done

* some m_Do_graphic wip

* remove asm
This commit is contained in:
TakaRikka
2023-03-14 15:27:46 -07:00
committed by GitHub
parent 500d079c40
commit a01d65b0b9
45 changed files with 1493 additions and 1995 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/meter/d_meter2.h
+19 -11
View File
@@ -12,12 +12,20 @@ class dMeterMap_c;
class dMeterSub_c : public dDlst_base_c {
public:
// these seem to be inlined, but generates in the wrong order in d_scope.cpp
/* 8019412C */ //virtual void draw() {}
/* 801940D4 */ //virtual ~dMeterSub_c() {}
/* 8019411C */ //virtual int _create() { return 0; }
/* 80194130 */ //virtual int _execute(u32) { return 0; }
/* 80194124 */ //virtual int _delete() { return 0; }
/* 80194138 */ //virtual int isDead() { return 0; }
/* 8019412C */ virtual void draw();
/* 801940D4 */ virtual ~dMeterSub_c();
/* 8019411C */ virtual bool _create();
/* 80194130 */ virtual bool _execute(u32);
/* 80194124 */ virtual bool _delete();
/* 80194138 */ virtual bool isDead();
/* 801940D4 */ virtual ~dMeterSub_c() {}
/* 8019411C */ virtual int _create();
/* 80194130 */ virtual int _execute(u32);
/* 80194124 */ virtual int _delete();
/* 80194138 */ virtual int isDead();
};
class dMeterButton_c : public dDlst_base_c {
@@ -130,9 +138,9 @@ public:
/* 8020F1B0 */ virtual void draw();
/* 8020EDF4 */ virtual ~dMeterString_c();
/* 8020EE70 */ virtual bool _create();
/* 8020F150 */ virtual bool _execute(u32);
/* 8020F49C */ virtual bool _delete();
/* 8020EE70 */ virtual int _create();
/* 8020F150 */ virtual int _execute(u32);
/* 8020F49C */ virtual int _delete();
};
class dMeterHaihai_c : public dMeterSub_c {
@@ -153,9 +161,9 @@ public:
/* 8020B140 */ virtual void draw();
/* 8020AEF0 */ virtual ~dMeterHaihai_c();
/* 8020AF6C */ virtual bool _create();
/* 8020B0F4 */ virtual bool _execute(u32);
/* 8020BDAC */ virtual bool _delete();
/* 8020AF6C */ virtual int _create();
/* 8020B0F4 */ virtual int _execute(u32);
/* 8020BDAC */ virtual int _delete();
};
class dMeter2_c : public msg_class {
include/d/meter/d_meter2_info.h
+6 -1
View File
@@ -148,6 +148,7 @@ public:
u32 getMsgTimeMs() { return mMsgTimeMs; }
u32 getTimeMs() { return mTimeMs; }
u8 getNowCount() { return mNowCount; }
void setScopeZoomPointer(u8 param_0) { mScopeZoomPointer = param_0; }
public:
/* 0x04 */ u8 unk4[4];
@@ -224,7 +225,7 @@ public:
/* 0xE2 */ u8 mGoldWolfMapType;
/* 0xE3 */ u8 mLightDropGetFlag[3];
/* 0xE6 */ u8 mLifeGaugeSE;
/* 0xE7 */ u8 unk231;
/* 0xE7 */ u8 mScopeZoomPointer;
/* 0xE8 */ u8 mItemExplainWindowStatus;
/* 0xE9 */ char mSaveStageName[8];
/* 0xF1 */ bool mFloatingMessageWakuVisible;
@@ -518,6 +519,10 @@ inline u8 dMeter2Info_getNowCount() {
return g_meter2_info.getNowCount();
}
inline void dMeter2Info_setScopeZoomPointer(u8 param_0) {
g_meter2_info.setScopeZoomPointer(param_0);
}
char* dMeter2Info_getNumberTextureName(int pIndex);
void dMeter2Info_recieveLetter();
u8 dMeter2Info_getNewLetterNum();