checkpoint

Author: jdflyer

include/d/menu/d_menu_fmap2D.h

@@ -32,7 +32,7 @@ class dMenu_Fmap2DBack_c : public dDlst_base_c, public dMenuMapCommon_c {
     /* 801D2100 */ void setIcon2DPos(u8, f32, f32, f32, u8, bool);
     /* 801D241C */ void setIcon2DPos(u8, char const*, f32, f32, f32, u8, bool);
     /* 801D2454 */ void setIcon2DPos(u8, u8, char const*, f32, f32, f32, u8, bool);
-    /* 801D2508 */ void isShowRegion(int);
+    /* 801D2508 */ bool isShowRegion(int);
     /* 801D2658 */ f32 getMapAreaGlobalPosX();
     /* 801D2668 */ f32 getMapAreaGlobalPosY();
     /* 801D2678 */ f32 getMapAreaGlobalCenterPosX();
@@ -43,8 +43,8 @@ class dMenu_Fmap2DBack_c : public dDlst_base_c, public dMenuMapCommon_c {
     /* 801D2790 */ f32 getMapScissorAreaLY();
     /* 801D27E8 */ f32 getMapScissorAreaSizeX();
     /* 801D2860 */ f32 getMapScissorAreaSizeRealX();
-    /* 801D2880 */ void getMapScissorAreaCenterPosX();
-    /* 801D28D0 */ void getMapScissorAreaCenterPosY();
+    /* 801D2880 */ f32 getMapScissorAreaCenterPosX();
+    /* 801D28D0 */ f32 getMapScissorAreaCenterPosY();
     /* 801D2920 */ f32 getMapScissorAreaSizeY();
     /* 801D2998 */ f32 getMapScissorAreaSizeRealY();
     /* 801D29B8 */ void calcRenderingPos();
@@ -88,7 +88,9 @@ class dMenu_Fmap2DBack_c : public dDlst_base_c, public dMenuMapCommon_c {
     }
 
     u8 isArrowDrawFlag() { return mArrowDrawFlag; }
-    void onShowRegionFlag(int bit) { mRegionFlag |= ((1 << bit) & 0xFF); }
+    
+    void onShowRegionFlag(int region_bit) { mRegionFlag |= ((1 << region_bit) & 0xFF); }
+    bool isShowRegionFlag(int region_bit) { return mRegionFlag & ((1 << region_bit) & 0xFF); }
 
     struct unkData {
         /* 0x00 */ float field_0x0;
@@ -112,7 +114,7 @@ class dMenu_Fmap2DBack_c : public dDlst_base_c, public dMenuMapCommon_c {
     /* 0x0CE0 */ dMeterHaihai_c* mpMeterHaihai;
     /* 0x0CE4 */ J2DAnmBase* mpBaseAnm;
     /* 0x0CE8 */ unkData field_0xce8[8];
-    /* 0x0D88 */ u32 field_0xd88;
+    /* 0x0D88 */ Stage_c* mpStages;
     /* 0x0D8C */ float field_0xd8c[8];
     /* 0x0D0C */ float field_0xdac[8];
     /* 0x0D0C */ float field_0xdcc[8];
@@ -133,7 +135,7 @@ class dMenu_Fmap2DBack_c : public dDlst_base_c, public dMenuMapCommon_c {
     /* 0x0F90 */ float field_0xf90;
     /* 0x0F94 */ float field_0xf94;
     /* 0x0F98 */ float field_0xf98;
-    /* 0x0F9C */ float field_0xf9c;
+    /* 0x0F9C */ float field_0xf9c; // Likely called mZoom
     /* 0x0FA0 */ float field_0xfa0;
     /* 0x0FA4 */ float field_0xfa4;
     /* 0x0FA8 */ float field_0xfa8;

include/d/menu/d_menu_map_common.h

@@ -37,6 +37,21 @@ struct dMenuMapCommon_c {
         /* 0x15 */ u8 _15;
     };
 
+    struct Stage_c {
+        // Incomplete or wrong
+
+        struct Stage_c_data {
+            /* 0x00 */ char mName[8];
+            /* 0x08 */ u8 field_0x8;
+            /* 0x09 */ u8 field_0x9;
+            /* 0x0C */ f32 field_0xc;
+            /* 0x10 */ f32 field_0x10;
+        };
+
+        /* 0x0 */ u32 field_0x0;
+        /* 0x4 */ Stage_c_data field_0x4[0];
+    };
+
     /* 0x004 */ J2DPicture* mPictures[23];
     /* 0x060 */ J2DPicture* _60;
     /* 0x064 */ dSelect_cursor_c* mpDrawCursor;
@@ -56,5 +71,4 @@ struct dMenuMapCommon_c {
     /* 0xC90 */ u8 _c90;
 };
 
-
 #endif /* D_MENU_D_MENU_MAP_COMMON_H */

include/d/meter/d_meter2_info.h

@@ -228,7 +228,8 @@ class dMeter2Info_c {
     /* 0xB4 */ u16 mWindowAccept;
     /* 0xB6 */ u16 mOilGaugeBackUp;
     /* 0xB8 */ u8 mDirectUseItem;
-    /* 0xB9 */ u8 mWindowStatus; // 0: normal play, 2: item wheel, 3: pause menu, 4: map, 10: pause menu submenus, 11: map in dungeon
+    /* 0xB9 */ u8 mWindowStatus;  // 0: normal play, 2: item wheel, 3: pause menu, 4: map, 10: pause
+                                  // menu submenus, 11: map in dungeon
     /* 0xBA */ u8 unk186;
     /* 0xBB */ u8 mMaxCount;
     /* 0xBC */ u8 mNowCount;
@@ -279,6 +280,8 @@ static void dMeter2Info_setFloatingMessage(u16 pMessageID, s16 pMessageTimer, bo
 static void dMeter2Info_offUseButton(int pButton);
 bool dMeter2Info_is2DActiveTouchArea();
 u8 dMeter2Info_getRecieveLetterNum();
+bool dMeter2Info_getPixel(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4,
+                          f32 param_5, struct ResTIMG const* param_6);
 
 inline void dMeter2Info_Initialize() {
     g_meter2_info.init();