d_kankyo_wether / d_eye_hl (#178)

* d_eye_hl / d_kankyo_wether wip

* more d_kankyo_wether + format

* remove asm

* some d_kankyo wip

* fix dccs vtable

* some m_Do_graphic / d_meter2_draw work

3 files changed, 88 insertions, 61 deletions

diff --git a/include/d/meter/d_meter2_draw.h b/include/d/meter/d_meter2_draw.h
index 4e91482574..81b4378c97 100644
--- a/include/d/meter/d_meter2_draw.h
+++ b/include/d/meter/d_meter2_draw.h
@@ -90,7 +90,7 @@ public:
     /* 80219788 */ void setButtonIconBAlpha(u8, u32, bool);
     /* 80219A84 */ void setButtonIconMidonaAlpha(u32);
     /* 80219E98 */ void setButtonIconAlpha(int, u8, u32, bool);
-    /* 8021A29C */ void getNumberTexture(int);
+    /* 8021A29C */ ResTIMG* getNumberTexture(int);
     /* 8021A2F4 */ void getActionString(u8, u8, u8*);
     /* 8021A468 */ void changeTextureItemB(u8);
     /* 8021A71C */ void changeTextureItemXY(int, u8);
@@ -99,18 +99,18 @@ public:
     /* 8021AB84 */ void setItemNum(u8, u8, u8);
     /* 8021AEC8 */ void drawItemNum(u8, f32);
     /* 8021AF78 */ void drawKanteraMeter(u8, f32);
-    /* 8021B0C8 */ void isButtonVisible();
+    /* 8021B0C8 */ u8 isButtonVisible();
     /* 8021B104 */ void setItemParamX(u8);
     /* 8021B364 */ void setItemParamY(u8);
     /* 8021B5B0 */ void setItemParamZ(u8);
     /* 8021B810 */ void setItemParamB(u8);
-    /* 8021BB6C */ void getFishingType();
-    /* 8021BBB4 */ void getCanoeFishing();
+    /* 8021BB6C */ bool getFishingType();
+    /* 8021BBB4 */ bool getCanoeFishing();
     /* 8021BC24 */ void getCameraSubject();
     /* 8021BC54 */ void getItemSubject();
-    /* 8021BCAC */ void getPlayerSubject();
+    /* 8021BCAC */ bool getPlayerSubject();
     /* 8021BCC0 */ void isBButtonShow(bool);
-    /* 8021BDD0 */ void getButtonTimer();
+    /* 8021BDD0 */ s16 getButtonTimer();
 
     /* 802102F8 */ virtual ~dMeter2Draw_c();
 
@@ -150,11 +150,11 @@ private:
     /* 0x07C */ J2DScreen* mpKanteraScreen;
     /* 0x080 */ J2DScreen* mpPikariScreen;
     /* 0x084 */ J2DScreen* mpItemNumTex[2][3];
-    /* 0x09C */ int field_0x9c[3];
+    /* 0x09C */ CPaneMgr* field_0x9c[3];
     /* 0x0A8 */ int field_0xa8;
     /* 0x0AC */ dKantera_icon_c* mpKanteraMeter[2];
     /* 0x0B4 */ u8 field_0xb4[8];
-    /* 0x0BC */ void* mpParent;
+    /* 0x0BC */ CPaneMgr* mpParent;
     /* 0x0C0 */ CPaneMgr* mpAText[5];
     /* 0x0D4 */ CPaneMgr* mpBText[5];
     /* 0x0E8 */ CPaneMgr* mpXYText[5][3];
@@ -189,8 +189,7 @@ private:
     /* 0x334 */ CPaneMgr* mpItemR;
     /* 0x338 */ CPaneMgr* mpBTextA;
     /* 0x33C */ CPaneMgr* mpBTextB;
-    /* 0x340 */ CPaneMgr* mpBTextXY[2];
-    /* 0x348 */ int field_0x348;
+    /* 0x340 */ CPaneMgr* mpBTextXY[3];
     /* 0x34C */ CPaneMgr* mpTextA;
     /* 0x350 */ CPaneMgr* mpTextB;
     /* 0x354 */ CPaneMgr* mpTextXY[3];
@@ -211,11 +210,11 @@ private:
     /* 0x514 */ J2DPicture* mpItemBPane;
     /* 0x518 */ J2DPicture* mpItemXYPane[3];
     /* 0x524 */ int field_0x524[2][2];
-    /* 0x534 */ u8 field_0x534[8];
-    /* 0x53C */ J2DAnmColorKey* field_0x53c;
-    /* 0x540 */ J2DAnmColorKey* field_0x540;
-    /* 0x544 */ J2DAnmColorKey* field_0x544;
-    /* 0x548 */ u8 field_0x548[8];
+    /* 0x534 */ J2DAnmTransformKey* mPikariBck;
+    /* 0x538 */ J2DAnmColorKey* mPikariBpk;
+    /* 0x53C */ J2DAnmColorKey* field_0x53c[3];
+    /* 0x548 */ JUtility::TColor field_0x548;
+    /* 0x54C */ JUtility::TColor field_0x54c;
     /* 0x550 */ f32 field_0x550;
     /* 0x554 */ f32 field_0x554;
     /* 0x558 */ f32 field_0x558;
@@ -289,12 +288,12 @@ private:
     /* 0x730 */ f32 field_0x730;
     /* 0x734 */ f32 field_0x734;
     /* 0x738 */ f32 field_0x738;
-    /* 0x73C */ u8 field_0x73c[4];
+    /* 0x73C */ f32 field_0x73c;
     /* 0x740 */ u16 field_0x740;
     /* 0x742 */ u16 field_0x742[3];
-    /* 0x748 */ u8 field_0x748[0xE];
+    /* 0x748 */ u8 field_0x748[0xC];
     /* 0x756 */ u16 field_0x754;
-    /* 0x756 */ u16 field_0x756;
+    /* 0x756 */ s16 field_0x756;
     /* 0x758 */ u8 field_0x758;
     /* 0x759 */ u8 field_0x759;
     /* 0x75A */ u8 field_0x75a;
@@ -318,55 +317,55 @@ private:
     /* 0x771 */ u8 field_0x771;
     /* 0x772 */ u8 field_0x772;
     /* 0x773 */ u8 field_0x773[2];
-    /* 0x778 */ f32 field_0x778;
-    /* 0x77C */ f32 field_0x77c;
-    /* 0x780 */ f32 field_0x780;
-    /* 0x784 */ f32 field_0x784;
-    /* 0x788 */ f32 field_0x788;
+    /* 0x778 */ f32 mHUDScale;
+    /* 0x77C */ f32 mHUDAlpha;
+    /* 0x780 */ f32 mButtonsPosX;
+    /* 0x784 */ f32 mButtonsPosY;
+    /* 0x788 */ f32 mButtonsScale;
     /* 0x78C */ f32 field_0x78c;
     /* 0x790 */ f32 field_0x790;
-    /* 0x794 */ f32 field_0x794;
-    /* 0x798 */ f32 field_0x798;
-    /* 0x79C */ f32 field_0x79c;
-    /* 0x7A0 */ f32 field_0x7a0;
+    /* 0x794 */ f32 mLifeGaugeHeartAlpha;
+    /* 0x798 */ f32 mLifeGaugeBaseAlpha;
+    /* 0x79C */ f32 mHeartAlpha;
+    /* 0x7A0 */ f32 mLargeHeartAlpha;
     /* 0x7A4 */ f32 field_0x7a4;
-    /* 0x7A8 */ f32 field_0x7a8;
-    /* 0x7AC */ f32 field_0x7ac;
+    /* 0x7A8 */ f32 mMagicMeterAlpha;
+    /* 0x7AC */ f32 mMagicMeterFrameAlpha;
     /* 0x7B0 */ f32 field_0x7b0;
-    /* 0x7B4 */ f32 field_0x7b4;
-    /* 0x7B8 */ f32 field_0x7b8;
+    /* 0x7B4 */ f32 mLanternMeterAlpha;
+    /* 0x7B8 */ f32 mLanternMeterFrameAlpha;
     /* 0x7BC */ f32 field_0x7bc;
-    /* 0x7C0 */ f32 field_0x7c0;
-    /* 0x7C4 */ f32 field_0x7c4;
+    /* 0x7C0 */ f32 mOxygenMeterAlpha;
+    /* 0x7C4 */ f32 mOxygenMeterFrameAlpha;
     /* 0x7C8 */ f32 field_0x7c8;
     /* 0x7CC */ f32 field_0x7cc;
     /* 0x7D0 */ f32 field_0x7d0;
-    /* 0x7D4 */ f32 field_0x7d4;
-    /* 0x7D8 */ f32 field_0x7d8;
-    /* 0x7DC */ f32 field_0x7dc;
+    /* 0x7D4 */ f32 mRupeeAlpha;
+    /* 0x7D8 */ f32 mRupeeFrameAlpha;
+    /* 0x7DC */ f32 mRupeeCountAlpha;
     /* 0x7E0 */ f32 field_0x7e0;
     /* 0x7E4 */ f32 field_0x7e4;
-    /* 0x7E8 */ f32 field_0x7e8;
-    /* 0x7EC */ f32 field_0x7ec;
+    /* 0x7E8 */ f32 mKeyAlpha;
+    /* 0x7EC */ f32 mKeyNumAlpha;
     /* 0x7F0 */ f32 field_0x7f0;
-    /* 0x7F4 */ f32 field_0x7f4;
-    /* 0x7F8 */ f32 field_0x7f8;
-    /* 0x7FC */ f32 field_0x7fc;
-    /* 0x800 */ f32 field_0x800;
-    /* 0x804 */ f32 field_0x804;
-    /* 0x808 */ f32 field_0x808;
+    /* 0x7F4 */ f32 mMainHUDButtonsAlpha;
+    /* 0x7F8 */ f32 mButtonDisplayBackAlpha;
+    /* 0x7FC */ f32 mAButtonAlpha;
+    /* 0x800 */ f32 mBButtonAlpha;
+    /* 0x804 */ f32 mXButtonAlpha;
+    /* 0x808 */ f32 mYButtonAlpha;
     /* 0x80C */ f32 field_0x80c;
     /* 0x810 */ f32 field_0x810;
-    /* 0x814 */ f32 field_0x814[2];
-    /* 0x81C */ f32 field_0x81c[2];
-    /* 0x824 */ f32 field_0x824[2];
+    /* 0x814 */ f32 mBItemBaseAlpha[2];
+    /* 0x81C */ f32 mXButtonItemBaseAlpha[2];
+    /* 0x824 */ f32 mYButtonItemBaseAlpha[2];
     /* 0x82C */ f32 field_0x82c[2];
-    /* 0x834 */ f32 field_0x834;
-    /* 0x838 */ f32 field_0x838;
-    /* 0x83C */ f32 field_0x83c;
-    /* 0x840 */ f32 field_0x840;
-    /* 0x844 */ f32 field_0x844;
-    /* 0x848 */ f32 field_0x848;
+    /* 0x834 */ f32 mZButtonItemBaseAlpha;
+    /* 0x838 */ f32 mButtonBaseAlpha;
+    /* 0x83C */ f32 mAButtonFontSpacing;
+    /* 0x840 */ f32 mDPadButtonAlpha;
+    /* 0x844 */ f32 mDPadButtonITEMAlpha;
+    /* 0x848 */ f32 mDPadButtonMAPAlpha;
     /* 0x84C */ u8 field_0x84c;
     /* 0x84D */ u8 field_0x84d;
     /* 0x84E */ u8 field_0x84e;
diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h
index 713613c157..bffd6ba5ec 100644
--- a/include/d/meter/d_meter2_info.h
+++ b/include/d/meter/d_meter2_info.h
@@ -139,6 +139,12 @@ public:
     bool isMenuInForce(int flag) { return unk152 & (1 << flag); }
     u16 getMapKeyDirection() { return mMapKeyDirection; }
     u8 getWindowStatus() { return mWindowStatus; }
+    void setMsgResource(void* res) { mMsgResource = res; }
+    void setStageMsgResource(void* res) { mStageMsgResource = res; }
+    void setMsgUnitResource(void* res) { mMsgUnitResource = res; }
+    void* getMsgResource() { return mMsgResource; }
+    void* getStageMsgResource() { return mStageMsgResource; }
+    void* getMsgUnitResource() { return mMsgUnitResource; }
 
 public:
     /* 0x04 */ u8 unk4[4];
@@ -369,4 +375,30 @@ inline u8 dMeter2Info_getWindowStatus() {
     return g_meter2_info.getWindowStatus();
 }
 
+inline void dMeter2Info_setMsgResource(void* res) {
+    g_meter2_info.setMsgResource(res);
+}
+
+inline void dMeter2Info_setStageMsgResource(void* res) {
+    g_meter2_info.setStageMsgResource(res);
+}
+
+inline void dMeter2Info_setMsgUnitResource(void* res) {
+    g_meter2_info.setMsgUnitResource(res);
+}
+
+inline void* dMeter2Info_getMsgResource() {
+    return g_meter2_info.getMsgResource();
+}
+
+inline void* dMeter2Info_getStageMsgResource() {
+    return g_meter2_info.getStageMsgResource();
+}
+
+inline void* dMeter2Info_getMsgUnitResource() {
+    return g_meter2_info.getMsgUnitResource();
+}
+
+char* dMeter2Info_getNumberTextureName(int pIndex);
+
 #endif /* D_METER_D_METER2_INFO_H */
diff --git a/include/d/meter/d_meter_HIO.h b/include/d/meter/d_meter_HIO.h
index 8e59384438..4155d985c3 100644
--- a/include/d/meter/d_meter_HIO.h
+++ b/include/d/meter/d_meter_HIO.h
@@ -737,32 +737,28 @@ public:
     /* 0x220 */ f32 mBItemBaseScale[2];
     /* 0x228 */ f32 mBItemBasePosX[2];
     /* 0x230 */ f32 mBItemBasePosY[2];
-    /* 0x238 */ f32 mBItemBaseAlpha;
-    /* 0x23C */ f32 field_0x23c;
+    /* 0x238 */ f32 mBItemBaseAlpha[2];
     /* 0x240 */ f32 mXButtonItemBaseScale;
     /* 0x244 */ f32 mXButtonItemBaseNoItemScale;
     /* 0x248 */ f32 mXButtonItemBasePosX;
     /* 0x24C */ f32 mXButtonItemBaseNoItemPosX;
     /* 0x250 */ f32 mXButtonItemBasePosY;
     /* 0x254 */ f32 mXButtonItemBaseNoItemPosY;
-    /* 0x258 */ f32 mXButtonItemBaseAlpha;
-    /* 0x25C */ f32 mXButtonItemBaseNoItemAlpha;
+    /* 0x258 */ f32 mXButtonItemBaseAlpha[2];
     /* 0x260 */ f32 mYButtonItemBaseScale;
     /* 0x264 */ f32 mYButtonItemBaseNoItemScale;
     /* 0x268 */ f32 mYButtonItemBasePosX;
     /* 0x26C */ f32 mYButtonItemBaseNoItemPosX;
     /* 0x270 */ f32 mYButtonItemBasePosY;
     /* 0x274 */ f32 mYButtonItemBaseNoItemPosY;
-    /* 0x278 */ f32 mYButtonItemBaseAlpha;
-    /* 0x27C */ f32 mYButtonItemBaseNoItemAlpha;
+    /* 0x278 */ f32 mYButtonItemBaseAlpha[2];
     /* 0x280 */ f32 field_0x280;
     /* 0x284 */ f32 field_0x284;
     /* 0x288 */ f32 field_0x288;
     /* 0x28C */ f32 field_0x28c;
     /* 0x290 */ f32 field_0x290;
     /* 0x294 */ f32 field_0x294;
-    /* 0x298 */ f32 field_0x298;
-    /* 0x29C */ f32 field_0x29c;
+    /* 0x298 */ f32 field_0x298[2];
     /* 0x2A0 */ f32 mZButtonItemBaseScale;
     /* 0x2A4 */ f32 mZButtonItemBasePosX;
     /* 0x2A8 */ f32 mZButtonItemBasePosY;