d_meter2_draw done (#2028)

* d_meter2_draw done

* some meter_draw doc

* remove asm

* d_file_sel_info fixed

10 files changed, 413 insertions, 413 deletions

diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h
index ec5e5b0353..6fa7a50ffd 100644
--- a/include/d/com/d_com_inf_game.h
+++ b/include/d/com/d_com_inf_game.h
@@ -1810,6 +1810,14 @@ inline void dComIfGs_setEquipBottleItemEmpty(u8 i_curItem) {
     g_dComIfG_gameInfo.info.getPlayer().getItem().setEquipBottleItemEmpty(i_curItem);
 }
 
+inline u8 dComIfGs_getBButtonItemKey() {
+    return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getSelectEquip(4);
+}
+
+inline void dComIfGs_setBButtonItemKey(u8 i_itemNo) {
+    g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectEquip(4, i_itemNo);
+}
+
 void dComIfGp_setSelectItem(int index);
 s32 dComIfGp_offHeapLockFlag(int flag);
 void dComIfGp_createSubExpHeap2D();
diff --git a/include/d/d_camera.h b/include/d/d_camera.h
index bedb8faa0e..9119e1df9b 100644
--- a/include/d/d_camera.h
+++ b/include/d/d_camera.h
@@ -356,6 +356,7 @@ public:
     bool Active() { return field_0x24 == 0; }
     f32 TrimHeight() { return mTrimHeight; }
     int Type() { return mCurType; }
+    int Mode() { return mNextMode; }
 
     bool i_chkFlag(u32 i_flag) { return mEventFlags & i_flag; }
     void i_setFlag(u32 i_flag) { mEventFlags |= i_flag; }
diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h
index f55599eeb0..4aee38d448 100644
--- a/include/d/d_drawlist.h
+++ b/include/d/d_drawlist.h
@@ -55,18 +55,6 @@ private:
     /* 0x34 */ f32 field_0x34;
 };  // Size: 0x38
 
-class dDlst_FileInfo_c : public dDlst_base_c {
-public:
-    dDlst_FileInfo_c() {}
-    virtual void draw();
-    virtual ~dDlst_FileInfo_c();  // inlined
-
-    /* 0x04 */ J2DScreen* Scr;
-    /* 0x08 */ JUTFont* mFont;
-    /* 0x0C */ J2DPane* mBasePane;
-    /* 0x10 */ J2DPane* field_0x10;
-};
-
 class dDlst_2D_c : public dDlst_base_c {
 public:
     /* 80053A00 */ dDlst_2D_c(ResTIMG* image, s16 posX, s16 posY, s16 width, s16 height, u8 alpha);
diff --git a/include/d/file/d_file_sel_info.h b/include/d/file/d_file_sel_info.h
index 0e8bcbd134..cb9460259e 100644
--- a/include/d/file/d_file_sel_info.h
+++ b/include/d/file/d_file_sel_info.h
@@ -3,6 +3,18 @@
 
 #include "d/d_drawlist.h"
 
+class dDlst_FileInfo_c : public dDlst_base_c {
+public:
+    dDlst_FileInfo_c() {}
+    virtual void draw();
+    virtual ~dDlst_FileInfo_c() {}
+
+    /* 0x04 */ J2DScreen* Scr;
+    /* 0x08 */ JUTFont* mFont;
+    /* 0x0C */ J2DPane* mBasePane;
+    /* 0x10 */ J2DPane* field_0x10;
+};
+
 class CPaneMgrAlpha;
 class dSv_save_c;
 
@@ -20,6 +32,10 @@ public:
 
     /* 801924A0 */ virtual ~dFile_info_c();
 
+    // fake? needed to get vtable size correct
+    virtual void dummy() = 0;
+    virtual void dummy2() = 0;
+
     void setBasePane(J2DPane* pane) { mFileInfo.mBasePane = pane; }
     CPaneMgrAlpha* getDatBase() { return mDatBase; }
     CPaneMgrAlpha* getNoDatBase() { return mNoDatBase; }
diff --git a/include/d/meter/d_meter2.h b/include/d/meter/d_meter2.h
index 4817e1916c..52a26cdd00 100644
--- a/include/d/meter/d_meter2.h
+++ b/include/d/meter/d_meter2.h
@@ -123,8 +123,8 @@ private:
     /* 0x128 */ u32 field_0x128;
     /* 0x12C */ int field_0x12c;
     /* 0x130 */ f32 field_0x130;
-    /* 0x134 */ f32 mAButtonTalkPosX[2];
-    /* 0x13C */ f32 mAButtonTalkPosY[2];
+    /* 0x134 */ f32 mButtonATalkPosX[2];
+    /* 0x13C */ f32 mButtonATalkPosY[2];
     /* 0x144 */ f32 field_0x144;
     /* 0x148 */ f32 field_0x148[2];
     /* 0x150 */ f32 field_0x150[2];
@@ -236,24 +236,24 @@ private:
     /* 0x2A8 */ f32 mKeyNumScale;
     /* 0x2AC */ f32 mKeyNumPosX;
     /* 0x2B0 */ f32 mKeyNumPosY;
-    /* 0x2B4 */ f32 mAButtonScale;
-    /* 0x2B8 */ f32 mAButtonPosX;
-    /* 0x2BC */ f32 mAButtonPosY;
-    /* 0x2C0 */ f32 mAButtonFontScale;
-    /* 0x2C4 */ f32 mAButtonFontPosX;
-    /* 0x2C8 */ f32 mAButtonFontPosY;
+    /* 0x2B4 */ f32 mButtonAScale;
+    /* 0x2B8 */ f32 mButtonAPosX;
+    /* 0x2BC */ f32 mButtonAPosY;
+    /* 0x2C0 */ f32 mButtonATextScale;
+    /* 0x2C4 */ f32 mButtonATextPosX;
+    /* 0x2C8 */ f32 mButtonATextPosY;
     /* 0x2CC */ f32 field_0x2cc;
-    /* 0x2D0 */ f32 mBButtonPosX;
-    /* 0x2D4 */ f32 mBButtonPosY;
+    /* 0x2D0 */ f32 mButtonBPosX;
+    /* 0x2D4 */ f32 mButtonBPosY;
     /* 0x2D8 */ u8 field_0x2d8[0x2e4 - 0x2d8];
-    /* 0x2E4 */ f32 mAButtonTalkScale[2];
+    /* 0x2E4 */ f32 mButtonATalkScale[2];
     /* 0x2EC */ f32 field_0x2ec[2];
-    /* 0x2F4 */ f32 mBItemBaseScale[2];
-    /* 0x2FC */ f32 mBItemBasePosX[2];
-    /* 0x304 */ f32 mBItemBasePosY[2];
-    /* 0x30C */ f32 mBButtonFontScale;
-    /* 0x310 */ f32 mBButtonFontPosX;
-    /* 0x314 */ f32 mBButtonFontPosY;
+    /* 0x2F4 */ f32 mItemBBaseScale[2];
+    /* 0x2FC */ f32 mItemBBasePosX[2];
+    /* 0x304 */ f32 mItemBBasePosY[2];
+    /* 0x30C */ f32 mButtonBFontScale;
+    /* 0x310 */ f32 mButtonBFontPosX;
+    /* 0x314 */ f32 mButtonBFontPosY;
     /* 0x318 */ u8 field_0x318[0x324 - 0x318];
     /* 0x324 */ f32 field_0x324;
     /* 0x328 */ f32 field_0x328;
@@ -299,12 +299,12 @@ private:
     /* 0x42C */ f32 mVesselAlpha;
     /* 0x430 */ f32 field_0x430;
     /* 0x434 */ u8 field_0x434[0x448 - 0x434];
-    /* 0x448 */ f32 mDPadButtonOFFPosX;
-    /* 0x44C */ f32 mDPadButtonOFFPosY;
-    /* 0x450 */ f32 mDPadButtonScale;
-    /* 0x454 */ f32 mDPadButtonONPosX;
-    /* 0x458 */ f32 mDPadButtonONPosY;
-    /* 0x45C */ f32 mDPadButtonLetterSpacing;
+    /* 0x448 */ f32 mButtonCrossOFFPosX;
+    /* 0x44C */ f32 mButtonCrossOFFPosY;
+    /* 0x450 */ f32 mButtonCrossScale;
+    /* 0x454 */ f32 mButtonCrossONPosX;
+    /* 0x458 */ f32 mButtonCrossONPosY;
+    /* 0x45C */ f32 mButtonCrossTextScale;
     /* 0x460 */ u8 field_0x460[0x4bc - 0x460];
     /* 0x4BC */ u8 field_0x4bc;
     /* 0x4BC */ u8 field_0x4bd;
diff --git a/include/d/meter/d_meter2_draw.h b/include/d/meter/d_meter2_draw.h
index 3876ee56f1..235cb94145 100644
--- a/include/d/meter/d_meter2_draw.h
+++ b/include/d/meter/d_meter2_draw.h
@@ -153,6 +153,23 @@ class dKantera_icon_c;
 
 class dMeter2Draw_c : public dDlst_base_c {
 public:
+    enum {
+        SELECT_X_e,
+        SELECT_Y_e,
+        SELECT_Z_e,
+        SELECT_MAX_e = 2,
+    };
+
+    struct item_params {
+        /* 0x00 */ f32 pos_x;
+        /* 0x04 */ f32 pos_y;
+        /* 0x08 */ f32 scale;
+        /* 0x0C */ f32 rotation;
+        /* 0x10 */ f32 num_pos_x;
+        /* 0x14 */ f32 num_pos_y;
+        /* 0x18 */ f32 num_scale;
+    };
+
     /* 8020FAB4 */ dMeter2Draw_c(JKRExpHeap*);
     /* 80210FB0 */ void init();
     /* 8021135C */ void exec(u32);
@@ -213,19 +230,19 @@ public:
     /* 80217AB4 */ void drawButtonXY(int, u8, u8, bool, bool);
     /* 80218238 */ f32 getButtonCrossParentInitTransY();
     /* 80218254 */ void drawButtonCross(f32, f32);
-    /* 80218338 */ void setAlphaButtonCrossAnimeMin();
-    /* 802183A8 */ void setAlphaButtonCrossAnimeMax();
-    /* 80218448 */ void setAlphaButtonCrossItemAnimeMin();
-    /* 80218524 */ void setAlphaButtonCrossItemAnimeMax();
-    /* 802185E8 */ void setAlphaButtonCrossMapAnimeMin();
-    /* 802186C4 */ void setAlphaButtonCrossMapAnimeMax();
-    /* 80218788 */ void setAlphaButtonChange(bool);
-    /* 8021901C */ void setAlphaButtonAnimeMin();
-    /* 802190A8 */ void setAlphaButtonAnimeMax();
-    /* 80219174 */ void setAlphaButtonAAnimeMin();
-    /* 80219258 */ void setAlphaButtonAAnimeMax();
-    /* 80219324 */ void setAlphaButtonBAnimeMin();
-    /* 80219474 */ void setAlphaButtonBAnimeMax();
+    /* 80218338 */ void setAlphButtonACrossAnimeMin();
+    /* 802183A8 */ void setAlphButtonACrossAnimeMax();
+    /* 80218448 */ void setAlphButtonACrossItemAnimeMin();
+    /* 80218524 */ void setAlphButtonACrossItemAnimeMax();
+    /* 802185E8 */ void setAlphButtonACrossMapAnimeMin();
+    /* 802186C4 */ void setAlphButtonACrossMapAnimeMax();
+    /* 80218788 */ void setAlphButtonAChange(bool);
+    /* 8021901C */ void setAlphButtonAAnimeMin();
+    /* 802190A8 */ void setAlphButtonAAnimeMax();
+    /* 80219174 */ void setAlphButtonAAAnimeMin();
+    /* 80219258 */ void setAlphButtonAAAnimeMax();
+    /* 80219324 */ void setAlphButtonABAnimeMin();
+    /* 80219474 */ void setAlphButtonABAnimeMax();
     /* 802195A4 */ void setButtonIconAAlpha(u8, u32, bool);
     /* 80219788 */ void setButtonIconBAlpha(u8, u32, bool);
     /* 80219A84 */ void setButtonIconMidonaAlpha(u32);
@@ -249,7 +266,7 @@ public:
     /* 8021BC24 */ bool getCameraSubject();
     /* 8021BC54 */ bool getItemSubject();
     /* 8021BCAC */ bool getPlayerSubject();
-    /* 8021BCC0 */ bool isBButtonShow(bool);
+    /* 8021BCC0 */ bool isButtonBShow(bool);
     /* 8021BDD0 */ s16 getButtonTimer();
 
     /* 802102F8 */ virtual ~dMeter2Draw_c();
@@ -270,39 +287,12 @@ public:
     void setEmphasisB(u8 param_0) { field_0x762 = param_0; }
 
 private:
-    /* 0x004 */ f32 field_0x4;
-    /* 0x008 */ f32 field_0x8;
-    /* 0x00C */ f32 field_0xc;
-    /* 0x010 */ f32 field_0x10;
-    /* 0x014 */ f32 field_0x14;
-    /* 0x028 */ f32 field_0x18;
-    /* 0x01C */ f32 field_0x1c;
-    /* 0x020 */ f32 field_0x20;
-    /* 0x024 */ f32 field_0x24;
-    /* 0x028 */ f32 field_0x28;
-    /* 0x02C */ f32 field_0x2c;
-    /* 0x030 */ f32 field_0x30;
-    /* 0x034 */ f32 field_0x34;
-    /* 0x038 */ f32 field_0x38;
-    /* 0x03C */ f32 field_0x3c;
-    /* 0x040 */ f32 field_0x40;
-    /* 0x044 */ f32 field_0x44;
-    /* 0x048 */ f32 field_0x48;
-    /* 0x04C */ f32 field_0x4c;
-    /* 0x050 */ f32 field_0x50;
-    /* 0x054 */ f32 field_0x54;
-    /* 0x058 */ f32 field_0x58;
-    /* 0x05C */ f32 field_0x5c;
-    /* 0x060 */ f32 field_0x60;
-    /* 0x064 */ f32 field_0x64;
-    /* 0x068 */ f32 field_0x68;
-    /* 0x06C */ f32 field_0x6c;
-    /* 0x070 */ f32 field_0x70;
-    /* 0x074 */ JKRExpHeap* mp_heap;
+    /* 0x004 */ item_params mItemParams[4];
+    /* 0x074 */ JKRExpHeap* heap;
     /* 0x078 */ J2DScreen* mpScreen;
     /* 0x07C */ J2DScreen* mpKanteraScreen;
     /* 0x080 */ J2DScreen* mpPikariScreen;
-    /* 0x084 */ J2DScreen* mpItemNumTex[2][3];
+    /* 0x084 */ J2DPicture* mpItemNumTex[2][3];
     /* 0x09C */ CPaneMgr* field_0x9c[3];
     /* 0x0A8 */ int field_0xa8;
     /* 0x0AC */ dKantera_icon_c* mpKanteraMeter[2];
@@ -313,7 +303,7 @@ private:
     /* 0x0E8 */ CPaneMgr* mpXYText[5][3];
     /* 0x124 */ CPaneMgr* mpLifeParent;
     /* 0x128 */ CPaneMgr* mpLifeParts[20];
-    /* 0x178 */ CPaneMgr* mpHeartMask[20];
+    /* 0x178 */ CPaneMgr* mpHeartMark[20];
     /* 0x1C8 */ CPaneMgr* mpBigHeart;
     /* 0x1CC */ CPaneMgr* mpMagicParent;
     /* 0x1D0 */ CPaneMgr* mpMagicBase;
@@ -352,22 +342,22 @@ private:
     /* 0x36C */ int field_0x36c;
     /* 0x370 */ u8 field_0x370[0x2C];
     /* 0x39C */ CPaneMgr* mpPikariParent;
-    /* 0x3A0 */ CPaneMgr* mpLifeTexture[20][2];
-    /* 0x440 */ CPaneMgr* mpHeartBase[20];
+    /* 0x3A0 */ CPaneMgrAlpha* mpLifeTexture[20][2];
+    /* 0x440 */ CPaneMgrAlpha* mpHeartBase[20];
     /* 0x490 */ CPaneMgr* mpJujiI[5];
     /* 0x4A4 */ CPaneMgr* mpJujiM[5];
-    /* 0x4B8 */ CPaneMgr* mpUzu;
+    /* 0x4B8 */ CPaneMgrAlpha* mpUzu;
     /* 0x4BC */ u8 field_0x4bc[0x28];
-    /* 0x4E4 */ JKRHeap* mpItemBTex[2][2];
-    /* 0x4F4 */ JKRHeap* mpItemXYTex[2][2][2];
+    /* 0x4E4 */ ResTIMG* mpItemBTex[2][2];
+    /* 0x4F4 */ ResTIMG* mpItemXYTex[2][2][2];
     /* 0x514 */ J2DPicture* mpItemBPane;
     /* 0x518 */ J2DPicture* mpItemXYPane[3];
     /* 0x524 */ int field_0x524[2][2];
     /* 0x534 */ J2DAnmTransformKey* mPikariBck;
     /* 0x538 */ J2DAnmColorKey* mPikariBpk;
     /* 0x53C */ J2DAnmColorKey* mpOxygenBpk[3];
-    /* 0x548 */ JUtility::TColor field_0x548;
-    /* 0x54C */ JUtility::TColor field_0x54c;
+    /* 0x548 */ JUtility::TColor mPikariBlack;
+    /* 0x54C */ JUtility::TColor mPikariWhite;
     /* 0x550 */ f32 field_0x550;
     /* 0x554 */ f32 field_0x554;
     /* 0x558 */ f32 field_0x558;
@@ -409,13 +399,13 @@ private:
     /* 0x6E8 */ f32 field_0x6e8;
     /* 0x6EC */ f32 field_0x6ec;
     /* 0x6F0 */ f32 field_0x6f0;
-    /* 0x6F4 */ f32 field_0x6f4;
+    /* 0x6F4 */ f32 mLightDropVesselScale;
     /* 0x6F8 */ f32 field_0x6f8;
     /* 0x6FC */ f32 field_0x6fc;
     /* 0x700 */ u8 field_0x700[0x18];
     /* 0x718 */ f32 field_0x718;
     /* 0x71C */ u8 field_0x71c[4];
-    /* 0x720 */ f32 mZButtonAlpha;
+    /* 0x720 */ f32 mButtonZAlpha;
     /* 0x724 */ f32 field_0x724;
     /* 0x728 */ f32 field_0x728;
     /* 0x72C */ f32 field_0x72c;
@@ -446,22 +436,22 @@ private:
     /* 0x76B */ u8 field_0x76b;
     /* 0x76C */ u8 field_0x76c[2];
     /* 0x76E */ u8 field_0x76e;
-    /* 0x76F */ u8 field_0x76f;
+    /* 0x76F */ u8 mButtonBItem;
     /* 0x770 */ u8 field_0x770;
     /* 0x771 */ u8 field_0x771;
     /* 0x772 */ u8 field_0x772;
     /* 0x773 */ u8 field_0x773[2];
-    /* 0x778 */ f32 mHUDScale;
-    /* 0x77C */ f32 mHUDAlpha;
+    /* 0x778 */ f32 mParentScale;
+    /* 0x77C */ f32 mParentAlpha;
     /* 0x780 */ f32 mButtonsPosX;
     /* 0x784 */ f32 mButtonsPosY;
     /* 0x788 */ f32 mButtonsScale;
     /* 0x78C */ f32 field_0x78c;
-    /* 0x790 */ f32 field_0x790;
-    /* 0x794 */ f32 mLifeGaugeHeartAlpha;
-    /* 0x798 */ f32 mLifeGaugeBaseAlpha;
+    /* 0x790 */ f32 mLifeParentAlpha;
+    /* 0x794 */ f32 mLifeParentHeartAlpha;
+    /* 0x798 */ f32 mHeartBaseAlpha;
     /* 0x79C */ f32 mHeartAlpha;
-    /* 0x7A0 */ f32 mLargeHeartAlpha;
+    /* 0x7A0 */ f32 mBigHeartAlpha;
     /* 0x7A4 */ f32 field_0x7a4;
     /* 0x7A8 */ f32 mMagicMeterAlpha;
     /* 0x7AC */ f32 mMagicMeterFrameAlpha;
@@ -484,44 +474,28 @@ private:
     /* 0x7F0 */ f32 field_0x7f0;
     /* 0x7F4 */ f32 mMainHUDButtonsAlpha;
     /* 0x7F8 */ f32 mButtonDisplayBackAlpha;
-    /* 0x7FC */ f32 mAButtonAlpha;
-    /* 0x800 */ f32 mBButtonAlpha;
-    /* 0x804 */ f32 mXButtonAlpha;
-    /* 0x808 */ f32 mYButtonAlpha;
+    /* 0x7FC */ f32 mButtonAAlpha;
+    /* 0x800 */ f32 mButtonBAlpha;
+    /* 0x804 */ f32 mButtonXAlpha;
+    /* 0x808 */ f32 mButtonYAlpha;
     /* 0x80C */ f32 field_0x80c;
     /* 0x810 */ f32 field_0x810;
-    /* 0x814 */ f32 mBItemBaseAlpha[2];
-    /* 0x81C */ f32 mXButtonItemBaseAlpha[2];
-    /* 0x824 */ f32 mYButtonItemBaseAlpha[2];
+    /* 0x814 */ f32 mItemBBaseAlpha[2];
+    /* 0x81C */ f32 mButtonXItemBaseAlpha[2];
+    /* 0x824 */ f32 mButtonYItemBaseAlpha[2];
     /* 0x82C */ f32 field_0x82c[2];
-    /* 0x834 */ f32 mZButtonItemBaseAlpha;
+    /* 0x834 */ f32 mButtonZItemBaseAlpha;
     /* 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;
-    /* 0x84F */ u8 field_0x84f;
-    /* 0x850 */ u8 field_0x850;
-    /* 0x851 */ u8 field_0x851;
-    /* 0x852 */ u8 field_0x852;
-    /* 0x853 */ u8 field_0x853;
-    /* 0x854 */ u8 field_0x854;
-    /* 0x855 */ u8 field_0x855;
-    /* 0x856 */ u8 field_0x856;
-    /* 0x857 */ u8 field_0x857;
-    /* 0x858 */ u8 field_0x858;
-    /* 0x859 */ u8 field_0x859;
-    /* 0x85A */ u8 field_0x85a;
-    /* 0x85B */ u8 field_0x85b;
-    /* 0x85C */ u8 field_0x85c;
-    /* 0x85D */ u8 field_0x85d;
-    /* 0x85E */ u8 field_0x85e;
-    /* 0x85F */ u8 field_0x85f;
-    /* 0x860 */ u8 field_0x860;
-    /* 0x861 */ u8 field_0x861;
+    /* 0x83C */ f32 mButtonATextSpacing;
+    /* 0x840 */ f32 mButtonCrossAlpha;
+    /* 0x844 */ f32 mButtonCrossITEMAlpha;
+    /* 0x848 */ f32 mButtonCrossMAPAlpha;
+    /* 0x84C */ GXColor mButtonATextColor;
+    /* 0x850 */ GXColor mButtonBTextColor;
+    /* 0x854 */ GXColor field_0x854;
+    /* 0x858 */ GXColor mButtonZTextColor;
+    /* 0x85C */ GXColor mButtonXYTextColor;
+    /* 0x860 */ u8 field_0x860[2];
 };
 
 #endif /* D_METER_D_METER2_DRAW_H */
diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h
index 26cfa5ef4b..2ea00aaf79 100644
--- a/include/d/meter/d_meter2_info.h
+++ b/include/d/meter/d_meter2_info.h
@@ -164,6 +164,8 @@ public:
     s16 getFloatingMessageTimer() { return mFloatingMessageTimer; }
     u16 getFloatingMessageID() { return mFloatingMessageID; }
     s16 getHorseLifeCount() { return mHorseLifeCount; }
+    void setMeterItemPanePtr(int i_no, CPaneMgr* i_pane) { mMeterItemPanePtr[i_no] = i_pane; }
+    bool isShopTalkFlag() { return mShopTalkFlag != false; }
     u8 getCollectCursorPosX() { return mCollectCursorPosX; }
     u8 getCollectCursorPosY() { return mCollectCursorPosY; }
     void setCollectCursorPosXY(u8 x, u8 y) {
@@ -294,6 +296,10 @@ inline void dMeter2Info_getStringKanji(u32 param_0, char* param_1, JMSMesgEntry_
     g_meter2_info.getStringKanji(param_0, param_1, param_2);
 }
 
+inline void dMeter2Info_getStringKana(u32 param_0, char* param_1, JMSMesgEntry_c* param_2) {
+    g_meter2_info.getStringKana(param_0, param_1, param_2);
+}
+
 inline f32 dMeter2Info_getStringLength(JUTFont* param_0, f32 param_1, f32 param_2, char* param_3) {
     return g_meter2_info.getStringLength(param_0, param_1, param_2, param_3);
 }
@@ -671,10 +677,20 @@ inline void dMeter2Info_resetMeterString() {
     g_meter2_info.resetMeterString();
 }
 
+inline void dMeter2Info_setMeterItemPanePtr(int i_no, CPaneMgr* i_pane) {
+    g_meter2_info.setMeterItemPanePtr(i_no, i_pane);
+}
+
+inline bool dMeter2Info_isShopTalkFlag() {
+    return g_meter2_info.isShopTalkFlag();
+}
+
 
 const char* dMeter2Info_getNumberTextureName(int pIndex);
 void dMeter2Info_recieveLetter();
 u8 dMeter2Info_getNewLetterNum();
 int dMeter2Info_setNewLetterSender();
+bool dMeter2Info_isItemOpenCheck();
+bool dMeter2Info_isMapOpenCheck();
 
 #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 a40d824432..754679bb8c 100644
--- a/include/d/meter/d_meter_HIO.h
+++ b/include/d/meter/d_meter_HIO.h
@@ -46,18 +46,18 @@ public:
     /* 0x3C */ f32 mHeartVesselPosX;
     /* 0x40 */ f32 mHeartVesselPosY;
     /* 0x44 */ f32 mHeartVesselScale;
-    /* 0x48 */ f32 mAButtonPosX;
-    /* 0x4C */ f32 mAButtonPosY;
-    /* 0x50 */ f32 mAButtonScale;
-    /* 0x54 */ f32 mBButtonPosX;
-    /* 0x58 */ f32 mBButtonPosY;
-    /* 0x5C */ f32 mBButtonScale;
-    /* 0x60 */ f32 mAButtonTextPosX;
-    /* 0x64 */ f32 mAButtonTextPosY;
-    /* 0x68 */ f32 mAButtonTextScale;
-    /* 0x6C */ f32 mBButtonTextPosX;
-    /* 0x70 */ f32 mBButtonTextPosY;
-    /* 0x74 */ f32 mBButtonTextScale;
+    /* 0x48 */ f32 mButtonAPosX;
+    /* 0x4C */ f32 mButtonAPosY;
+    /* 0x50 */ f32 mButtonAScale;
+    /* 0x54 */ f32 mButtonBPosX;
+    /* 0x58 */ f32 mButtonBPosY;
+    /* 0x5C */ f32 mButtonBScale;
+    /* 0x60 */ f32 mButtonATextPosX;
+    /* 0x64 */ f32 mButtonATextPosY;
+    /* 0x68 */ f32 mButtonATextScale;
+    /* 0x6C */ f32 mButtonBTextPosX;
+    /* 0x70 */ f32 mButtonBTextPosY;
+    /* 0x74 */ f32 mButtonBTextScale;
     /* 0x78 */ JUtility::TColor mVesselBack[2];
     /* 0x80 */ JUtility::TColor mVesselFront[2];
     /* 0x88 */ f32 mHeartPiecePosX;
@@ -289,18 +289,18 @@ public:
     /* 0x008 */ f32 mEmpButtonPosX;
     /* 0x00C */ f32 mEmpButtonPosY;
     /* 0x010 */ f32 mEmpButtonScale;
-    /* 0x014 */ f32 mAButtonPosX;
-    /* 0x018 */ f32 mAButtonPosY;
-    /* 0x01C */ f32 mAButtonScale;
-    /* 0x020 */ f32 mBButtonPosX;
-    /* 0x024 */ f32 mBButtonPosY;
-    /* 0x028 */ f32 mBButtonScale;
+    /* 0x014 */ f32 mButtonAPosX;
+    /* 0x018 */ f32 mButtonAPosY;
+    /* 0x01C */ f32 mButtonAScale;
+    /* 0x020 */ f32 mButtonBPosX;
+    /* 0x024 */ f32 mButtonBPosY;
+    /* 0x028 */ f32 mButtonBScale;
     /* 0x02C */ f32 mRButtonPosX;
     /* 0x030 */ f32 mRButtonPosY;
     /* 0x034 */ f32 mRButtonScale;
-    /* 0x038 */ f32 mZButtonPosX;
-    /* 0x03C */ f32 mZButtonPosY;
-    /* 0x040 */ f32 mZButtonScale;
+    /* 0x038 */ f32 mButtonZPosX;
+    /* 0x03C */ f32 mButtonZPosY;
+    /* 0x040 */ f32 mButtonZScale;
     /* 0x044 */ f32 m3DButtonPosX;
     /* 0x048 */ f32 m3DButtonPosY;
     /* 0x04C */ f32 m3DButtonScale;
@@ -310,12 +310,12 @@ public:
     /* 0x05C */ f32 mSButtonPosX;
     /* 0x060 */ f32 mSButtonPosY;
     /* 0x064 */ f32 mSButtonScale;
-    /* 0x068 */ f32 mXButtonPosX;
-    /* 0x06C */ f32 mXButtonPosY;
-    /* 0x070 */ f32 mXButtonScale;
-    /* 0x074 */ f32 mYButtonPosX;
-    /* 0x078 */ f32 mYButtonPosY;
-    /* 0x07C */ f32 mYButtonScale;
+    /* 0x068 */ f32 mButtonXPosX;
+    /* 0x06C */ f32 mButtonXPosY;
+    /* 0x070 */ f32 mButtonXScale;
+    /* 0x074 */ f32 mButtonYPosX;
+    /* 0x078 */ f32 mButtonYPosY;
+    /* 0x07C */ f32 mButtonYScale;
     /* 0x080 */ f32 mNunchukPosX;
     /* 0x084 */ f32 mNunchukPosY;
     /* 0x088 */ f32 mNunchukScale;
@@ -325,9 +325,9 @@ public:
     /* 0x098 */ f32 mWiimoteLRPosX;
     /* 0x09C */ f32 mWiimoteLRPosY;
     /* 0x0A0 */ f32 mWiimoteLRScale;
-    /* 0x0A4 */ f32 mNunchukZButtonPosX;
-    /* 0x0A8 */ f32 mNunchukZButtonPosY;
-    /* 0x0AC */ f32 mNunchukZButtonScale;
+    /* 0x0A4 */ f32 mNunchukButtonZPosX;
+    /* 0x0A8 */ f32 mNunchukButtonZPosY;
+    /* 0x0AC */ f32 mNunchukButtonZScale;
     /* 0x0B0 */ f32 mNunchukCButtonPosX;
     /* 0x0B4 */ f32 mNunchukCButtonPosY;
     /* 0x0B8 */ f32 mNunchukCButtonScale;
@@ -349,9 +349,9 @@ public:
     /* 0x0F8 */ f32 mNunchukAttackPosX;
     /* 0x0FC */ f32 mNunchukAttackPosY;
     /* 0x100 */ f32 mNunchukAttackScale;
-    /* 0x104 */ f32 mABButtonPosX;
-    /* 0x108 */ f32 mABButtonPosY;
-    /* 0x10C */ f32 mABButtonScale;
+    /* 0x104 */ f32 mAButtonBPosX;
+    /* 0x108 */ f32 mAButtonBPosY;
+    /* 0x10C */ f32 mAButtonBScale;
     /* 0x110 */ f32 mBottleIconPosX;
     /* 0x114 */ f32 mBottleIconPosY;
     /* 0x118 */ f32 mBottleIconScale;
@@ -399,30 +399,30 @@ public:
     /* 0x1D0 */ f32 mPointerONScale;
     /* 0x1D4 */ f32 mPointerOFFScale;
     /* 0x1D8 */ s16 mPointerONAnimFrame;
-    /* 0x1DC */ f32 mHighlightScale;
-    /* 0x1E0 */ JUtility::TColor mHighlightFrontInner;
-    /* 0x1E4 */ JUtility::TColor mHighlightFrontOuter;
-    /* 0x1E8 */ JUtility::TColor mHighlightBackInner;
-    /* 0x1EC */ JUtility::TColor mHighlightBackOuter;
-    /* 0x1F0 */ f32 mHighlightAnimSpeed;
-    /* 0x1F4 */ f32 mHighlightFastScale;
-    /* 0x1F8 */ JUtility::TColor mHighlightFastFrontInner;
-    /* 0x1FC */ JUtility::TColor mHighlightFastFrontOuter;
-    /* 0x200 */ JUtility::TColor mHighlightFastBackInner;
-    /* 0x204 */ JUtility::TColor mHighlightFastBackOuter;
-    /* 0x208 */ f32 mHighlightFastAnimSpeed;
-    /* 0x20C */ f32 mHighlightListenScale;
-    /* 0x210 */ JUtility::TColor mHighlightListenFrontInner;
-    /* 0x214 */ JUtility::TColor mHighlightListenFrontOuter;
-    /* 0x218 */ JUtility::TColor mHighlightListenBackInner;
-    /* 0x21C */ JUtility::TColor mHighlightListenBackOuter;
-    /* 0x220 */ f32 mHighlightListenAnimSpeed;
-    /* 0x224 */ f32 mHighlightRepeatHitScale;
-    /* 0x228 */ JUtility::TColor mHighlightRepeatHitFrontInner;
-    /* 0x22C */ JUtility::TColor mHighlightRepeatHitFrontOuter;
-    /* 0x230 */ JUtility::TColor mHighlightRepeatHitBackInner;
-    /* 0x234 */ JUtility::TColor mHighlightRepeatHitBackOuter;
-    /* 0x238 */ f32 mHighlightRepeatHitAnimSpeed;
+    /* 0x1DC */ f32 mPikariScale;
+    /* 0x1E0 */ JUtility::TColor mPikariFrontInner;
+    /* 0x1E4 */ JUtility::TColor mPikariFrontOuter;
+    /* 0x1E8 */ JUtility::TColor mPikariBackInner;
+    /* 0x1EC */ JUtility::TColor mPikariBackOuter;
+    /* 0x1F0 */ f32 mPikariAnimSpeed;
+    /* 0x1F4 */ f32 mPikariFastScale;
+    /* 0x1F8 */ JUtility::TColor mPikariFastFrontInner;
+    /* 0x1FC */ JUtility::TColor mPikariFastFrontOuter;
+    /* 0x200 */ JUtility::TColor mPikariFastBackInner;
+    /* 0x204 */ JUtility::TColor mPikariFastBackOuter;
+    /* 0x208 */ f32 mPikariFastAnimSpeed;
+    /* 0x20C */ f32 mPikariListenScale;
+    /* 0x210 */ JUtility::TColor mPikariListenFrontInner;
+    /* 0x214 */ JUtility::TColor mPikariListenFrontOuter;
+    /* 0x218 */ JUtility::TColor mPikariListenBackInner;
+    /* 0x21C */ JUtility::TColor mPikariListenBackOuter;
+    /* 0x220 */ f32 mPikariListenAnimSpeed;
+    /* 0x224 */ f32 mPikariRepeatHitScale;
+    /* 0x228 */ JUtility::TColor mPikariRepeatHitFrontInner;
+    /* 0x22C */ JUtility::TColor mPikariRepeatHitFrontOuter;
+    /* 0x230 */ JUtility::TColor mPikariRepeatHitBackInner;
+    /* 0x234 */ JUtility::TColor mPikariRepeatHitBackOuter;
+    /* 0x238 */ f32 mPikariRepeatHitAnimSpeed;
     /* 0x23C */ f32 mRepeatHitScale;
     /* 0x240 */ s16 mRepeatHitFrameNum;
     /* 0x244 */ f32 mDisplaySpace;
@@ -509,22 +509,22 @@ public:
     /* 0x118 */ f32 mGetInTextAnimSpeed;
     /* 0x11C */ s16 mGetInTextWaitFrames;
     /* 0x11E */ s16 mGetInTextAlphaFrames;
-    /* 0x120 */ f32 mGetInHighlightScale;
-    /* 0x124 */ JUtility::TColor mGetInHighlightFrontInner;
-    /* 0x128 */ JUtility::TColor mGetInHighlightFrontOuter;
-    /* 0x12C */ JUtility::TColor mGetInHighlightBackInner;
-    /* 0x130 */ JUtility::TColor mGetInHighlightBackOuter;
-    /* 0x134 */ f32 mGetInHighlightAnimSpeed;
-    /* 0x138 */ s16 mGetInHighlightAppearFrames;
+    /* 0x120 */ f32 mGetInPikariScale;
+    /* 0x124 */ JUtility::TColor mGetInPikariFrontInner;
+    /* 0x128 */ JUtility::TColor mGetInPikariFrontOuter;
+    /* 0x12C */ JUtility::TColor mGetInPikariBackInner;
+    /* 0x130 */ JUtility::TColor mGetInPikariBackOuter;
+    /* 0x134 */ f32 mGetInPikariAnimSpeed;
+    /* 0x138 */ s16 mGetInPikariAppearFrames;
     /* 0x13A */ u8 mGetInTextLocation;
-    /* 0x13C */ f32 mStartHighlightScale;
-    /* 0x140 */ JUtility::TColor mStartHighlightFrontInner;
-    /* 0x144 */ JUtility::TColor mStartHighlightFrontOuter;
-    /* 0x148 */ JUtility::TColor mStartHighlightBackInner;
-    /* 0x14C */ JUtility::TColor mStartHighlightBackOuter;
-    /* 0x150 */ f32 mStartHighlightAnimSpeed;
-    /* 0x154 */ s16 mStartHighlightAppearFrames;
-    /* 0x156 */ s16 mStartHighlightDisplayFrames;
+    /* 0x13C */ f32 mStartPikariScale;
+    /* 0x140 */ JUtility::TColor mStartPikariFrontInner;
+    /* 0x144 */ JUtility::TColor mStartPikariFrontOuter;
+    /* 0x148 */ JUtility::TColor mStartPikariBackInner;
+    /* 0x14C */ JUtility::TColor mStartPikariBackOuter;
+    /* 0x150 */ f32 mStartPikariAnimSpeed;
+    /* 0x154 */ s16 mStartPikariAppearFrames;
+    /* 0x156 */ s16 mStartPikariDisplayFrames;
     /* 0x158 */ s16 mReadyGo;
     /* 0x15A */ s16 field_0x15a;
     /* 0x15C */ f32 mReadyFightTextSizeX;
@@ -534,13 +534,13 @@ public:
     /* 0x16C */ f32 mReadyFightTextAnimSpeed;
     /* 0x170 */ s16 mReadyFightTextWaitFrames;
     /* 0x172 */ s16 field_0x172;
-    /* 0x174 */ f32 mReadyFightHighlightScale;
-    /* 0x178 */ JUtility::TColor mReadyFightHighlightFrontInner;
-    /* 0x17C */ JUtility::TColor mReadyFightHighlightFrontOuter;
-    /* 0x180 */ JUtility::TColor mReadyFightHighlightBackInner;
-    /* 0x184 */ JUtility::TColor mReadyFightHighlightBackOuter;
-    /* 0x188 */ f32 mReadyFightHighlightAnimSpeed;
-    /* 0x18C */ s16 mReadyFightHighlightAppearFrames;
+    /* 0x174 */ f32 mReadyFightPikariScale;
+    /* 0x178 */ JUtility::TColor mReadyFightPikariFrontInner;
+    /* 0x17C */ JUtility::TColor mReadyFightPikariFrontOuter;
+    /* 0x180 */ JUtility::TColor mReadyFightPikariBackInner;
+    /* 0x184 */ JUtility::TColor mReadyFightPikariBackOuter;
+    /* 0x188 */ f32 mReadyFightPikariAnimSpeed;
+    /* 0x18C */ s16 mReadyFightPikariAppearFrames;
 };  // Size: 0x190
 
 class dMeter_drawLightDropHIO_c {
@@ -558,9 +558,7 @@ public:
     /* 0x1C */ f32 mVesselTalkPosY;
     /* 0x20 */ f32 mVesselPosX_4x3;
     /* 0x24 */ f32 mVesselPosY_4x3;
-    /* 0x28 */ f32 mVesselAlpha;
-    /* 0x2C */ f32 mVesselTalkAlpha;
-    /* 0x30 */ f32 mVesselDecorAlpha;
+    /* 0x28 */ f32 mVesselAlpha[3];
     /* 0x34 */ f32 mDropAlpha;
     /* 0x38 */ JUtility::TColor mDropOnColorWhite;
     /* 0x3C */ JUtility::TColor mDropOnColorBlack;
@@ -569,25 +567,25 @@ public:
     /* 0x48 */ f32 mDropScale;
     /* 0x4C */ f32 mDropGetScale;
     /* 0x50 */ s16 mDropGetScaleAnimFrameNum;
-    /* 0x52 */ s16 mHighlightInterval;
+    /* 0x52 */ s16 mPikariInterval;
     /* 0x54 */ s16 field_0x54;
     /* 0x56 */ s16 field_0x56;
-    /* 0x58 */ JUtility::TColor mDropHighlightFrontInner;
-    /* 0x5C */ JUtility::TColor mDropHighlightFrontOuter;
-    /* 0x60 */ JUtility::TColor mDropHighlightBackInner;
-    /* 0x64 */ JUtility::TColor mDropHighlightBackOuter;
-    /* 0x68 */ f32 mDropHighlightAnimSpeed;
-    /* 0x6C */ f32 mDropHighlightAnimSpeed_Completed;
-    /* 0x70 */ JUtility::TColor mHighlightLoopFrontInner[2];
-    /* 0x78 */ JUtility::TColor mHighlightLoopFrontOuter[2];
-    /* 0x80 */ JUtility::TColor mHighlightLoopBackInner[2];
-    /* 0x88 */ JUtility::TColor mHighlightLoopBackOuter[2];
-    /* 0x90 */ f32 mHighlightLoopAnimSpeed;
-    /* 0x94 */ f32 mHighlightLoopBackStopFrame;
-    /* 0x98 */ f32 mHighlightScaleNormal;
-    /* 0x9C */ f32 mHighlightScaleComplete;
-    /* 0xA0 */ f32 mHighlightLoopScale;
-    /* 0xA4 */ f32 mHighlightLoopBackScale;
+    /* 0x58 */ JUtility::TColor mDropPikariFrontInner;
+    /* 0x5C */ JUtility::TColor mDropPikariFrontOuter;
+    /* 0x60 */ JUtility::TColor mDropPikariBackInner;
+    /* 0x64 */ JUtility::TColor mDropPikariBackOuter;
+    /* 0x68 */ f32 mDropPikariAnimSpeed;
+    /* 0x6C */ f32 mDropPikariAnimSpeed_Completed;
+    /* 0x70 */ JUtility::TColor mPikariLoopFrontInner[2];
+    /* 0x78 */ JUtility::TColor mPikariLoopFrontOuter[2];
+    /* 0x80 */ JUtility::TColor mPikariLoopBackInner[2];
+    /* 0x88 */ JUtility::TColor mPikariLoopBackOuter[2];
+    /* 0x90 */ f32 mPikariLoopAnimSpeed;
+    /* 0x94 */ f32 mPikariLoopBackStopFrame;
+    /* 0x98 */ f32 mPikariScaleNormal;
+    /* 0x9C */ f32 mPikariScaleComplete;
+    /* 0xA0 */ f32 mPikariLoopScale;
+    /* 0xA4 */ f32 mPikariLoopBackScale;
     /* 0xA8 */ u8 mAnimDebug;
 };  // Size: 0xAC
 
@@ -601,17 +599,17 @@ public:
     /* 0x008 */ f32 mLifeTopPosX;
     /* 0x00C */ f32 mLifeTopPosY;
     /* 0x010 */ f32 mNoMagicPosY;
-    /* 0x014 */ f32 mHUDScale;
-    /* 0x018 */ f32 mHUDAlpha;
-    /* 0x01C */ f32 mLifeGaugeScale;
-    /* 0x020 */ f32 mLifeGaugeHeartAlpha;
-    /* 0x024 */ f32 mLifeGaugeBaseAlpha;
+    /* 0x014 */ f32 mParentScale;
+    /* 0x018 */ f32 mParentAlpha;
+    /* 0x01C */ f32 mLifeParentScale;
+    /* 0x020 */ f32 mLifeParentHeartAlpha;
+    /* 0x024 */ f32 mHeartBaseAlpha;
     /* 0x028 */ f32 mLifeGaugePosX;
     /* 0x02C */ f32 mLifeGaugePosY;
-    /* 0x030 */ f32 mHeartScale;
+    /* 0x030 */ f32 mHeartMarkScale;
     /* 0x034 */ f32 mHeartAlpha;
-    /* 0x038 */ f32 mLargeHeartScale;
-    /* 0x03C */ f32 mLargeHeartAlpha;
+    /* 0x038 */ f32 mBigHeartScale;
+    /* 0x03C */ f32 mBigHeartAlpha;
     /* 0x040 */ f32 mMagicMeterScale;
     /* 0x044 */ f32 mMagicMeterAlpha;
     /* 0x048 */ f32 mMagicMeterFrameAlpha;
@@ -637,30 +635,30 @@ public:
     /* 0x098 */ f32 mRingHUDButtonsPosY;
     /* 0x09C */ f32 mButtonDisplayBackScale;
     /* 0x0A0 */ f32 mButtonDisplayBackAlpha;
-    /* 0x0A4 */ f32 mAButtonScale;
-    /* 0x0A8 */ f32 mAButtonAlpha;
-    /* 0x0AC */ f32 mAButtonPosX;
-    /* 0x0B0 */ f32 mAButtonPosY;
-    /* 0x0B4 */ f32 mAButtonTalkScale[2];
-    /* 0x0BC */ f32 mAButtonTalkPosX[2];
-    /* 0x0C4 */ f32 mAButtonTalkPosY[2];
-    /* 0x0CC */ f32 mAButtonTalkAScale;
-    /* 0x0D0 */ f32 mAButtonFontTalkAScale;
-    /* 0x0D4 */ f32 mAButtonTalkAPosX[2];
-    /* 0x0DC */ f32 mAButtonTalkAPosY[2];
-    /* 0x0E4 */ f32 mAButtonVesselPosX;
-    /* 0x0E8 */ f32 mAButtonVesselPosY;
-    /* 0x0EC */ f32 mBButtonScale;
-    /* 0x0F0 */ f32 mBButtonAlpha;
-    /* 0x0F4 */ f32 mBButtonPosX;
-    /* 0x0F8 */ f32 mBButtonPosY;
-    /* 0x0FC */ f32 mBButtonTalkScale[2];
-    /* 0x104 */ f32 mBButtonTalkPosX[2];
-    /* 0x10C */ f32 mBButtonTalkPosY[2];
-    /* 0x114 */ f32 mBButtonWolfPosX;
-    /* 0x118 */ f32 mBButtonWolfPosY;
-    /* 0x11C */ f32 mBButtonVesselPosX;
-    /* 0x120 */ f32 mBButtonVesselPosY;
+    /* 0x0A4 */ f32 mButtonAScale;
+    /* 0x0A8 */ f32 mButtonAAlpha;
+    /* 0x0AC */ f32 mButtonAPosX;
+    /* 0x0B0 */ f32 mButtonAPosY;
+    /* 0x0B4 */ f32 mButtonATalkScale[2];
+    /* 0x0BC */ f32 mButtonATalkPosX[2];
+    /* 0x0C4 */ f32 mButtonATalkPosY[2];
+    /* 0x0CC */ f32 mButtonATalkAScale;
+    /* 0x0D0 */ f32 mButtonATextTalkAScale;
+    /* 0x0D4 */ f32 mButtonATalkAPosX[2];
+    /* 0x0DC */ f32 mButtonATalkAPosY[2];
+    /* 0x0E4 */ f32 mButtonAVesselPosX;
+    /* 0x0E8 */ f32 mButtonAVesselPosY;
+    /* 0x0EC */ f32 mButtonBScale;
+    /* 0x0F0 */ f32 mButtonBAlpha;
+    /* 0x0F4 */ f32 mButtonBPosX;
+    /* 0x0F8 */ f32 mButtonBPosY;
+    /* 0x0FC */ f32 mButtonBTalkScale[2];
+    /* 0x104 */ f32 mButtonBTalkPosX[2];
+    /* 0x10C */ f32 mButtonBTalkPosY[2];
+    /* 0x114 */ f32 mButtonBWolfPosX;
+    /* 0x118 */ f32 mButtonBWolfPosY;
+    /* 0x11C */ f32 mButtonBVesselPosX;
+    /* 0x120 */ f32 mButtonBVesselPosY;
     /* 0x124 */ f32 mMidnaIconScale;
     /* 0x128 */ f32 mMidnaIconAlpha;
     /* 0x12C */ f32 mMidnaIconPosX;
@@ -669,71 +667,63 @@ public:
     /* 0x138 */ f32 field_0x138;
     /* 0x13C */ f32 field_0x13c;
     /* 0x140 */ f32 field_0x140;
-    /* 0x144 */ f32 mXButtonScale;
-    /* 0x148 */ f32 mXButtonAlpha;
-    /* 0x14C */ f32 mXButtonPosX;
-    /* 0x150 */ f32 mXButtonPosY;
-    /* 0x154 */ f32 mYButtonScale;
-    /* 0x158 */ f32 mYButtonAlpha;
-    /* 0x15C */ f32 mYButtonPosX;
-    /* 0x160 */ f32 mYButtonPosY;
+    /* 0x144 */ f32 mButtonXScale;
+    /* 0x148 */ f32 mButtonXAlpha;
+    /* 0x14C */ f32 mButtonXPosX;
+    /* 0x150 */ f32 mButtonXPosY;
+    /* 0x154 */ f32 mButtonYScale;
+    /* 0x158 */ f32 mButtonYAlpha;
+    /* 0x15C */ f32 mButtonYPosX;
+    /* 0x160 */ f32 mButtonYPosY;
     /* 0x164 */ f32 field_0x164;
     /* 0x168 */ f32 field_0x168;
     /* 0x16C */ f32 field_0x16c;
     /* 0x170 */ f32 field_0x170;
-    /* 0x174 */ f32 mZButtonScale;
-    /* 0x178 */ f32 mZButtonAlpha;
-    /* 0x17C */ f32 mZButtonPosX;
-    /* 0x180 */ f32 mZButtonPosY;
-    /* 0x184 */ f32 mBButtonItemPosX;
-    /* 0x188 */ f32 mBButtonSwordPosX;
-    /* 0x18C */ f32 mBButtonFishingPosX;
-    /* 0x190 */ f32 mBButtonItemPosY;
-    /* 0x194 */ f32 mBButtonSwordPosY;
-    /* 0x198 */ f32 mBButtonFishingPosY;
-    /* 0x19C */ f32 mBButtonItemRotation;
-    /* 0x1A0 */ f32 mBButtonSwordRotation;
-    /* 0x1A4 */ f32 mBButtonFishingRotation;
-    /* 0x1A8 */ f32 mBButtonItemScale;
-    /* 0x1AC */ f32 mBButtonSwordScale;
-    /* 0x1B0 */ f32 mBButtonFishingScale;
-    /* 0x1B4 */ f32 mXButtonItemPosX;
-    /* 0x1B8 */ f32 mXButtonItemPosY;
-    /* 0x1BC */ f32 mXButtonItemScale;
-    /* 0x1C0 */ f32 mYButtonItemPosX;
-    /* 0x1C4 */ f32 mYButtonItemPosY;
-    /* 0x1C8 */ f32 mYButtonItemScale;
+    /* 0x174 */ f32 mButtonZScale;
+    /* 0x178 */ f32 mButtonZAlpha;
+    /* 0x17C */ f32 mButtonZPosX;
+    /* 0x180 */ f32 mButtonZPosY;
+    /* 0x184 */ f32 mButtonBItemPosX[3];
+    /* 0x190 */ f32 mButtonBItemPosY[3];
+    /* 0x19C */ f32 mButtonBItemRotation[3];
+    /* 0x1A8 */ f32 mButtonBItemScale[3];
+    /* 0x1B4 */ f32 mButtonXItemPosX;
+    /* 0x1B8 */ f32 mButtonXItemPosY;
+    /* 0x1BC */ f32 mButtonXItemScale;
+    /* 0x1C0 */ f32 mButtonYItemPosX;
+    /* 0x1C4 */ f32 mButtonYItemPosY;
+    /* 0x1C8 */ f32 mButtonYItemScale;
     /* 0x1CC */ f32 field_0x1cc;
     /* 0x1D0 */ f32 field_0x1d0;
     /* 0x1D4 */ f32 field_0x1d4;
-    /* 0x1D8 */ f32 mZButtonItemPosX;
-    /* 0x1DC */ f32 mZButtonItemPosY;
-    /* 0x1E0 */ f32 mZButtonItemScale;
+    /* 0x1D8 */ f32 mButtonZItemPosX;
+    /* 0x1DC */ f32 mButtonZItemPosY;
+    /* 0x1E0 */ f32 mButtonZItemScale;
     /* 0x1E4 */ f32 mButtonItemRotation[3];
     /* 0x1F0 */ f32 mXItemNumPosX;
     /* 0x1F4 */ f32 mYItemNumPosX;
     /* 0x1F8 */ f32 field_0x1f8;
-    /* 0x1FC */ f32 mBItemNumPosX;
+    /* 0x1FC */ f32 mItemBNumPosX;
     /* 0x200 */ f32 mXItemNumPosY;
     /* 0x204 */ f32 mYItemNumPosY;
     /* 0x208 */ f32 field_0x208;
-    /* 0x20C */ f32 mBItemNumPosY;
+    /* 0x20C */ f32 mItemBNumPosY;
     /* 0x210 */ f32 mXItemNumScale;
     /* 0x214 */ f32 mYItemNumScale;
     /* 0x218 */ f32 field_0x218;
-    /* 0x21C */ f32 mBItemNumScale;
-    /* 0x220 */ f32 mBItemBaseScale[2];
-    /* 0x228 */ f32 mBItemBasePosX[2];
-    /* 0x230 */ f32 mBItemBasePosY[2];
-    /* 0x238 */ f32 mBItemBaseAlpha[2];
-    /* 0x240 */ f32 mXButtonItemBaseScale[2];
-    /* 0x248 */ f32 mXButtonItemBasePosX[2];
-    /* 0x250 */ f32 mXButtonItemBasePosY[2];
-    /* 0x258 */ f32 mXButtonItemBaseAlpha[2];
-    /* 0x260 */ f32 mYButtonItemBaseScale[2];
-    /* 0x268 */ f32 mYButtonItemBasePosX[2];
-    /* 0x270 */ f32 mYButtonItemBasePosY[2];
-    /* 0x278 */ f32 mYButtonItemBaseAlpha[2];
+    /* 0x21C */ f32 mItemBNumScale;
+    /* 0x220 */ f32 mItemBBaseScale[2];
+    /* 0x228 */ f32 mItemBBasePosX[2];
+    /* 0x230 */ f32 mItemBBasePosY[2];
+    /* 0x238 */ f32 mItemBBaseAlpha[2];
+    /* 0x240 */ f32 mButtonXItemBaseScale[2];
+    /* 0x248 */ f32 mButtonXItemBasePosX[2];
+    /* 0x250 */ f32 mButtonXItemBasePosY[2];
+    /* 0x258 */ f32 mButtonXItemBaseAlpha[2];
+    /* 0x260 */ f32 mButtonYItemBaseScale[2];
+    /* 0x268 */ f32 mButtonYItemBasePosX[2];
+    /* 0x270 */ f32 mButtonYItemBasePosY[2];
+    /* 0x278 */ f32 mButtonYItemBaseAlpha[2];
     /* 0x280 */ f32 field_0x280;
     /* 0x284 */ f32 field_0x284;
     /* 0x288 */ f32 field_0x288;
@@ -741,31 +731,31 @@ public:
     /* 0x290 */ f32 field_0x290;
     /* 0x294 */ f32 field_0x294;
     /* 0x298 */ f32 field_0x298[2];
-    /* 0x2A0 */ f32 mZButtonItemBaseScale;
-    /* 0x2A4 */ f32 mZButtonItemBasePosX;
-    /* 0x2A8 */ f32 mZButtonItemBasePosY;
-    /* 0x2AC */ f32 mZButtonItemBaseAlpha;
+    /* 0x2A0 */ f32 mButtonZItemBaseScale;
+    /* 0x2A4 */ f32 mButtonZItemBasePosX;
+    /* 0x2A8 */ f32 mButtonZItemBasePosY;
+    /* 0x2AC */ f32 mButtonZItemBaseAlpha;
     /* 0x2B0 */ f32 mButtonBaseAlpha;
-    /* 0x2B4 */ f32 mAButtonFontScale;
-    /* 0x2B8 */ f32 mAButtonFontPosX;
-    /* 0x2BC */ f32 mAButtonFontPosY;
-    /* 0x2C0 */ JUtility::TColor mAButtonFontColor;
-    /* 0x2C4 */ f32 mAButtonFontSpacing;
-    /* 0x2C8 */ s32 mAButtonFontActionID;
+    /* 0x2B4 */ f32 mButtonATextScale;
+    /* 0x2B8 */ f32 mButtonATextPosX;
+    /* 0x2BC */ f32 mButtonATextPosY;
+    /* 0x2C0 */ JUtility::TColor mButtonATextColor;
+    /* 0x2C4 */ f32 mButtonATextSpacing;
+    /* 0x2C8 */ s32 mButtonATextActionID;
     /* 0x2CC */ u32 field_0x2cc;
-    /* 0x2D0 */ bool mAButtonTextDebug;
-    /* 0x2D4 */ f32 mBButtonFontScale;
-    /* 0x2D8 */ f32 mBButtonFontPosX;
-    /* 0x2DC */ f32 mBButtonFontPosY;
-    /* 0x2E0 */ JUtility::TColor mBButtonFontColor;
+    /* 0x2D0 */ bool mButtonATextDebug;
+    /* 0x2D4 */ f32 mButtonBFontScale;
+    /* 0x2D8 */ f32 mButtonBFontPosX;
+    /* 0x2DC */ f32 mButtonBFontPosY;
+    /* 0x2E0 */ JUtility::TColor mButtonBFontColor;
     /* 0x2E4 */ f32 field_0x2e4;
     /* 0x2E8 */ f32 field_0x2e8;
     /* 0x2EC */ f32 field_0x2ec;
     /* 0x2F0 */ JUtility::TColor field_0x2f0;
-    /* 0x2F4 */ f32 mXYButtonFontScale;
-    /* 0x2F8 */ f32 mXYButtonFontPosX;
-    /* 0x2FC */ f32 mXYButtonFontPosY;
-    /* 0x300 */ JUtility::TColor mXYButtonFontColor;
+    /* 0x2F4 */ f32 mButtonXYTextScale;
+    /* 0x2F8 */ f32 mButtonXYTextPosX;
+    /* 0x2FC */ f32 mButtonXYTextPosY;
+    /* 0x300 */ JUtility::TColor mButtonXYTextColor;
     /* 0x304 */ f32 field_0x304;
     /* 0x308 */ f32 field_0x308;
     /* 0x30C */ f32 field_0x30c;
@@ -776,10 +766,10 @@ public:
     /* 0x320 */ f32 field_0x320;
     /* 0x324 */ f32 field_0x324;
     /* 0x328 */ f32 field_0x328;
-    /* 0x32C */ f32 mZButtonFontScale;
-    /* 0x330 */ f32 mZButtonFontPosX;
-    /* 0x334 */ f32 mZButtonFontPosY;
-    /* 0x338 */ JUtility::TColor mZButtonFontColor;
+    /* 0x32C */ f32 mButtonZFontScale;
+    /* 0x330 */ f32 mButtonZFontPosX;
+    /* 0x334 */ f32 mButtonZFontPosY;
+    /* 0x338 */ JUtility::TColor mButtonZFontColor;
     /* 0x33C */ f32 mRupeeKeyScale;
     /* 0x340 */ f32 mRupeeKeyPosX;
     /* 0x344 */ f32 mRupeeKeyPosY;
@@ -811,72 +801,72 @@ public:
     /* 0x3AC */ f32 mSpurBarScale;
     /* 0x3B0 */ f32 mSpurBarPosX;
     /* 0x3B4 */ f32 mSpurBarPosY;
-    /* 0x3B8 */ f32 mAButtonHorsePosX;
-    /* 0x3BC */ f32 mAButtonHorsePosY;
-    /* 0x3C0 */ f32 mAButtonHorseScale;
-    /* 0x3C4 */ f32 mAButtonHighlightScale;
-    /* 0x3C8 */ f32 mBButtonHighlightScale;
+    /* 0x3B8 */ f32 mButtonAHorsePosX;
+    /* 0x3BC */ f32 mButtonAHorsePosY;
+    /* 0x3C0 */ f32 mButtonAHorseScale;
+    /* 0x3C4 */ f32 mButtonAPikariScale;
+    /* 0x3C8 */ f32 mButtonBPikariScale;
     /* 0x3CC */ f32 field_0x3cc;
     /* 0x3D0 */ f32 field_0x3d0;
     /* 0x3D4 */ f32 field_0x3d4;
-    /* 0x3D8 */ f32 mZButtonHighlightScale;
-    /* 0x3DC */ f32 mXYButtonHighlightScale;
-    /* 0x3E0 */ f32 mSpurIconHighlightScale;
-    /* 0x3E4 */ f32 mSpurIconReviveHighlightScale;
-    /* 0x3E8 */ f32 mMidnaIconHighlightScale;
+    /* 0x3D8 */ f32 mButtonZPikariScale;
+    /* 0x3DC */ f32 mButtonXYPikariScale;
+    /* 0x3E0 */ f32 mSpurIconPikariScale;
+    /* 0x3E4 */ f32 mSpurIconRevivePikariScale;
+    /* 0x3E8 */ f32 mMidnaIconPikariScale;
     /* 0x3EC */ s16 mMidnaIconFlashRate;
     /* 0x3F0 */ f32 field_0x3f0;
     /* 0x3F4 */ f32 field_0x3f4;
     /* 0x3F8 */ f32 field_0x3f8;
-    /* 0x3FC */ f32 mDPadButtonScale;
-    /* 0x400 */ f32 mDPadButtonOFFPosX;
-    /* 0x404 */ f32 mDPadButtonOFFPosY;
-    /* 0x408 */ f32 mDPadButtonONPosX;
-    /* 0x40C */ f32 mDPadButtonONPosY;
-    /* 0x410 */ f32 mDPadButtonLetterSpacing;
-    /* 0x414 */ f32 mDPadButtonAlpha;
-    /* 0x418 */ f32 mDPadButtonITEMAlpha;
-    /* 0x41C */ f32 mDPadButtonMAPAlpha;
-    /* 0x420 */ s16 mDPadButtonMoveFrame;
+    /* 0x3FC */ f32 mButtonCrossScale;
+    /* 0x400 */ f32 mButtonCrossOFFPosX;
+    /* 0x404 */ f32 mButtonCrossOFFPosY;
+    /* 0x408 */ f32 mButtonCrossONPosX;
+    /* 0x40C */ f32 mButtonCrossONPosY;
+    /* 0x410 */ f32 mButtonCrossTextScale;
+    /* 0x414 */ f32 mButtonCrossAlpha;
+    /* 0x418 */ f32 mButtonCrossITEMAlpha;
+    /* 0x41C */ f32 mButtonCrossMAPAlpha;
+    /* 0x420 */ s16 mButtonCrossMoveFrame;
     /* 0x422 */ s16 field_0x422;
     /* 0x424 */ s16 field_0x424;
     /* 0x426 */ bool mButtonDebug[4];
-    /* 0x42A */ u8 mXYButtonsItemDimAlpha;
-    /* 0x42B */ u8 mXYButtonsBaseDimAlpha;
+    /* 0x42A */ u8 mButtonXYItemDimAlpha;
+    /* 0x42B */ u8 mButtonXYBaseDimAlpha;
     /* 0x42C */ u8 field_0x42c;
     /* 0x42D */ u8 mMaxSpurAmount;
     /* 0x42E */ bool mSpurDebug;
     /* 0x42F */ bool field_0x42f;
-    /* 0x430 */ JUtility::TColor mSpurIconHighlightFrontInner;
-    /* 0x434 */ JUtility::TColor mSpurIconHighlightFrontOuter;
-    /* 0x438 */ JUtility::TColor mSpurIconHighlightBackInner;
-    /* 0x43C */ JUtility::TColor mSpurIconHighlightBackOuter;
-    /* 0x440 */ f32 mSpurIconHighlightAnimSpeed;
-    /* 0x444 */ JUtility::TColor mSpurIconReviveHighlightFrontInner;
-    /* 0x448 */ JUtility::TColor mSpurIconReviveHighlightFrontOuter;
-    /* 0x44C */ JUtility::TColor mSpurIconReviveHighlightBackInner;
-    /* 0x450 */ JUtility::TColor mSpurIconReviveHighlightBackOuter;
-    /* 0x454 */ f32 mSpurIconReviveHighlightAnimSpeed;
-    /* 0x458 */ JUtility::TColor mZButtonHighlightFrontInner;
-    /* 0x45C */ JUtility::TColor mZButtonHighlightFrontOuter;
-    /* 0x460 */ JUtility::TColor mZButtonHighlightBackInner;
-    /* 0x464 */ JUtility::TColor mZButtonHighlightBackOuter;
-    /* 0x468 */ f32 mZButtonHighlightAnimSpeed;
-    /* 0x46C */ JUtility::TColor mXYButtonHighlightFrontInner;
-    /* 0x470 */ JUtility::TColor mXYButtonHighlightFrontOuter;
-    /* 0x474 */ JUtility::TColor mXYButtonHighlightBackInner;
-    /* 0x478 */ JUtility::TColor mXYButtonHighlightBackOuter;
-    /* 0x47C */ f32 mXYButtonHighlightAnimSpeed;
-    /* 0x480 */ JUtility::TColor mAButtonHighlightFrontInner;
-    /* 0x484 */ JUtility::TColor mAButtonHighlightFrontOuter;
-    /* 0x488 */ JUtility::TColor mAButtonHighlightBackInner;
-    /* 0x48C */ JUtility::TColor mAButtonHighlightBackOuter;
-    /* 0x490 */ f32 mAButtonHighlightAnimSpeed;
-    /* 0x494 */ JUtility::TColor mBButtonHighlightFrontInner;
-    /* 0x498 */ JUtility::TColor mBButtonHighlightFrontOuter;
-    /* 0x49C */ JUtility::TColor mBButtonHighlightBackInner;
-    /* 0x4A0 */ JUtility::TColor mBButtonHighlightBackOuter;
-    /* 0x4A4 */ f32 mBButtonHighlightAnimSpeed;
+    /* 0x430 */ JUtility::TColor mSpurIconPikariFrontInner;
+    /* 0x434 */ JUtility::TColor mSpurIconPikariFrontOuter;
+    /* 0x438 */ JUtility::TColor mSpurIconPikariBackInner;
+    /* 0x43C */ JUtility::TColor mSpurIconPikariBackOuter;
+    /* 0x440 */ f32 mSpurIconPikariAnimSpeed;
+    /* 0x444 */ JUtility::TColor mSpurIconRevivePikariFrontInner;
+    /* 0x448 */ JUtility::TColor mSpurIconRevivePikariFrontOuter;
+    /* 0x44C */ JUtility::TColor mSpurIconRevivePikariBackInner;
+    /* 0x450 */ JUtility::TColor mSpurIconRevivePikariBackOuter;
+    /* 0x454 */ f32 mSpurIconRevivePikariAnimSpeed;
+    /* 0x458 */ JUtility::TColor mButtonZPikariFrontInner;
+    /* 0x45C */ JUtility::TColor mButtonZPikariFrontOuter;
+    /* 0x460 */ JUtility::TColor mButtonZPikariBackInner;
+    /* 0x464 */ JUtility::TColor mButtonZPikariBackOuter;
+    /* 0x468 */ f32 mButtonZPikariAnimSpeed;
+    /* 0x46C */ JUtility::TColor mButtonXYPikariFrontInner;
+    /* 0x470 */ JUtility::TColor mButtonXYPikariFrontOuter;
+    /* 0x474 */ JUtility::TColor mButtonXYPikariBackInner;
+    /* 0x478 */ JUtility::TColor mButtonXYPikariBackOuter;
+    /* 0x47C */ f32 mButtonXYPikariAnimSpeed;
+    /* 0x480 */ JUtility::TColor mButtonAPikariFrontInner;
+    /* 0x484 */ JUtility::TColor mButtonAPikariFrontOuter;
+    /* 0x488 */ JUtility::TColor mButtonAPikariBackInner;
+    /* 0x48C */ JUtility::TColor mButtonAPikariBackOuter;
+    /* 0x490 */ f32 mButtonAPikariAnimSpeed;
+    /* 0x494 */ JUtility::TColor mButtonBPikariFrontInner;
+    /* 0x498 */ JUtility::TColor mButtonBPikariFrontOuter;
+    /* 0x49C */ JUtility::TColor mButtonBPikariBackInner;
+    /* 0x4A0 */ JUtility::TColor mButtonBPikariBackOuter;
+    /* 0x4A4 */ f32 mButtonBPikariAnimSpeed;
     /* 0x4A8 */ JUtility::TColor field_0x4a8;
     /* 0x4AC */ JUtility::TColor field_0x4ac;
     /* 0x4B0 */ JUtility::TColor field_0x4b0;
@@ -892,11 +882,11 @@ public:
     /* 0x4D8 */ JUtility::TColor field_0x4d8;
     /* 0x4DC */ JUtility::TColor field_0x4dc;
     /* 0x4E0 */ f32 field_0x4e0;
-    /* 0x4E4 */ JUtility::TColor mMidnaIconHighlightFrontInner;
-    /* 0x4E8 */ JUtility::TColor mMidnaIconHighlightFrontOuter;
-    /* 0x4EC */ JUtility::TColor mMidnaIconHighlightBackInner;
-    /* 0x4F0 */ JUtility::TColor mMidnaIconHighlightBackOuter;
-    /* 0x4F4 */ f32 mMidnaIconHighlightAnimSpeed;
+    /* 0x4E4 */ JUtility::TColor mMidnaIconPikariFrontInner;
+    /* 0x4E8 */ JUtility::TColor mMidnaIconPikariFrontOuter;
+    /* 0x4EC */ JUtility::TColor mMidnaIconPikariBackInner;
+    /* 0x4F0 */ JUtility::TColor mMidnaIconPikariBackOuter;
+    /* 0x4F4 */ f32 mMidnaIconPikariAnimSpeed;
     /* 0x4F8 */ f32 mScrollArrowScaleX;
     /* 0x4FC */ f32 mScrollArrowScaleY;
     /* 0x500 */ f32 mScrollArrowBPKAnimSpeed;
@@ -996,12 +986,12 @@ public:
     /* 0x054 */ f32 mGuidePosX[10];
     /* 0x07C */ f32 mGuidePosY[10];
     /* 0x0A4 */ f32 mGuideScale[10];
-    /* 0x0CC */ f32 mHighlightScale;
-    /* 0x0D0 */ JUtility::TColor mHighlightFrontInner;
-    /* 0x0D4 */ JUtility::TColor mHighlightFrontOuter;
-    /* 0x0D8 */ JUtility::TColor mHighlightBackInner;
-    /* 0x0DC */ JUtility::TColor mHighlightBackOuter;
-    /* 0x0E0 */ f32 mHighlightAnimSpeed;
+    /* 0x0CC */ f32 mPikariScale;
+    /* 0x0D0 */ JUtility::TColor mPikariFrontInner;
+    /* 0x0D4 */ JUtility::TColor mPikariFrontOuter;
+    /* 0x0D8 */ JUtility::TColor mPikariBackInner;
+    /* 0x0DC */ JUtility::TColor mPikariBackOuter;
+    /* 0x0E0 */ f32 mPikariAnimSpeed;
     /* 0x0E4 */ f32 mSelectPosX;
     /* 0x0E8 */ f32 mSelectPosY;
     /* 0x0EC */ f32 mSelectScaleX;
@@ -1270,24 +1260,24 @@ public:
     /* 0x118 */ f32 mDoIconPosX;
     /* 0x11C */ f32 mDoIconPosY;
     /* 0x120 */ f32 mDoIconScale;
-    /* 0x124 */ f32 mZButtonPosX;
-    /* 0x128 */ f32 mZButtonPosY;
-    /* 0x12C */ f32 mZButtonScale;
-    /* 0x130 */ f32 mAButtonPosX;
-    /* 0x134 */ f32 mAButtonPosY;
-    /* 0x138 */ f32 mAButtonScale;
-    /* 0x13C */ f32 mBButtonPosX;
-    /* 0x140 */ f32 mBButtonPosY;
-    /* 0x144 */ f32 mBButtonScale;
-    /* 0x148 */ f32 mZButtonTextPosX;
-    /* 0x14C */ f32 mZButtonTextPosY;
-    /* 0x150 */ f32 mZButtonTextScale;
-    /* 0x154 */ f32 mAButtonTextPosX;
-    /* 0x158 */ f32 mAButtonTextPosY;
-    /* 0x15C */ f32 mAButtonTextScale;
-    /* 0x160 */ f32 mBButtonTextPosX;
-    /* 0x164 */ f32 mBButtonTextPosY;
-    /* 0x168 */ f32 mBButtonTextScale;
+    /* 0x124 */ f32 mButtonZPosX;
+    /* 0x128 */ f32 mButtonZPosY;
+    /* 0x12C */ f32 mButtonZScale;
+    /* 0x130 */ f32 mButtonAPosX;
+    /* 0x134 */ f32 mButtonAPosY;
+    /* 0x138 */ f32 mButtonAScale;
+    /* 0x13C */ f32 mButtonBPosX;
+    /* 0x140 */ f32 mButtonBPosY;
+    /* 0x144 */ f32 mButtonBScale;
+    /* 0x148 */ f32 mButtonZTextPosX;
+    /* 0x14C */ f32 mButtonZTextPosY;
+    /* 0x150 */ f32 mButtonZTextScale;
+    /* 0x154 */ f32 mButtonATextPosX;
+    /* 0x158 */ f32 mButtonATextPosY;
+    /* 0x15C */ f32 mButtonATextScale;
+    /* 0x160 */ f32 mButtonBTextPosX;
+    /* 0x164 */ f32 mButtonBTextPosY;
+    /* 0x168 */ f32 mButtonBTextScale;
     /* 0x16C */ f32 mRegionImagePosX[8];
     /* 0x18C */ f32 mRegionImagePosZ[8];
     /* 0x1AC */ f32 mRegionImageScale[8];
diff --git a/include/d/pane/d_pane_class.h b/include/d/pane/d_pane_class.h
index 8b8b06dc63..87fa3c194b 100644
--- a/include/d/pane/d_pane_class.h
+++ b/include/d/pane/d_pane_class.h
@@ -72,6 +72,12 @@ public:
     f32 getInitScaleX() { return mInitScale.x; }
     f32 getInitScaleY() { return mInitScale.y; }
 
+    f32 getScaleX() { return mPane->getScaleX(); }
+    f32 getScaleY() { return mPane->getScaleY(); }
+
+    f32 getTranslateX() { return mPane->getTranslateX(); }
+    f32 getTranslateY() { return mPane->getTranslateY(); }
+
     JUtility::TColor getInitBlack() { return mInitBlack; }
     JUtility::TColor getInitWhite() { return mInitWhite; }
 
diff --git a/include/d/pane/d_pane_class_alpha.h b/include/d/pane/d_pane_class_alpha.h
index 7eee29f379..e2f8a8d042 100644
--- a/include/d/pane/d_pane_class_alpha.h
+++ b/include/d/pane/d_pane_class_alpha.h
@@ -31,6 +31,7 @@ public:
     u8 getAlpha() { return getPanePtr()->getAlpha(); }
     s16 getAlphaTimer() { return mAlphaTimer; }
     void alphaAnimeStart(s16 start) { mAlphaTimer = start; }
+    u8 getInitAlpha() { return mInitAlpha; }
 
     /* 0x04 */ J2DPane* mPane;
     /* 0x08 */ JKRExpHeap* heap;