d_menu_fmap and d_menu_fmap2D OK (#2202)

include/d/meter/d_meter2_draw.h

@@ -284,6 +284,7 @@ public:
     bool isEmphasisR() { return field_0x768[2] == 7 ? true : false; }
     void setEmphasisA(u8 param_0) { field_0x761 = param_0; }
     void setEmphasisB(u8 param_0) { field_0x762 = param_0; }
+    u8 getInsideObjCheck() { return field_0x772; }
 
 private:
     /* 0x004 */ item_params mItemParams[4];

include/d/meter/d_meter2_info.h

@@ -118,7 +118,9 @@ public:
     void resetPauseStatus() { mPauseStatus = 0; }
     u8 getPauseStatus() { return mPauseStatus; }
     bool isGameStatus(int status) { return mGameStatus & status; }
-    bool isTouchKeyCheck(int i_status) { return mTouchKeyCheck & i_status; }
+    bool isTouchKeyCheck(int i_status) { return mTouchKeyCheck & (1 << i_status); }
+    // fake function, should be isTouchKeyCheck
+    bool isTouchKeyCheck_alt(int i_status) { return (mTouchKeyCheck >> i_status) & 1; }
     void setMapKeyDirection(u16 direction) { mMapKeyDirection = direction; }
     bool isSub2DStatus(int flag) { return mSub2DStatus & (1 << flag); }
     void offMenuInForce(int flag) { unk152 &= ~(1 << flag); }
@@ -177,13 +179,17 @@ public:
         mCollectCursorPosY = y;
     }
     void setMapDrugFlag(u8 flag) { mMapDrugFlag = flag; }
-    bool isTempBit(int bit) { return mTempBits & (1 << bit) != 0; }
+    bool isTempBit(int bit) { return mTempBits & (1 << bit); }
     void offSub2DStatus(int bit) { mSub2DStatus &= ~(1 << bit); }
     void onSub2DStatus(int bit) { mSub2DStatus |= 1 << bit; }
     void set2DWidth(float width) { m2DWidth = width; }
     void set2DHeight(float height) { m2DHeight = height; }
     void set2DPosH(float posH) { m2DPosH = posH; }
     void set2DPosV(float posV) { m2DPosV = posV; }
+    f32 get2DWidth() { return m2DWidth; }
+    f32 get2DHeight() { return m2DHeight; }
+    u8 getTableMapRegionNo() { return mTableMapRegionNo; }
+    u8 getGoldWolfMapType() { return mGoldWolfMapType; }
 
 public:
     /* 0x04 */ u8 unk4[4];
@@ -448,6 +454,11 @@ inline bool dMeter2Info_isTouchKeyCheck(int i_status) {
     return g_meter2_info.isTouchKeyCheck(i_status);
 }
 
+// fake function, should be dMeter2Info_isTouchKeyCheck
+inline bool dMeter2Info_isTouchKeyCheck_alt(int i_status) {
+    return g_meter2_info.isTouchKeyCheck_alt(i_status);
+}
+
 inline void dMeter2Info_setMapKeyDirection(u16 direction) {
     g_meter2_info.setMapKeyDirection(direction);
 }
@@ -752,6 +763,27 @@ inline void dMeter2Info_offShopTalkFlag() {
     g_meter2_info.offShopTalkFlag();
 }
 
+inline f32 dMeter2Info_get2DWidth() {
+    return g_meter2_info.get2DWidth();
+}
+
+inline f32 dMeter2Info_get2DHeight() {
+    return g_meter2_info.get2DHeight();
+}
+
+inline void dMeter2Info_setWarpInfo(const char* i_stageName, const cXyz& i_position, s16 i_angle,
+                                u8 i_roomNo, u8 param_4, u8 i_warpPlayerNo) {
+    g_meter2_info.setWarpInfo(i_stageName, i_position, i_angle, i_roomNo, param_4, i_warpPlayerNo);
+}
+
+inline u8 dMeter2Info_getTableMapRegionNo() {
+    return g_meter2_info.getTableMapRegionNo();
+}
+
+inline u8 dMeter2Info_getGoldWolfMapType() {
+    return g_meter2_info.getGoldWolfMapType();
+}
+
 const char* dMeter2Info_getPlusTextureName();
 const char* dMeter2Info_getNumberTextureName(int pIndex);
 int dMeter2Info_recieveLetter();

include/d/meter/d_meter_HIO.h

@@ -5,7 +5,7 @@
 #include "SSystem/SComponent/c_sxyz.h"
 #include "SSystem/SComponent/c_xyz.h"
 
-class JKRArchive;
+class JKRAramArchive;
 
 class dMeter_menuHIO_c {
 public:
@@ -1132,7 +1132,7 @@ public:
     /* 80200BCC */ virtual ~dMeter_fmapHIO_c();
 
     /* 0x004 */ s8 field_0x4;
-    /* 0x008 */ JKRArchive* field_0x8;
+    /* 0x008 */ JKRAramArchive* mpArchive;
     /* 0x00C */ void* field_0xc;
     /* 0x010 */ void* field_0x10;
     /* 0x014 */ void* field_0x14;
@@ -1215,7 +1215,7 @@ public:
     /* 0x2F6 */ bool mDisplayWorldGrid;
     /* 0x2F7 */ bool mDisplayRegionGrid;
     /* 0x2F8 */ bool mDisplayReferenceArea;
-    /* 0x2F9 */ u8 field_0x2f9;
+    /* 0x2F9 */ bool field_0x2f9;
     /* 0x2FA */ bool mTerminalOutput;
     /* 0x2FB */ bool mPortalDataTerminalOutput;
     /* 0x2FC */ bool mAllRegionsUnlocked;