diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2021-05-23 03:09:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-23 12:09:59 +0200 |
| commit | e915df66c806bdff65aa243649f7abfe6cc19227 (patch) | |
| tree | 226e708c0546c45f65420446382ba597ad773651 /include/d/meter | |
| parent | 462d71cbef02ef119fc2aa480b98cfeedde46441 (diff) | |
move d_a_alink and some related stuff (#130)
* clean up d_a_player
* move some of daalink
* more daalink / daplayer
* setup some daalink members
* rest of daalink members setup
* remove comment
* few more matches
* remove asm
* more matches
* more matches + move e_wb_class
* fix some d_save classes
Co-authored-by: lepelog <lepelog@users.noreply.github.com>
Diffstat (limited to 'include/d/meter')
| -rw-r--r-- | include/d/meter/d_meter2_info.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index 4fcf725326..a0f124a1b2 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -1,7 +1,9 @@ #ifndef D_METER_D_METER2_INFO_H #define D_METER_D_METER2_INFO_H +#include "JSystem/JUtility/JUTTexture.h" #include "d/d_resorce.h" +#include "d/msg/d_msg_flow.h" #include "dolphin/types.h" #include "f_op/f_op_actor.h" //#include "JSystem/JUtility/JUTFont.h" @@ -14,14 +16,6 @@ struct dMsgObject_c { /* 802384C4 */ void setLetterNameID(u16); }; -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F48 */ ~dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); - /* 8024A538 */ void getMsgNo(); -}; - class dMeterMap_c { public: /* 8020D900 */ bool isMapOpenCheck(); @@ -51,8 +45,6 @@ class dMeter2_c {}; class dMw_c {}; -struct ResTIMG {}; - class dMeter2Info_c { public: class WarpInfo_c { @@ -105,8 +97,10 @@ public: void resetMiniGameItem(bool); void setMiniGameCount(s8); void setSaveStageName(const char*); + u8& getDirectUseItem() { return mDirectUseItem; } dMeterMap_c* getMeterMapClass() { return mMeterMap; } + void offUseButton(int pButton) { mUseButton &= ~(u16)pButton; } private: /* 0x04 */ u8 unk4[4]; |