95%

2 files changed, 19 insertions, 2 deletions

diff --git a/include/d/lyt/meter/d_lyt_meter.h b/include/d/lyt/meter/d_lyt_meter.h
index 48fef6cb..8c6dfc28 100644
--- a/include/d/lyt/meter/d_lyt_meter.h
+++ b/include/d/lyt/meter/d_lyt_meter.h
@@ -93,7 +93,7 @@ public:
 
     bool fn_800C9F70();
     bool fn_800C9FE0();
-    bool fn_800CA040();
+    bool isPopupOpen();
 
     bool isInMapEvent();
     bool fn_800D5380(u8);
@@ -402,6 +402,14 @@ public:
         }
     }
 
+    static s32 getRupeeDifference() {
+        if (sInstance != nullptr) {
+            return sInstance->mMain.mRupy.getRupeeDifference();
+        } else {
+            return 0;
+        }
+    }
+
     static void setField_0x13B61(u8 val) {
         if (sInstance != nullptr) {
             sInstance->field_0x13B61 = val;
@@ -452,6 +460,14 @@ public:
         }
     }
 
+    static bool isPopupOpen() {
+        if (sInstance != nullptr) {
+            return sInstance->mMain.isPopupOpen();
+        } else {
+            return false;
+        }
+    }
+
     static bool getfn_800D97A0() {
         if (sInstance != nullptr) {
             return sInstance->fn_800D97A0();
diff --git a/include/d/lyt/meter/d_lyt_meter_rupy.h b/include/d/lyt/meter/d_lyt_meter_rupy.h
index 65b04517..d295d749 100644
--- a/include/d/lyt/meter/d_lyt_meter_rupy.h
+++ b/include/d/lyt/meter/d_lyt_meter_rupy.h
@@ -117,10 +117,11 @@ public:
         mSize = size;
     }
 
+    s32 getRupeeDifference() const;
+
 private:
     bool updateDisplayedAmount(bool suppressSound);
     bool hasChangeInRupees() const;
-    s32 getRupeeDifference() const;
     void setDigit(s32 index, s32 digit);
     void executeDigitJump();
     void executeDigitBlink(s32 amount);