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

move / fix bunch of stuff (#133)

Browse Source 
* fix some class structures / d_event wip

* d_event wip

* move gamepad stuff

* move m_Do_main

* move d_bomb / partial m_Do_reset

* format

* remove asm

* add Z2SoundID enum

* move some Z2 classes

* fix

* move more Z2 stuff

* fix fopAc_ac_c more
This commit is contained in:
TakaRikka
2021-06-12 18:22:36 -04:00
committed by GitHub
parent 5be309a186
commit 4448c08ac0
132 changed files with 6755 additions and 3217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/meter/d_meter2_info.h
+28 -6
View File
@@ -3,6 +3,7 @@
#include "JSystem/JUtility/JUTTexture.h"
#include "d/d_resorce.h"
#include "d/menu/d_menu_window.h"
#include "d/msg/d_msg_flow.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
@@ -14,11 +15,16 @@ struct dSv_event_flag_c {
struct dMsgObject_c {
/* 802384C4 */ void setLetterNameID(u16);
/* 802379AC */ void setKillMessageFlag();
/* 8023822C */ void getStatus();
};
class dMeterMap_c {
public:
/* 8020D900 */ bool isMapOpenCheck();
/* 8020D650 */ void isEnableDispMapAndMapDispSizeTypeNo();
/* 8020D874 */ void setDispPosInsideFlg_SE_On();
/* 8020D8BC */ void setDispPosOutsideFlg_SE_On();
};
struct J2DPicture {};
@@ -41,9 +47,12 @@ struct dItem_data {
struct CPaneMgr {};
class dMeter2_c {};
class dMw_c;
class dMw_c {};
class dMeter2_c {
public:
/* 8021F6EC */ void emphasisButtonDelete();
};
class dMeter2Info_c {
public:
@@ -98,8 +107,13 @@ public:
void setMiniGameCount(s8);
void setSaveStageName(const char*);
void setWindowStatus(u8 status) {
unk186 = mWindowStatus;
mWindowStatus = status;
}
u8& getDirectUseItem() { return mDirectUseItem; }
dMeterMap_c* getMeterMapClass() { return mMeterMap; }
dMw_c* getMenuWindowClass() { return mMenuWindowClass; }
void offUseButton(int pButton) { mUseButton &= ~(u16)pButton; }
private:
@@ -187,12 +201,20 @@ private:
extern dMeter2Info_c g_meter2_info;
inline dMeterMap_c* dMeter2Info_getMeterMapClass() {
return g_meter2_info.getMeterMapClass();
}
inline void dMeter2Info_Initialize() {
g_meter2_info.init();
}
inline dMeterMap_c* dMeter2Info_getMeterMapClass() {
return g_meter2_info.getMeterMapClass();
}
inline dMw_c* dMeter2Info_getMenuWindowClass() {
return g_meter2_info.getMenuWindowClass();
}
inline void dMeter2Info_setWindowStatus(u8 status) {
g_meter2_info.setWindowStatus(status);
}
#endif /* D_METER_D_METER2_INFO_H */