Merge pull request #392 from Trueffeloot/d_menu_insect-1

d_menu_insect partly matching

2 files changed, 33 insertions, 14 deletions

diff --git a/include/d/menu/d_menu_insect.h b/include/d/menu/d_menu_insect.h
index e394a8a4f2..e93af9b698 100644
--- a/include/d/menu/d_menu_insect.h
+++ b/include/d/menu/d_menu_insect.h
@@ -11,6 +11,8 @@ struct STControl;
 class dMsgScrn3Select_c;
 class dMsgString_c;
 class dSelect_cursor_c;
+class mDoDvdThd_mountArchive_c;
+class JKRArchive;
 
 class dMenu_Insect_c : public dDlst_base_c {
 public:
@@ -20,8 +22,8 @@ public:
     /* 801D8760 */ void _draw();
     /* 801D88EC */ bool isSync();
     /* 801D8914 */ void init();
-    /* 801D894C */ void _open();
-    /* 801D8B2C */ void _close();
+    /* 801D894C */ int _open();
+    /* 801D8B2C */ int _close();
     /* 801D8C68 */ void wait_init();
     /* 801D8CCC */ void wait_move();
     /* 801D8E00 */ void explain_open_init();
@@ -36,15 +38,15 @@ public:
     /* 801D98F0 */ void screenSetExplain();
     /* 801D9BD0 */ void screenSetDoIcon();
     /* 801D9D4C */ static u8 getGetInsectNum();
-    /* 801D9DCC */ void getInsectItemID(int, int);
-    /* 801D9DE4 */ void isGetInsect(int, int);
-    /* 801D9E20 */ void isGiveInsect(int, int);
-    /* 801D9ED4 */ void isGiveInsect(u8);
-    /* 801D9E7C */ void isCatchInsect(u8);
+    /* 801D9DCC */ u8 getInsectItemID(int, int);
+    /* 801D9DE4 */ bool isGetInsect(int, int);
+    /* 801D9E20 */ bool isGiveInsect(int, int);
+    /* 801D9ED4 */ static bool isGiveInsect(u8);
+    /* 801D9E7C */ static bool isCatchInsect(u8);
     /* 801D9F3C */ static u8 isCatchNotGiveInsect(u8);
     /* 801D9F8C */ void cursorMove();
     /* 801DA1EC */ void setCursorPos();
-    /* 801DA2FC */ bool dpdMove();
+    /* 801DA2FC */ u8 dpdMove();
     /* 801DA304 */ void setAButtonString(u16);
     /* 801DA3B4 */ void setBButtonString(u16);
     /* 801DA464 */ void setHIO(bool);
@@ -56,17 +58,17 @@ public:
 
 private:
     /* 0x04 */ JKRExpHeap* mpHeap;
-    /* 0x08 */ void* field_0x8;
+    /* 0x08 */ JKRArchive* mpArchive;
     /* 0x0C */ STControl* mpStick;
     /* 0x10 */ CSTControl* mpCStick;
-    /* 0x14 */ void* field_0x14;
+    /* 0x14 */ mDoDvdThd_mountArchive_c* mpMount;
     /* 0x18 */ dSelect_cursor_c* mpDrawCursor;
     /* 0x1C */ dMsgScrn3Select_c* mpSelect_c;
     /* 0x20 */ J2DScreen* mpScreen;
     /* 0x24 */ J2DScreen* mpExpScreen;
     /* 0x28 */ J2DScreen* mpIconScreen;
-    /* 0x2C */ J2DTextBox* field_0x2c[5];
-    /* 0x40 */ J2DTextBox* field_0x40[5];
+    /* 0x2C */ J2DTextBox* mpAButtonString[5];
+    /* 0x40 */ J2DTextBox* mpBButtonString[5];
     /* 0x54 */ J2DTextBox* field_0x54;
     /* 0x58 */ J2DTextBox* field_0x58;
     /* 0x5C */ J2DTextBox* field_0x5c;
@@ -80,8 +82,7 @@ private:
     /* 0xE0 */ CPaneMgr* mpButtonText[2];
     /* 0xE8 */ dMsgString_c* mpString;
     /* 0xEC */ void* mpExpItemTex;
-    /* 0xF0 */ u8 field_0xf0;
-    /* 0xF1 */ u8 field_0xf1;
+    /* 0xF0 */ s16 field_0xf0;
     /* 0xF2 */ u8 mStatus;
     /* 0xF3 */ u8 field_0xf3;
     /* 0xF4 */ u8 field_0xf4;
diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h
index a055b1b6f0..9ad6a76758 100644
--- a/include/d/meter/d_meter2_info.h
+++ b/include/d/meter/d_meter2_info.h
@@ -96,6 +96,8 @@ public:
     dMw_c* getMenuWindowClass() { return mMenuWindowClass; }
     void offUseButton(int pButton) { mUseButton &= ~(u16)pButton; }
     u16 getOilGaugeBackUp() { return mOilGaugeBackUp; }
+    u8 getInsectSelectType() { return mInsectSelectType; }
+    void setInsectSelectType(u8 i_type) { mInsectSelectType = i_type; }
     u8 getWarpStatus() { return mWarpStatus; }
     void setWarpStatus(u8 status) { mWarpStatus = status; }
     u8 getWarpRoomNo() { return mWarpInfo.mRoomNo; }
@@ -291,6 +293,14 @@ inline void dMeter2Info_setSaveStageName(const char* name) {
     g_meter2_info.setSaveStageName(name);
 }
 
+inline u8 dMeter2Info_getInsectSelectType() {
+    return g_meter2_info.getInsectSelectType();
+}
+
+inline void dMeter2Info_setInsectSelectType(u8 i_type) {
+    g_meter2_info.setInsectSelectType(i_type);
+}
+
 inline u8 dMeter2Info_getWarpStatus() {
     return g_meter2_info.getWarpStatus();
 }
@@ -299,6 +309,14 @@ inline void dMeter2Info_setWarpStatus(u8 status) {
     return g_meter2_info.setWarpStatus(status);
 }
 
+inline int dMeter2Info_readItemTexture(u8 i_itemNo, void* param_1, J2DPicture* param_2,
+                                       void* param_3, J2DPicture* param_4, void* param_5,
+                                       J2DPicture* param_6, void* param_7, J2DPicture* param_8,
+                                       int param_9) {
+    return g_meter2_info.readItemTexture(i_itemNo, param_1, param_2, param_3, param_4, param_5,
+                                         param_6, param_7, param_8, param_9);
+}
+
 inline u8 dMeter2Info_getWarpRoomNo() {
     return g_meter2_info.getWarpRoomNo();
 }