d_message OK (via dFlow_c)

include/d/a/d_a_item.h

@@ -47,6 +47,8 @@ public:
     static void spawnItem(u16 item, u32 room, const mVec3_c &pos, const mAng3_c &rot, u32 params, u32 arg);
     static void spawnDrop(u16 item, u32 room, const mVec3_c &pos, const mAng3_c &rot);
     static u32 checkFlag(u32 flag);
+    static void setFlag(s32 id);
+
     void setItemPosition(const mVec3_c &);
     void getItemFromBWheelItem();
     bool isStateWait();
@@ -59,6 +61,9 @@ public:
     static s32 getTotalSeedCapacity();
     static s32 getTotalArrowCapacity();
 
+    static s32 getRupeeCounter();
+    static u32 getCurrentWalletCapacity();
+
     static u32 getKeyPieceCount();
     static u32 getSmallKeyCount();
 
@@ -70,6 +75,8 @@ public:
     static void itemGetEventStart(dAcBase_c *);
     static void itemGetEventEnd(dAcBase_c *);
 
+    static void addRupees(s32 amount);
+
     enum Trial_e {
         TRIAL_SKYLOFT,
         TRIAL_FARON,

include/d/a/d_a_player.h

@@ -149,7 +149,7 @@ public:
     /* vt 0x1A4 */ virtual void vt_0x1A4();
     /* vt 0x1A8 */ virtual void vt_0x1A8();
     /* vt 0x1AC */ virtual void vt_0x1AC();
-    /* vt 0x1B0 */ virtual void isItemFairyFromBugnet();
+    /* vt 0x1B0 */ virtual bool isItemFairyFromBugnet();
     /* vt 0x1B4 */ virtual void isByte0x434eEqual7();
     /* vt 0x1B8 */ virtual void canHandleGameOver();
     /* vt 0x1BC */ virtual void vt_0x1BC();
@@ -338,6 +338,7 @@ public:
     static s32 getCurrentSlingshotType();
     static s32 getCurrentBeetleType();
     static s32 getCurrentBugNetType();
+    static s32 getCurrentlyEquippedShieldType();
 
     static bool isItemRestrictedByBokoBase(ITEM_ID item);
 

include/d/a/obj/d_a_obj_toD3_stone_figure.h

@@ -39,7 +39,7 @@ private:
     m3d::smdl_c mMdl;
     STATE_MGR_DECLARE(dAcOtoD3StoneFigure_c);
     dCcD_Cyl mCollision;
-    s8 mExitId;
+    u8 mExitId;
     bool mIsSkyKeepAlreadyOpen;
 };