From b80ede8f48197b69ecfe3e3945f45e09a4342792 Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Sun, 26 Apr 2026 20:55:47 +0200
Subject: item_mdl_misc OK

---
 include/d/a/d_a_item.h             |  18 +++
 include/toBeSorted/item_mdl.h      |  43 +++++++
 include/toBeSorted/item_mdl_misc.h | 228 +++++++++++++++++++++++++++++++++++++
 include/toBeSorted/item_mdl_name.h | 183 +++++++++++++++++++++++++++++
 include/toBeSorted/mdl_base.h      |  12 ++
 5 files changed, 484 insertions(+)
 create mode 100644 include/toBeSorted/item_mdl.h
 create mode 100644 include/toBeSorted/item_mdl_misc.h
 create mode 100644 include/toBeSorted/item_mdl_name.h
 create mode 100644 include/toBeSorted/mdl_base.h

(limited to 'include')

diff --git a/include/d/a/d_a_item.h b/include/d/a/d_a_item.h
index 24fcd785..fa07912b 100644
--- a/include/d/a/d_a_item.h
+++ b/include/d/a/d_a_item.h
@@ -78,11 +78,19 @@ public:
     static u32 getKeyPieceCount();
     static u32 getSmallKeyCount();
 
+    static bool isJellyBlob(ITEM_ID item);
+    static bool isStarryFirefly(ITEM_ID item);
+
     static bool isRupee(ITEM_ID item);
     static bool isKeyPiece(ITEM_ID item);
     static bool isTreasure(ITEM_ID item);
+    static bool isTear(ITEM_ID item);
+
+    bool isSingleArrow() const;
     bool isTriforce() const;
 
+    u32 getParams2Lower_shift1_0x7() const;
+
     static bool getItemGetEventName(u16 item, const char **outName);
     static void itemGetEventStart(dAcBase_c *);
     static void itemGetEventEnd(dAcBase_c *);
@@ -101,6 +109,16 @@ public:
 
     static Trial_e getCurrentTrial();
 
+    enum Tear_e {
+        TEAR_0,
+        TEAR_1,
+        TEAR_2,
+        TEAR_3,
+        TEAR_MAX
+    };
+
+    static Tear_e getTearSubtype(ITEM_ID item);
+
     static void healLink(u32 amount, bool); // move to dAcPy_c
 
     static bool isPerformingInitialCollection() {
diff --git a/include/toBeSorted/item_mdl.h b/include/toBeSorted/item_mdl.h
new file mode 100644
index 00000000..5ed940d0
--- /dev/null
+++ b/include/toBeSorted/item_mdl.h
@@ -0,0 +1,43 @@
+#ifndef TOBESORTED_ITEM_MDL_H
+#define TOBESORTED_ITEM_MDL_H
+
+#include "m/m3d/m_mdl.h"
+#include "m/m_allocator.h"
+#include "m/m_mtx.h"
+#include "m/m_vec.h"
+#include "m/types_m.h"
+#include "toBeSorted/mdl_base.h"
+
+// all names made up
+
+class dAcItem_c;
+
+// vtable at 80533eb0
+class dItemMdl_c : public dMdl_c {
+public:
+    /* 0x08 */ virtual ~dItemMdl_c() {}
+    /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) = 0;
+    /* 0x10 */ virtual void vt_0x10(u8) = 0;
+    /* 0x14 */ virtual void setScale(const mVec3_c &scale) = 0;
+    /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) = 0;
+    /* 0x1C */ virtual void draw() = 0;
+    /* 0x20 */ virtual void vt_0x20() = 0;
+    /* 0x24 */ virtual void setPriorityDraw() = 0;
+    /* 0x28 */ virtual void unsetPriorityDraw() = 0;
+    /* 0x2C */ virtual m3d::smdl_c *getMdl() {
+        return nullptr;
+    }
+
+    enum ItemMdl0x14_e {
+        ITEM_MDL_UNK0x14_0,
+        ITEM_MDL_UNK0x14_1,
+        ITEM_MDL_UNK0x14_2,
+        ITEM_MDL_UNK0x14_3,
+    };
+
+protected:
+    /* 0x10 */ dAcItem_c *mpItem;
+    /* 0x14 */ u8 field_0x14;
+};
+
+#endif
diff --git a/include/toBeSorted/item_mdl_misc.h b/include/toBeSorted/item_mdl_misc.h
new file mode 100644
index 00000000..e5178dab
--- /dev/null
+++ b/include/toBeSorted/item_mdl_misc.h
@@ -0,0 +1,228 @@
+#ifndef TOBESORTED_ITEM_MDL_MISC_H
+#define TOBESORTED_ITEM_MDL_MISC_H
+
+#include "m/m3d/m_anmchr.h"
+#include "m/m3d/m_anmmatclr.h"
+#include "m/m3d/m_anmmdl.h"
+#include "m/m3d/m_anmtexpat.h"
+#include "m/m3d/m_anmtexsrt.h"
+#include "m/m3d/m_mdl.h"
+#include "m/m3d/m_smdl.h"
+#include "m/types_m.h"
+#include "toBeSorted/item_mdl.h"
+
+class dItemMdlPut_c : public dItemMdl_c {
+public:
+    /* 0x08 */ virtual ~dItemMdlPut_c() {}
+    /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
+    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
+    /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
+    /* 0x1C */ virtual void draw() override;
+    /* 0x20 */ virtual void vt_0x20() override;
+    /* 0x24 */ virtual void setPriorityDraw() override;
+    /* 0x28 */ virtual void unsetPriorityDraw() override;
+
+    static bool isMdlForItemId(u16 itemId);
+
+private:
+    enum MdlIdx {
+        MDL_PUT_ARROW,
+        MDL_PUT_ARROW_BUNDLE,
+        MDL_PUT_HEART,
+        MDL_PUT_KEY_SMALL,
+        MDL_PUT_BOMB_SET,
+        MDL_PUT_SEED,
+        MDL_PUT_HEART_UTUWA,
+        MDL_PUT_HEART_KAKERA,
+        MDL_PUT_TRI_FORCE,
+        MDL_PUT_GARAGARA,
+        MDL_PUT_MAX,
+    };
+
+    struct MdlConfig {
+        const char *putResFile;
+        const char *putResMdl;
+        const char *getResFile;
+        const char *getResMdl;
+    };
+    static const MdlConfig sMdlConfig[];
+    static const u8 sMdlIdx[];
+
+    /* 0x18 */ m3d::smdl_c mGetMdl;
+    /* 0x34 */ m3d::smdl_c mPutMdl;
+};
+
+class dItemMdlShield_c : public dItemMdl_c {
+public:
+    /* 0x08 */ virtual ~dItemMdlShield_c() {}
+    /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
+    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
+    /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
+    /* 0x1C */ virtual void draw() override;
+    /* 0x20 */ virtual void vt_0x20() override;
+    /* 0x24 */ virtual void setPriorityDraw() override;
+    /* 0x28 */ virtual void unsetPriorityDraw() override;
+
+    static bool isMdlForItemId(u16 itemId);
+
+private:
+    enum ShieldIdx {
+        MDL_SHIELD_WOOD_0,
+        MDL_SHIELD_WOOD_1,
+        MDL_SHIELD_WOOD_2,
+        MDL_SHIELD_IRON_0,
+        MDL_SHIELD_IRON_1,
+        MDL_SHIELD_IRON_2,
+        MDL_SHIELD_HOLY_0,
+        MDL_SHIELD_HOLY_1,
+        MDL_SHIELD_HOLY_2,
+        MDL_SHIELD_MAX
+    };
+
+    struct MdlConfig {
+        f32 frame;
+        const char *resFile;
+        const char *mdlName;
+        const char *anmName;
+    };
+    static const MdlConfig sMdlConfig[];
+    static const u8 sMdlIdx[];
+
+    /* 0x18 */ m3d::smdl_c mMdl;
+    /* 0x34 */ m3d::anmTexPat_c mAnmTexPat;
+};
+
+// Maybe a bad name because fairies etc. are also supported
+class dItemMdlBottle_c : public dItemMdl_c {
+public:
+    /* 0x08 */ virtual ~dItemMdlBottle_c() {}
+    /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
+    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
+    /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
+    /* 0x1C */ virtual void draw() override;
+    /* 0x20 */ virtual void vt_0x20() override;
+    /* 0x24 */ virtual void setPriorityDraw() override;
+    /* 0x28 */ virtual void unsetPriorityDraw() override;
+    /* 0x2C */ virtual m3d::smdl_c *getMdl() override {
+        return &mMdl.getModel();
+    }
+
+    static bool isMdlForItemId(u16 itemId);
+
+private:
+    enum BottleIdx {
+        MDL_BOTTLE_WATER,
+        MDL_BOTTLE_FAIRY,
+        MDL_BOTTLE_HOLY,
+        MDL_BOTTLE_KUSURI,
+        MDL_BOTTLE_KUSURI_S,
+        MDL_BOTTLE_B_FAIRY,
+        MDL_BOTTLE_SOZAI_I,
+        MDL_BOTTLE_PUMPKIN,
+        MDL_BOTTLE_MAX
+    };
+
+    struct MdlConfig {
+        const char *resFile;
+        const char *mdlName;
+        const char *anmName;
+    };
+    static const MdlConfig sMdlConfig[];
+    static const u8 sMdlIdx[];
+
+    /* 0x18 */ m3d::mdlAnmChr mMdl;
+    /* 0x80 */ u32 mFlags;
+};
+
+class dItemMdlTear_c : public dItemMdl_c {
+public:
+    /* 0x08 */ virtual ~dItemMdlTear_c() {}
+    /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
+    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
+    /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
+    /* 0x1C */ virtual void draw() override;
+    /* 0x20 */ virtual void vt_0x20() override;
+    /* 0x24 */ virtual void setPriorityDraw() override;
+    /* 0x28 */ virtual void unsetPriorityDraw() override;
+
+    static bool isMdlForItemId(u16 itemId);
+
+private:
+    struct MdlConfig {
+        f32 frame;
+    };
+    static const MdlConfig sMdlConfig[];
+    static const u8 sMdlIdx[];
+
+    /* 0x18 */ m3d::smdl_c mMdl1;
+    /* 0x34 */ m3d::smdl_c mMdl2;
+    /* 0x50 */ m3d::anmTexPat_c mAnmTexPat1;
+    /* 0x7C */ m3d::anmTexPat_c mAnmTexPat2;
+    /* 0xA8 */ m3d::anmTexSrt_c mAnmTexSrt1;
+    /* 0xD4 */ m3d::anmTexSrt_c mAnmTexSrt2;
+};
+
+class dItemMdlFirefly_c : public dItemMdl_c {
+public:
+    /* 0x08 */ virtual ~dItemMdlFirefly_c() {}
+    /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
+    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
+    /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
+    /* 0x1C */ virtual void draw() override;
+    /* 0x20 */ virtual void vt_0x20() override;
+    /* 0x24 */ virtual void setPriorityDraw() override;
+    /* 0x28 */ virtual void unsetPriorityDraw() override;
+    /* 0x2C */ virtual m3d::smdl_c *getMdl() override;
+
+    static bool isMdlForItemId(u16 itemId);
+
+private:
+    /* 0x18 */ m3d::smdl_c mMdl;
+    /* 0x34 */ m3d::anmMatClr_c mAnmMatClr;
+};
+
+// Maybe a bad name because crystals are also supported
+class dItemMdlPotion_c : public dItemMdl_c {
+public:
+    /* 0x08 */ virtual ~dItemMdlPotion_c() {}
+    /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
+    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
+    /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
+    /* 0x1C */ virtual void draw() override;
+    /* 0x20 */ virtual void vt_0x20() override;
+    /* 0x24 */ virtual void setPriorityDraw() override;
+    /* 0x28 */ virtual void unsetPriorityDraw() override;
+    /* 0x2C */ virtual m3d::smdl_c *getMdl() override;
+
+    static bool isMdlForItemId(u16 itemId);
+
+private:
+    enum PotionIdx {
+        MDL_POTION_MUTEKI,
+        MDL_POTION_GUTS,
+        MDL_POTION_AIR,
+        MDL_POTION_GENKI,
+        MDL_POTION_MAX,
+    };
+
+    struct MdlConfig {
+        const char *resFile;
+        const char *mdlName;
+        const char *anmChrName;
+        const char *anmTexSrtName;
+    };
+    static const MdlConfig sMdlConfig[];
+    static const u8 sMdlIdx[];
+
+    /* 0x18 */ m3d::smdl_c mMdl;
+    /* 0x34 */ m3d::anmChr_c mAnmChr;
+    /* 0x6C */ m3d::anmTexSrt_c mAnmTexSrt;
+};
+
+#endif
diff --git a/include/toBeSorted/item_mdl_name.h b/include/toBeSorted/item_mdl_name.h
new file mode 100644
index 00000000..8d678dd0
--- /dev/null
+++ b/include/toBeSorted/item_mdl_name.h
@@ -0,0 +1,183 @@
+#ifndef TOBESORTED_ITEM_MDL_NAME_H
+#define TOBESORTED_ITEM_MDL_NAME_H
+
+#include "common.h"
+
+// all names made up
+
+
+enum ItemMdlIdx {
+    ITEMMDL_SMALL_KEY,
+    ITEMMDL_GREEN_RUPEE,
+    ITEMMDL_BLUE_RUPEE,
+    ITEMMDL_RED_RUPEE,
+    ITEMMDL_COMPLETE_TRIFORCE,
+    ITEMMDL_HEART,
+    ITEMMDL_SINGLE_ARROW,
+    ITEMMDL_BUNDLE_ARROWS,
+    ITEMMDL_GODDESS_WHITESWORD,
+    ITEMMDL_PRACTICE_SWORD,
+    ITEMMDL_GODDESS_SWORD,
+    ITEMMDL_GODDESS_LONGSWORD,
+    ITEMMDL_MASTER_SWORD,
+    ITEMMDL_TRUE_MASTER_SWORD,
+    ITEMMDL_SAILCLOTH,
+    ITEMMDL_GODDESS_HARP,
+    ITEMMDL_SPIRIT_VESSEL,
+    ITEMMDL_BOW,
+    ITEMMDL_CLAWSHOWS,
+    ITEMMDL_BIRD_STATUETTE,
+    ITEMMDL_AC_BK,
+    ITEMMDL_FS_BK,
+    ITEMMDL_SSH_BK,
+    ITEMMDL_KEY_PIECE,
+    ITEMMDL_SV_BK,
+    ITEMMDL_ET_BK,
+    ITEMMDL_LMF_BK,
+    ITEMMDL_SILVER_RUPEE,
+    ITEMMDL_GOLD_RUPEE,
+    ITEMMDL_RUPOOR,
+    ITEMMDL_5_CRYSTALS,
+    ITEMMDL_GLITTERING_SPORES,
+    ITEMMDL_5_BOMBS,
+    ITEMMDL_10_BOMBS,
+    ITEMMDL_STAMINA_FRUIT,
+    ITEMMDL_FARORE_TEAR,
+    ITEMMDL_DIN_TEAR,
+    ITEMMDL_NAYRU_TEAR,
+    ITEMMDL_SACRED_TEAR,
+    ITEMMDL_LIGHT_FRUIT,
+    ITEMMDL_1_CRYSTAL,
+    ITEMMDL_GUST_BELLOWS,
+    ITEMMDL_DUNGEON_MAP_FI,
+    ITEMMDL_DUNGEON_MAP,
+    ITEMMDL_SLINGSHOT,
+    ITEMMDL_BEETLE,
+    ITEMMDL_WATER,
+    ITEMMDL_MUSHROOM_SPORES,
+    ITEMMDL_DIGGING_MITTS,
+    ITEMMDL_5_DEKU_SEEDS,
+    ITEMMDL_10_DEKU_SEEDS,
+    ITEMMDL_GUARDIAN_POTION,
+    ITEMMDL_GUARDIAN_POTION_PLUS,
+    ITEMMDL_WATER_SCALE,
+    ITEMMDL_BUG_MEDAL,
+    ITEMMDL_BUG_NET,
+    ITEMMDL_FAIRY,
+    ITEMMDL_SACRED_WATER,
+    ITEMMDL_HOOK_BEETLE,
+    ITEMMDL_QUICK_BEETLE,
+    ITEMMDL_TOUGH_BEETLE,
+    ITEMMDL_HEART_POTION,
+    ITEMMDL_HEART_POTION_PLUS,
+    ITEMMDL_HEART_POTION_ALSO_PLUS,
+    ITEMMDL_STAMINA_POTION,
+    ITEMMDL_STAMINA_POTION_PLUS,
+    ITEMMDL_AIR_POTION,
+    ITEMMDL_AIR_POTION_PLUS,
+    ITEMMDL_BOTTLED_FAIRY,
+    ITEMMDL_IRON_BOW,
+    ITEMMDL_SACRED_BOW,
+    ITEMMDL_BOMB_BAG,
+    ITEMMDL_HEART_CONTAINER,
+    ITEMMDL_HEART_PIECE,
+    ITEMMDL_TRI_COURAGE,
+    ITEMMDL_TRI_POWER,
+    ITEMMDL_TRI_WISDOWM,
+    ITEMMDL_SEA_CHART,
+    ITEMMDL_MOGMA_MITTS,
+    ITEMMDL_HEART_MEDAL,
+    ITEMMDL_RUPEE_MEDAL,
+    ITEMMDL_TREASURE_MEDAL,
+    ITEMMDL_POTION_MEDAL,
+    ITEMMDL_CURSED_MEDAL,
+    ITEMMDL_MIGHTY_SCATTERSHOT,
+    ITEMMDL_85,
+    ITEMMDL_MEDIUM_WALLET,
+    ITEMMDL_BIG_WALLET,
+    ITEMMDL_GIANT_WALLET,
+    ITEMMDL_TYCOON_WALLET,
+    ITEMMDL_ADVENTURE_POUCH,
+    ITEMMDL_POUCH_EXPANSION,
+    ITEMMDL_LIFE_MEDAL,
+    ITEMMDL_WOODEN_SHIELD,
+    ITEMMDL_BANDED_SHIELD,
+    ITEMMDL_BRACED_SHIELD,
+    ITEMMDL_IRON_SHIELD,
+    ITEMMDL_REINFORCED_SHIELD,
+    ITEMMDL_FORTIFIED_SHIELD,
+    ITEMMDL_SACRED_SHIELD,
+    ITEMMDL_DIVINE_SHIELD,
+    ITEMMDL_GODDESS_SHIELD,
+    ITEMMDL_HYLIAN_SHIELD,
+    ITEMMDL_REVITALIZING_POTION,
+    ITEMMDL_REVITALIZING_POTION_PLUS,
+    ITEMMDL_SMALL_SEED_SATCHEL,
+    ITEMMDL_MEDIUM_SEED_SATCHEL,
+    ITEMMDL_LARGE_SEED_SATCHEL,
+    ITEMMDL_SMALL_QUIVER,
+    ITEMMDL_MEDIUM_QUIVER,
+    ITEMMDL_LARGE_QUIVER,
+    ITEMMDL_SMALL_BOMB_BAG,
+    ITEMMDL_MEDIUM_BOMB_BAG,
+    ITEMMDL_LARGE_BOMB_BAG,
+    ITEMMDL_WHIP,
+    ITEMMDL_FIRESHIELD_EARRINGS,
+    ITEMMDL_BIG_BUG_NET,
+    ITEMMDL_FARON_GRASSHOPPER,
+    ITEMMDL_WOODLAND_RHINO_BEETLE,
+    ITEMMDL_DEKU_HORNET,
+    ITEMMDL_SKYLOFT_MANTIS,
+    ITEMMDL_VOLCANIC_LADYBUG,
+    ITEMMDL_BLESSED_BUTTERFLY,
+    ITEMMDL_LANAYRU_ANT,
+    ITEMMDL_SAND_CICADA,
+    ITEMMDL_GERUDO_DRAGONFLY,
+    ITEMMDL_ELDIN_ROLLER,
+    ITEMMDL_SKY_STAG_BEETLE,
+    ITEMMDL_STARRY_FIREFLY,
+    ITEMMDL_BOTTLE,
+    ITEMMDL_CAWLIN_LETTER,
+    ITEMMDL_BEEDLE_INSECT_CAGE,
+    ITEMMDL_RATTLE,
+    ITEMMDL_HORNET_LARVAE,
+    ITEMMDL_BIRD_FEATHER,
+    ITEMMDL_TUMBLE_WEED,
+    ITEMMDL_LIZARD_TAIL,
+    ITEMMDL_ELDIN_ORE,
+    ITEMMDL_ANCIENT_FLOWER,
+    ITEMMDL_AMBER_RELIC,
+    ITEMMDL_DUSK_RELIC,
+    ITEMMDL_JELLY_BLOB,
+    ITEMMDL_MONSTER_CLAW,
+    ITEMMDL_MONSTER_HORN,
+    ITEMMDL_ORNAMENTAL_SKULL,
+    ITEMMDL_EVIL_CRYSTAL,
+    ITEMMDL_BLUE_BIRD_FEATHER,
+    ITEMMDL_GOLDEN_SKULL,
+    ITEMMDL_GODDESS_PLUME,
+    ITEMMDL_EMERALD_TABLET,
+    ITEMMDL_RUBY_TABLET,
+    ITEMMDL_AMBER_TABLET,
+    ITEMMDL_STONE_OF_TRIALS,
+    ITEMMDL_BALLAD_OF_THE_GODDESS,
+    ITEMMDL_FARORES_COURAGE,
+    ITEMMDL_NAYRUS_WISDOM,
+    ITEMMDL_DINS_POWER,
+    ITEMMDL_FARON_SOTH,
+    ITEMMDL_ELDIN_SOTH,
+    ITEMMDL_LANAYRU_SOTH,
+    ITEMMDL_ITEM_SOTH,
+    ITEMMDL_REVITALIZING_POTION_PLUS_PLUS,
+    ITEMMDL_HOT_SOUP,
+    ITEMMDL_COLD_SOUP,
+    ITEMMDL_LIFE_TREE_SEED,
+    ITEMMDL_LIFE_TREE_FRUIT,
+    ITEMMDL_EXTRA_WALLET,
+    ITEMMDL_MAX,
+};
+
+bool hasItemMdl(u16 itemId);
+u16 getItemMdlIdx(u16 itemId);
+
+#endif
diff --git a/include/toBeSorted/mdl_base.h b/include/toBeSorted/mdl_base.h
new file mode 100644
index 00000000..5d74297f
--- /dev/null
+++ b/include/toBeSorted/mdl_base.h
@@ -0,0 +1,12 @@
+#ifndef TOBESORTED_MDL_BASE_H
+#define TOBESORTED_MDL_BASE_H
+
+#include "egg/core/eggDisposer.h"
+
+class dMdl_c : public EGG::Disposer {
+protected:
+    dMdl_c();
+    virtual ~dMdl_c();
+};
+
+#endif
-- 
cgit v1.2.3


From dfb2e9048b3e1a6eeeebda7252dab98664d58576 Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Thu, 30 Apr 2026 20:44:33 +0200
Subject: item_mdl_rupee OK

---
 include/toBeSorted/item_mdl.h       |  3 +--
 include/toBeSorted/item_mdl_misc.h  | 13 ++++++-------
 include/toBeSorted/item_mdl_rupee.h | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 include/toBeSorted/item_mdl_rupee.h

(limited to 'include')

diff --git a/include/toBeSorted/item_mdl.h b/include/toBeSorted/item_mdl.h
index 5ed940d0..107f9980 100644
--- a/include/toBeSorted/item_mdl.h
+++ b/include/toBeSorted/item_mdl.h
@@ -1,7 +1,6 @@
 #ifndef TOBESORTED_ITEM_MDL_H
 #define TOBESORTED_ITEM_MDL_H
 
-#include "m/m3d/m_mdl.h"
 #include "m/m_allocator.h"
 #include "m/m_mtx.h"
 #include "m/m_vec.h"
@@ -21,7 +20,7 @@ public:
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) = 0;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) = 0;
     /* 0x1C */ virtual void draw() = 0;
-    /* 0x20 */ virtual void vt_0x20() = 0;
+    /* 0x20 */ virtual void vt_0x20(u16 itemId) = 0;
     /* 0x24 */ virtual void setPriorityDraw() = 0;
     /* 0x28 */ virtual void unsetPriorityDraw() = 0;
     /* 0x2C */ virtual m3d::smdl_c *getMdl() {
diff --git a/include/toBeSorted/item_mdl_misc.h b/include/toBeSorted/item_mdl_misc.h
index e5178dab..0e0bc9dd 100644
--- a/include/toBeSorted/item_mdl_misc.h
+++ b/include/toBeSorted/item_mdl_misc.h
@@ -6,7 +6,6 @@
 #include "m/m3d/m_anmmdl.h"
 #include "m/m3d/m_anmtexpat.h"
 #include "m/m3d/m_anmtexsrt.h"
-#include "m/m3d/m_mdl.h"
 #include "m/m3d/m_smdl.h"
 #include "m/types_m.h"
 #include "toBeSorted/item_mdl.h"
@@ -19,7 +18,7 @@ public:
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20() override;
+    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
 
@@ -61,7 +60,7 @@ public:
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20() override;
+    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
 
@@ -103,7 +102,7 @@ public:
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20() override;
+    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
     /* 0x2C */ virtual m3d::smdl_c *getMdl() override {
@@ -145,7 +144,7 @@ public:
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20() override;
+    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
 
@@ -174,7 +173,7 @@ public:
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20() override;
+    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
     /* 0x2C */ virtual m3d::smdl_c *getMdl() override;
@@ -195,7 +194,7 @@ public:
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20() override;
+    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
     /* 0x2C */ virtual m3d::smdl_c *getMdl() override;
diff --git a/include/toBeSorted/item_mdl_rupee.h b/include/toBeSorted/item_mdl_rupee.h
new file mode 100644
index 00000000..41757072
--- /dev/null
+++ b/include/toBeSorted/item_mdl_rupee.h
@@ -0,0 +1,36 @@
+#ifndef TOBESORTED_ITEM_MDL_RUPEE_H
+#define TOBESORTED_ITEM_MDL_RUPEE_H
+
+#include "m/m3d/m_anmtexpat.h"
+#include "m/m3d/m_smdl.h"
+#include "toBeSorted/item_mdl.h"
+
+
+class dItemMdlRupee_c : public dItemMdl_c {
+public:
+    /* 0x08 */ virtual ~dItemMdlRupee_c() {}
+    /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
+    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
+    /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
+    /* 0x1C */ virtual void draw() override;
+    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x24 */ virtual void setPriorityDraw() override;
+    /* 0x28 */ virtual void unsetPriorityDraw() override;
+
+    static bool isMdlForItemId(u16 itemId);
+
+private:
+    struct MdlConfig {
+        u16 itemId;
+        f32 texPatFrame;
+    };
+    static const MdlConfig sMdlConfig[];
+
+    /* 0x18 */ m3d::smdl_c mMdl1;
+    /* 0x34 */ m3d::smdl_c mMdl2;
+    /* 0x50 */ m3d::anmTexPat_c mAnmTexPat1;
+    /* 0x7C */ m3d::anmTexPat_c mAnmTexPat2;
+};
+
+#endif
-- 
cgit v1.2.3


From 0146842436b0a9217c013ad61ab206b9854bc0c8 Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Thu, 30 Apr 2026 22:38:49 +0200
Subject: item_mdl_item OK

---
 include/d/a/d_a_item.h             |  3 ++-
 include/toBeSorted/item_mdl_item.h | 34 +++++++++++++++++++++++++++
 include/toBeSorted/item_mdl_misc.h | 47 --------------------------------------
 include/toBeSorted/item_mdl_name.h |  2 +-
 4 files changed, 37 insertions(+), 49 deletions(-)
 create mode 100644 include/toBeSorted/item_mdl_item.h

(limited to 'include')

diff --git a/include/d/a/d_a_item.h b/include/d/a/d_a_item.h
index fa07912b..cdaa3115 100644
--- a/include/d/a/d_a_item.h
+++ b/include/d/a/d_a_item.h
@@ -75,12 +75,13 @@ public:
     static u32 getHeartContainerHealthCount();
     static u32 getGratitudeCrystalCount();
 
+    static u32 getTotalRequiredKeyPieceCount();
     static u32 getKeyPieceCount();
     static u32 getSmallKeyCount();
 
     static bool isJellyBlob(ITEM_ID item);
     static bool isStarryFirefly(ITEM_ID item);
-
+    static bool isSlingshot(ITEM_ID item);
     static bool isRupee(ITEM_ID item);
     static bool isKeyPiece(ITEM_ID item);
     static bool isTreasure(ITEM_ID item);
diff --git a/include/toBeSorted/item_mdl_item.h b/include/toBeSorted/item_mdl_item.h
new file mode 100644
index 00000000..d2dbbfd1
--- /dev/null
+++ b/include/toBeSorted/item_mdl_item.h
@@ -0,0 +1,34 @@
+#ifndef TOBESORTED_ITEM_MDL_ITEM_H
+#define TOBESORTED_ITEM_MDL_ITEM_H
+
+#include "m/m3d/m_smdl.h"
+#include "toBeSorted/item_mdl.h"
+
+
+class dItemMdlItem_c : public dItemMdl_c {
+public:
+    /* 0x08 */ virtual ~dItemMdlItem_c() {}
+    /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
+    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
+    /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
+    /* 0x1C */ virtual void draw() override;
+    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x24 */ virtual void setPriorityDraw() override;
+    /* 0x28 */ virtual void unsetPriorityDraw() override;
+    /* 0x2C */ virtual m3d::smdl_c *getMdl() override;
+
+    static bool isMdlForItemId(u16 itemId);
+
+private:
+    struct MdlConfig {
+        const char *resFile;
+        const char *mdlName;
+    };
+    static const MdlConfig sMdlConfig[];
+    static const u8 sMdlIdx[];
+
+    /* 0x18 */ m3d::smdl_c mMdl;
+};
+
+#endif
diff --git a/include/toBeSorted/item_mdl_misc.h b/include/toBeSorted/item_mdl_misc.h
index 0e0bc9dd..a595fbcb 100644
--- a/include/toBeSorted/item_mdl_misc.h
+++ b/include/toBeSorted/item_mdl_misc.h
@@ -25,20 +25,6 @@ public:
     static bool isMdlForItemId(u16 itemId);
 
 private:
-    enum MdlIdx {
-        MDL_PUT_ARROW,
-        MDL_PUT_ARROW_BUNDLE,
-        MDL_PUT_HEART,
-        MDL_PUT_KEY_SMALL,
-        MDL_PUT_BOMB_SET,
-        MDL_PUT_SEED,
-        MDL_PUT_HEART_UTUWA,
-        MDL_PUT_HEART_KAKERA,
-        MDL_PUT_TRI_FORCE,
-        MDL_PUT_GARAGARA,
-        MDL_PUT_MAX,
-    };
-
     struct MdlConfig {
         const char *putResFile;
         const char *putResMdl;
@@ -67,19 +53,6 @@ public:
     static bool isMdlForItemId(u16 itemId);
 
 private:
-    enum ShieldIdx {
-        MDL_SHIELD_WOOD_0,
-        MDL_SHIELD_WOOD_1,
-        MDL_SHIELD_WOOD_2,
-        MDL_SHIELD_IRON_0,
-        MDL_SHIELD_IRON_1,
-        MDL_SHIELD_IRON_2,
-        MDL_SHIELD_HOLY_0,
-        MDL_SHIELD_HOLY_1,
-        MDL_SHIELD_HOLY_2,
-        MDL_SHIELD_MAX
-    };
-
     struct MdlConfig {
         f32 frame;
         const char *resFile;
@@ -112,18 +85,6 @@ public:
     static bool isMdlForItemId(u16 itemId);
 
 private:
-    enum BottleIdx {
-        MDL_BOTTLE_WATER,
-        MDL_BOTTLE_FAIRY,
-        MDL_BOTTLE_HOLY,
-        MDL_BOTTLE_KUSURI,
-        MDL_BOTTLE_KUSURI_S,
-        MDL_BOTTLE_B_FAIRY,
-        MDL_BOTTLE_SOZAI_I,
-        MDL_BOTTLE_PUMPKIN,
-        MDL_BOTTLE_MAX
-    };
-
     struct MdlConfig {
         const char *resFile;
         const char *mdlName;
@@ -202,14 +163,6 @@ public:
     static bool isMdlForItemId(u16 itemId);
 
 private:
-    enum PotionIdx {
-        MDL_POTION_MUTEKI,
-        MDL_POTION_GUTS,
-        MDL_POTION_AIR,
-        MDL_POTION_GENKI,
-        MDL_POTION_MAX,
-    };
-
     struct MdlConfig {
         const char *resFile;
         const char *mdlName;
diff --git a/include/toBeSorted/item_mdl_name.h b/include/toBeSorted/item_mdl_name.h
index 8d678dd0..bf01f59d 100644
--- a/include/toBeSorted/item_mdl_name.h
+++ b/include/toBeSorted/item_mdl_name.h
@@ -25,7 +25,7 @@ enum ItemMdlIdx {
     ITEMMDL_GODDESS_HARP,
     ITEMMDL_SPIRIT_VESSEL,
     ITEMMDL_BOW,
-    ITEMMDL_CLAWSHOWS,
+    ITEMMDL_CLAWSHOTS,
     ITEMMDL_BIRD_STATUETTE,
     ITEMMDL_AC_BK,
     ITEMMDL_FS_BK,
-- 
cgit v1.2.3


From 76ace07831aeade7f71ecbafec767ec09860f1ae Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Thu, 30 Apr 2026 23:11:21 +0200
Subject: rest of the item_mdls OK

---
 include/toBeSorted/item_mdl_light_fruit.h   | 30 +++++++++++++++++++++++++++++
 include/toBeSorted/item_mdl_stamina_fruit.h | 30 +++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 include/toBeSorted/item_mdl_light_fruit.h
 create mode 100644 include/toBeSorted/item_mdl_stamina_fruit.h

(limited to 'include')

diff --git a/include/toBeSorted/item_mdl_light_fruit.h b/include/toBeSorted/item_mdl_light_fruit.h
new file mode 100644
index 00000000..0711ed38
--- /dev/null
+++ b/include/toBeSorted/item_mdl_light_fruit.h
@@ -0,0 +1,30 @@
+#ifndef TOBESORTED_ITEM_MDL_LIGHT_FRUIT_H
+#define TOBESORTED_ITEM_MDL_LIGHT_FRUIT_H
+
+#include "m/m3d/m_smdl.h"
+#include "m/m3d/m_anmtexsrt.h"
+#include "toBeSorted/item_mdl.h"
+
+
+class dItemMdlLightFruit_c : public dItemMdl_c {
+public:
+    /* 0x08 */ virtual ~dItemMdlLightFruit_c() {}
+    /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
+    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
+    /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
+    /* 0x1C */ virtual void draw() override;
+    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x24 */ virtual void setPriorityDraw() override;
+    /* 0x28 */ virtual void unsetPriorityDraw() override;
+
+    static bool isMdlForItemId(u16 itemId);
+
+private:
+    /* 0x18 */ m3d::smdl_c mMdl1;
+    /* 0x34 */ m3d::smdl_c mMdl2;
+    /* 0x50 */ m3d::anmTexSrt_c mAnmTexSrt1;
+    /* 0x7C */ m3d::anmTexSrt_c mAnmTexSrt2;
+};
+
+#endif
diff --git a/include/toBeSorted/item_mdl_stamina_fruit.h b/include/toBeSorted/item_mdl_stamina_fruit.h
new file mode 100644
index 00000000..b2b0adf7
--- /dev/null
+++ b/include/toBeSorted/item_mdl_stamina_fruit.h
@@ -0,0 +1,30 @@
+#ifndef TOBESORTED_ITEM_MDL_STAMINA_FRUIT_H
+#define TOBESORTED_ITEM_MDL_STAMINA_FRUIT_H
+
+#include "m/m3d/m_smdl.h"
+#include "m/m3d/m_anmtexsrt.h"
+#include "toBeSorted/item_mdl.h"
+
+
+class dItemMdlStaminaFruit_c : public dItemMdl_c {
+public:
+    /* 0x08 */ virtual ~dItemMdlStaminaFruit_c() {}
+    /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
+    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
+    /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
+    /* 0x1C */ virtual void draw() override;
+    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x24 */ virtual void setPriorityDraw() override;
+    /* 0x28 */ virtual void unsetPriorityDraw() override;
+
+    static bool isMdlForItemId(u16 itemId);
+
+private:
+    /* 0x18 */ m3d::smdl_c mMdl1;
+    /* 0x34 */ m3d::smdl_c mMdl2;
+    /* 0x50 */ m3d::anmTexSrt_c mAnmTexSrt1;
+    /* 0x7C */ m3d::anmTexSrt_c mAnmTexSrt2;
+};
+
+#endif
-- 
cgit v1.2.3


From 6046f9bd7cb506cfff17aa1327a3f135867c8ed5 Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Sat, 2 May 2026 18:21:12 +0200
Subject: dAcItem_c::{create, createHeap} OK

---
 include/d/a/d_a_base.h             |   5 +-
 include/d/a/d_a_item.h             | 402 +++++++++++++++++++++++++++++++++----
 include/d/a/d_a_itembase.h         |  11 +-
 include/d/col/bg/d_bg_s_acch.h     |   2 +-
 include/d/col/c/c_cc_d.h           |  39 +++-
 include/d/t/d_t_force_get_flag.h   |  13 ++
 include/toBeSorted/item_mdl.h      |   1 +
 include/toBeSorted/item_mdl_misc.h |   1 +
 8 files changed, 428 insertions(+), 46 deletions(-)
 create mode 100644 include/d/t/d_t_force_get_flag.h

(limited to 'include')

diff --git a/include/d/a/d_a_base.h b/include/d/a/d_a_base.h
index 2eae40a1..f063e4e2 100644
--- a/include/d/a/d_a_base.h
+++ b/include/d/a/d_a_base.h
@@ -8,6 +8,7 @@
 #include "m/m_allocator.h"
 #include "m/m_angle.h"
 #include "m/m_vec.h"
+#include "sized_string.h"
 #include "toBeSorted/actor_info.h"
 #include "toBeSorted/raii_ptr.h"
 #include "toBeSorted/sound_info.h"
@@ -109,8 +110,7 @@ public:
     /* 0xEE */ u8 mPolyAttr0;
     /* 0xEF */ u8 mPolyAttr1;
     /* 0xF0 */ u32 mJStudioActor;
-    /* 0xF4 */ char someStr[4];
-    /* 0xF8 */ char field_0xf8[0xfc - 0xf8];
+    /* 0xF4 */ SizedString<8> mSomeStr;
 
 public:
     /* vt 0x08 */ virtual int create();
@@ -240,6 +240,7 @@ public:
     void setParams2UpperByte(u32 val);
     static u32 buildParams2(u32 lower, u32 upper);
     u32 getParams2Lower() const;
+    u32 getFirstBitParams2() const;
     static dAcBase_c *findActor(char *objName, dAcBase_c *parent);
     static dAcBase_c *searchActor(dAcBase_c *parent);
     // Kinda performs the code of the first param on every actor (second param is optional parent)
diff --git a/include/d/a/d_a_item.h b/include/d/a/d_a_item.h
index cdaa3115..c6a22cd1 100644
--- a/include/d/a/d_a_item.h
+++ b/include/d/a/d_a_item.h
@@ -18,10 +18,76 @@
 #include "toBeSorted/actor_event.h"
 #include "toBeSorted/d_emitter.h"
 #include "toBeSorted/dowsing_target.h"
+#include "toBeSorted/item_mdl.h"
 
 class dAcItem_0xB34 {
 public:
-    virtual ~dAcItem_0xB34();
+    virtual ~dAcItem_0xB34() {}
+    virtual void vt_0x0C() = 0;
+    virtual void vt_0x10() = 0;
+};
+
+class dAcItem_0xB34_1 : public dAcItem_0xB34 {
+public:
+    virtual ~dAcItem_0xB34_1() {}
+    virtual void vt_0x0C() override;
+    virtual void vt_0x10() override;
+};
+
+class dAcItem_0xB34_2 : public dAcItem_0xB34 {
+public:
+    virtual ~dAcItem_0xB34_2() {}
+    virtual void vt_0x0C() override;
+    virtual void vt_0x10() override;
+
+private:
+    /* 0x04 */ u8 _0x04[0x0C - 0x04];
+};
+
+class dAcItem_0xB3C {
+public:
+    virtual ~dAcItem_0xB3C() {}
+    virtual void vt_0x0C(u16) = 0;
+    virtual void vt_0x10() = 0;
+    virtual void vt_0x14() = 0;
+    virtual void vt_0x18() = 0;
+
+protected:
+    /* 0x04 */ u8 _0x04[0x08 - 0x04];
+};
+
+class dAcItem_0xB3C_1 : public dAcItem_0xB3C {
+public:
+    dAcItem_0xB3C_1(u16, u16) {}
+    virtual ~dAcItem_0xB3C_1();
+    virtual void vt_0x0C(u16) override;
+    virtual void vt_0x10() override;
+    virtual void vt_0x14() override;
+    virtual void vt_0x18() override;
+};
+
+class dAcItem_0xB3C_2 : public dAcItem_0xB3C {
+public:
+    dAcItem_0xB3C_2(u16 a1, u16 a2) {
+        mCb1 = sCb1s[a1];
+        mCb2 = sCb2s[a2];
+    }
+    virtual ~dAcItem_0xB3C_2();
+    virtual void vt_0x0C(u16) override;
+    virtual void vt_0x10() override;
+    virtual void vt_0x14() override;
+    virtual void vt_0x18() override;
+
+public:
+    typedef void (dAcItem_0xB3C_2::*Callback1)();
+    typedef bool (dAcItem_0xB3C_2::*Callback2)();
+
+    static Callback1 sCb1s[2];
+    static Callback2 sCb2s[3];
+
+    /* 0x08 */ Callback1 mCb1;
+    /* 0x14 */ Callback2 mCb2;
+    /* 0x20 */ u8 _0x20[0x24 - 0x20];
 };
 
 class dAcItem_c : public dAcItemBase_c {
@@ -29,6 +95,12 @@ public:
     dAcItem_c();
     virtual ~dAcItem_c();
 
+    virtual int create() override;
+    virtual bool createHeap() override;
+
+    virtual u16 getItemIdFromParams() override;
+    virtual void setItemId(u16 id);
+
     STATE_FUNC_DECLARE(dAcItem_c, Wait);
     STATE_FUNC_DECLARE(dAcItem_c, Carry);
     STATE_FUNC_DECLARE(dAcItem_c, GetBeetle);
@@ -84,11 +156,35 @@ public:
     static bool isSlingshot(ITEM_ID item);
     static bool isRupee(ITEM_ID item);
     static bool isKeyPiece(ITEM_ID item);
+    static bool isTreasure2(ITEM_ID item);
     static bool isTreasure(ITEM_ID item);
     static bool isTear(ITEM_ID item);
 
+    bool isLightFruit() const;
     bool isSingleArrow() const;
+    bool isArrowBundle() const;
     bool isTriforce() const;
+    bool isGratitudeCrystal() const;
+    bool is5GratitudeCrystals() const;
+    bool isHeart() const;
+    bool isSmallKey() const;
+    bool isGreenRupee() const;
+    bool isBlueRupee() const;
+    bool isRedRupee() const;
+    bool isRupoor() const;
+    bool isSilverRupee() const;
+    bool isGoldRupee() const;
+    bool isSlingshot() const;
+    bool isEldinOre() const;
+    bool isJellyBlob() const;
+    bool isUnkTreasureGroup1() const;
+    bool isHeartPiece() const;
+    bool isTreasure3() const;
+    bool isInsect() const;
+    bool isHeart2() const;
+    bool isAnyRupee() const;
+    bool isAnyTear() const;
+    bool isBabyRattle() const;
 
     u32 getParams2Lower_shift1_0x7() const;
 
@@ -138,7 +234,238 @@ private:
     static bool sIsPerformingInitialCollection;
     static s32 sCollectionCurrentCount;
 
-    /* 0x334 */ UNKTYPE *mpMdl; // Model has its own handling system
+    static s32 sGetItemPouchSlot;
+    static s32 sGetItemQuantity;
+
+    static const mVec3_c sFreestandingDowsingOffset;
+
+    typedef bool (dAcItem_c::*sStaticPtmf)();
+    static const sStaticPtmf sStaticPtmfs[];
+
+    static const ItemInitStruct *getItemInitStructForId(u16 itemId);
+    const ItemInitStruct *getItemInitStruct() const;
+    bool isItemDropFromEnemy() const;
+    static u16 determineActualItemIdFromItem(u16);
+    u16 getItemId2() const;
+    static s32 getSubtypeFromParam(u32 params);
+    void setupUnkColliderFlags2();
+    static bool hitCallback(dAcObjBase_c *i_actorA, cCcD_Obj *i_objInfA, dAcObjBase_c *i_actorB, cCcD_Obj *i_objInfB);
+    void fn_80253F90(bool);
+    void fn_80256790();
+    void fn_802567D0();
+    void onTouchLink();
+    void fn_80255DF0();
+    void fn_80254BB0();
+    void setDespawnTimer(u16 timer);
+    void applyBoundingBox();
+    s32 getTearIdx();
+    void setFreestandingYOffset(f32);
+    void fn_8024DF30(u32 flags);
+
+    // static PTMF callbacks
+    bool fn_80248020();
+    bool fn_80248010();
+    bool fn_80255B30();
+    bool fn_80255BA0();
+    bool fn_80248040();
+    bool fn_80248030();
+    bool fn_80255BD0();
+    bool fn_80255C40();
+
+    // PTMF callbacks
+    f32 fn_80254DE0();
+    f32 fn_80254DF0();
+
+    f32 getSmallKeyFreestandingScale();
+    f32 getLowValueRupeeFreestandingScale();
+    f32 getHighValueRupeeFreestandingScale();
+    f32 getSlingshotFreestandingScale();
+    f32 getEldinOreFreestandingScale();
+    f32 getJellyBlobFreestandingScale();
+    f32 getUnkTreasureGroup1FreestandingScale();
+    f32 getHeartPieceFreestandingScale();
+    f32 getGratitudeCrystalFreestandingScale();
+    f32 getDefaultFreestandingScale();
+
+    f32 callGetFreestandingModelScale();
+
+    f32 getTreasure3Scale();
+    f32 getInsectScale();
+    f32 getDefaultScale();
+    
+    f32 getHighValueRupeePickupScale();
+    f32 getDefaultPickupScale();
+
+    void moveNormal0();
+    void moveNormal1();
+    void moveSpecial();
+
+    void fn_802555D0();
+    void fn_802555F0();
+
+    void bounceNone();
+    void bounceNormal();
+    void bounceRupee();
+
+    void fn_802558F0();
+    void fn_80255AE0();
+    void fn_802558E0();
+
+    bool fn_80248060();
+    bool fn_80248050();
+    bool fn_80255D50();
+    bool fn_80255DB0();
+
+    void setLowValueRupeeBoundingBox();
+    void setHighValueRupeeBoundingBox();
+    void setArrowBundleBoundingBox();
+    void setDefaultBoundingBox();
+
+    f32 getSmallKeyGravity1();
+    f32 getGreenRupeeGravity1();
+    f32 getBlueRupeeGravity1();
+    f32 getRedRupeeGravity1();
+    f32 getHeartGravity1();
+    f32 getSingleArrowGravity1();
+    f32 getArrowBundleGravity1();
+    f32 getSilverRupeeGravity1();
+    f32 getGoldRupeeGravity1();
+    f32 getRupoorGravity1();
+    f32 get5BombsGravity1();
+    f32 get10BombsGravity1();
+    f32 getFaroreTearGravity1();
+    f32 get5SeedsGravity1();
+    f32 getDefaultGravity1();
+
+    f32 getHeartGravity2();
+
+    f32 getGreenRupeeGravity3();
+    f32 getBlueRupeeGravity3();
+    f32 getRedRupeeGravity3();
+    f32 getRupoorGravity3();
+    f32 getSilverRupeeGravity3();
+    f32 getGoldRupeeGravity3();
+
+    f32 getSmallKeyGravity4();
+    f32 getGreenRupeeGravity4();
+    f32 getBlueRupeeGravity4();
+    f32 getRedRupeeGravity4();
+    f32 getHeartGravity4();
+    f32 getSingleArrowGravity4();
+    f32 getArrowBundleGravity4();
+    f32 getSilverRupeeGravity4();
+    f32 getGoldRupeeGravity4();
+    f32 getRupoorGravity4();
+    f32 get5BombsGravity4();
+    f32 get10BombsGravity4();
+    f32 getFaroreTearGravity4();
+    f32 get5SeedsGravity4();
+    f32 getDefaultGravit4();
+
+    f32 getGreenRupeeDirHitKnockback();
+    f32 getBlueRupeeDirHitKnockback();
+    f32 getRedRupeeDirHitKnockback();
+    f32 getSilverRupeeDirHitKnockback();
+    f32 getGoldRupeeDirHitKnockback();
+    f32 getRupoorDirHitKnockback();
+
+    f32 getGreenRupeeDirHitKnockbackRand();
+    f32 getBlueRupeeDirHitKnockbackRand();
+    f32 getRedRupeeDirHitKnockbackRand();
+    f32 getSilverRupeeDirHitKnockbackRand();
+    f32 getGoldRupeeDirHitKnockbackRand();
+    f32 getRupoorDirHitKnockbackRand();
+
+    f32 getGreenRupeeHitKnockback();
+    f32 getBlueRupeeHitKnockback();
+    f32 getRedRupeeHitKnockback();
+    f32 getSilverRupeeHitKnockback();
+    f32 getGoldRupeeHitKnockback();
+    f32 getRupoorHitKnockback();
+
+    f32 getGreenRupeeHitKnockbackRand();
+    f32 getBlueRupeeHitKnockbackRand();
+    f32 getRedRupeeHitKnockbackRand();
+    f32 getSilverRupeeHitKnockbackRand();
+    f32 getGoldRupeeHitKnockbackRand();
+    f32 getRupoorHitKnockbackRand();
+
+    f32 getGreenRupeeHitSquareDistance2();
+    f32 getBlueRupeeHitSquareDistance2();
+    f32 getRedRupeeHitSquareDistance2();
+    f32 getSilverRupeeHitSquareDistance2();
+    f32 getGoldRupeeHitSquareDistance2();
+    f32 getRupoorHitSquareDistance2();
+    f32 getHeartHitSquareDistance2();
+
+    f32 getGreenRupeeDirHitKnockback2();
+    f32 getBlueRupeeDirHitKnockback2();
+    f32 getRedRupeeDirHitKnockback2();
+    f32 getSilverRupeeDirHitKnockback2();
+    f32 getGoldRupeeDirHitKnockback2();
+    f32 getRupoorDirHitKnockback2();
+    f32 getHeartDirHitKnockback2();
+
+    f32 getGreenRupeeDirHitKnockbackRand2();
+    f32 getBlueRupeeDirHitKnockbackRand2();
+    f32 getRedRupeeDirHitKnockbackRand2();
+    f32 getSilverRupeeDirHitKnockbackRand2();
+    f32 getGoldRupeeDirHitKnockbackRand2();
+    f32 getRupoorDirHitKnockbackRand2();
+    f32 getHeartDirHitKnockbackRand2();
+
+    f32 getGreenRupeeHitKnockback2();
+    f32 getBlueRupeeHitKnockback2();
+    f32 getRedRupeeHitKnockback2();
+    f32 getSilverRupeeHitKnockback2();
+    f32 getGoldRupeeHitKnockback2();
+    f32 getRupoorHitKnockback2();
+    f32 getHeartHitKnockback2();
+
+    f32 getGreenRupeeHitKnockbackRand2();
+    f32 getBlueRupeeHitKnockbackRand2();
+    f32 getRedRupeeHitKnockbackRand2();
+    f32 getSilverRupeeHitKnockbackRand2();
+    f32 getGoldRupeeHitKnockbackRand2();
+    f32 getRupoorHitKnockbackRand2();
+    f32 getHeartHitKnockbackRand2();
+
+    f32 getGreenRupeeDirHitKnockback3();
+    f32 getBlueRupeeDirHitKnockback3();
+    f32 getRedRupeeDirHitKnockback3();
+    f32 getSilverRupeeDirHitKnockback3();
+    f32 getGoldRupeeDirHitKnockback3();
+    f32 getRupoorDirHitKnockback3();
+    f32 getHeartDirHitKnockback3();
+
+    f32 getGreenRupeeDirHitKnockbackRand3();
+    f32 getBlueRupeeDirHitKnockbackRand3();
+    f32 getRedRupeeDirHitKnockbackRand3();
+    f32 getSilverRupeeDirHitKnockbackRand3();
+    f32 getGoldRupeeDirHitKnockbackRand3();
+    f32 getRupoorDirHitKnockbackRand3();
+    f32 getHeartDirHitKnockbackRand3();
+
+    f32 getGreenRupeeHitKnockback3();
+    f32 getBlueRupeeHitKnockback3();
+    f32 getRedRupeeHitKnockback3();
+    f32 getSilverRupeeHitKnockback3();
+    f32 getGoldRupeeHitKnockback3();
+    f32 getRupoorHitKnockback3();
+    f32 getHeartHitKnockback3();
+
+    f32 getGreenRupeeHitKnockbackRand3();
+    f32 getBlueRupeeHitKnockbackRand3();
+    f32 getRedRupeeHitKnockbackRand3();
+    f32 getSilverRupeeHitKnockbackRand3();
+    f32 getGoldRupeeHitKnockbackRand3();
+    f32 getRupoorHitKnockbackRand3();
+    f32 getHeartHitKnockbackRand3();
+
+    f32 fn_802577C0();
+    f32 fn_802577D0();
+
+    /* 0x334 */ dItemMdl_c *mpMdl;
     /* 0x338 */ dShadowCircle_c mShdw;
     /* 0x340 */ mVec3_c field_0x340;
     /* 0x34C */ nw4r::ut::Color mColorFilter;
@@ -157,45 +484,45 @@ private:
     /* 0xA2C */ dEmitter_c mEff_0xA2C;
     /* 0xA60 */ dEmitter_c mEff_0xA60;
     /* 0xA94 */ dAcRef_c<dAcOScatterSand> mCoveredSand;
-    /* 0xAA0 */ dAcRef_c<dAcObjBase_c> mUnkRef;
+    /* 0xAA0 */ dAcRef_c<dAcObjBase_c> mForceSignRef;
     /* 0xAAC */ mVec3_c posCopy;
     /* 0xAB8 */ fLiNdBa_c mNode;
     /* 0xAC4 */ ActorEventRelated mEventRelated;
     /* 0xB14 */ DowsingTarget mDowsingTarget;
     /* 0xB34 */ dAcItem_0xB34 *field_0xB34[2];
-    /* 0xB34 */ dAcItem_0xB34 *field_0xB3C;
-    /* 0xB40 */ UNKTYPE (dAcItem_c::*mFunc_0xB40)(UNKTYPE);
-    /* 0xB4C */ UNKTYPE (dAcItem_c::*mFunc_0xB4C)(UNKTYPE);
-    /* 0xB58 */ UNKTYPE (dAcItem_c::*mFunc_0xB58)(UNKTYPE);
-    /* 0xB64 */ UNKTYPE (dAcItem_c::*mFunc_0xB64)(UNKTYPE);
-    /* 0xB70 */ UNKTYPE (dAcItem_c::*mFunc_0xB70)(UNKTYPE);
-    /* 0xB7C */ UNKTYPE (dAcItem_c::*mFunc_0xB7C)(UNKTYPE);
-    /* 0xB88 */ UNKTYPE (dAcItem_c::*mFunc_0xB88)(UNKTYPE);
-    /* 0xB94 */ UNKTYPE (dAcItem_c::*mFunc_0xB94)(UNKTYPE);
-    /* 0xBA0 */ UNKTYPE (dAcItem_c::*mFunc_0xBA0)(UNKTYPE);
+    /* 0xB34 */ dAcItem_0xB3C *field_0xB3C;
+    /* 0xB40 */ void (dAcItem_c::*mFnAction)();
+    /* 0xB4C */ void (dAcItem_c::*mFnBounce)();
+    /* 0xB58 */ void (dAcItem_c::*mFunc_0xB58)();
+    /* 0xB64 */ void (dAcItem_c::*mFnAction3)();
+    /* 0xB70 */ bool (dAcItem_c::*mFnAction4)();
+    /* 0xB7C */ f32 (dAcItem_c::*mFnGetGravity1)();
+    /* 0xB88 */ f32 (dAcItem_c::*mFnGetHeartGravity)();
+    /* 0xB94 */ f32 (dAcItem_c::*mFnGetRupeeGravity)();
+    /* 0xBA0 */ f32 (dAcItem_c::*mFnGetGravity4)();
     /* 0xBAC */ UNKTYPE (dAcItem_c::*mFunc_0xBAC)(UNKTYPE);
     /* 0xBB8 */ UNKTYPE (dAcItem_c::*mFunc_0xBB8)(UNKTYPE);
-    /* 0xBC4 */ UNKTYPE (dAcItem_c::*mFunc_0xBC4)(UNKTYPE);
-    /* 0xBD0 */ UNKTYPE (dAcItem_c::*mFunc_0xBD0)(UNKTYPE);
-    /* 0xBDC */ UNKTYPE (dAcItem_c::*mFunc_0xBDC)(UNKTYPE);
-    /* 0xBE8 */ UNKTYPE (dAcItem_c::*mFunc_0xBE8)(UNKTYPE);
-    /* 0xBF4 */ UNKTYPE (dAcItem_c::*mFunc_0xBF4)(UNKTYPE);
-    /* 0xC00 */ UNKTYPE (dAcItem_c::*mFunc_0xC00)(UNKTYPE);
-    /* 0xC0C */ UNKTYPE (dAcItem_c::*mFunc_0xC0C)(UNKTYPE);
-    /* 0xC18 */ UNKTYPE (dAcItem_c::*mFunc_0xC18)(UNKTYPE);
-    /* 0xC24 */ UNKTYPE (dAcItem_c::*mFunc_0xC24)(UNKTYPE);
-    /* 0xC30 */ UNKTYPE (dAcItem_c::*mFunc_0xC30)(UNKTYPE);
-    /* 0xC3C */ UNKTYPE (dAcItem_c::*mFunc_0xC3C)(UNKTYPE);
-    /* 0xC48 */ UNKTYPE (dAcItem_c::*mFunc_0xC48)(UNKTYPE);
-    /* 0xC54 */ UNKTYPE (dAcItem_c::*mFunc_0xC54)(UNKTYPE);
-    /* 0xC60 */ UNKTYPE (dAcItem_c::*mFunc_0xC60)(UNKTYPE);
-    /* 0xC6C */ UNKTYPE (dAcItem_c::*mFunc_0xC6C)(UNKTYPE);
-    /* 0xC78 */ UNKTYPE (dAcItem_c::*mFunc_0xC78)(UNKTYPE);
-    /* 0xC84 */ UNKTYPE (dAcItem_c::*mFunc_0xC84)(UNKTYPE);
-    /* 0xC90 */ UNKTYPE (dAcItem_c::*mFunc_0xC90)(UNKTYPE);
+    /* 0xBC4 */ f32 (dAcItem_c::*mFnGetFreestandingScale)();
+    /* 0xBD0 */ f32 (dAcItem_c::*mFnGetScale)();
+    /* 0xBDC */ f32 (dAcItem_c::*mFnGetPickupDemoScale)();
+    /* 0xBE8 */ f32 (dAcItem_c::*mFnCallGetFreestandingScale)();
+    /* 0xBF4 */ f32 (dAcItem_c::*mFnGetDirHitKnockback)();
+    /* 0xC00 */ f32 (dAcItem_c::*mFnGetDirHitKnockbackRand)();
+    /* 0xC0C */ f32 (dAcItem_c::*mFnGetHitKnockback)();
+    /* 0xC18 */ f32 (dAcItem_c::*mFnGetHitKnockbackRand)();
+    /* 0xC24 */ f32 (dAcItem_c::*mFnGetHitSquareDistance2)();
+    /* 0xC30 */ f32 (dAcItem_c::*mFnGetDirHitKnockback2)();
+    /* 0xC3C */ f32 (dAcItem_c::*mFnGetDirHitKnockbackRand2)();
+    /* 0xC48 */ f32 (dAcItem_c::*mFnGetHitKnockback2)();
+    /* 0xC54 */ f32 (dAcItem_c::*mFnGetHitKnockbackRand2)();
+    /* 0xC60 */ f32 (dAcItem_c::*mFnGetDirHitKnockback3)();
+    /* 0xC6C */ f32 (dAcItem_c::*mFnGetDirHitKnockbackRand3)();
+    /* 0xC78 */ f32 (dAcItem_c::*mFnGetHitKnockback3)();
+    /* 0xC84 */ f32 (dAcItem_c::*mFnGetHitKnockbackRand3)();
+    /* 0xC90 */ f32 (dAcItem_c::*mFn_0xC90)();
     /* 0xC9C */ UNKTYPE (dAcItem_c::*mFunc_0xC9C)(UNKTYPE);
-    /* 0xCA8 */ UNKTYPE (dAcItem_c::*mFunc_0xCA8)(UNKTYPE);
-    /* 0xCB4 */ UNKTYPE (dAcItem_c::*mFunc_0xCB4)(UNKTYPE);
+    /* 0xCA8 */ void (dAcItem_c::*mFnSetBoundingBox)();
+    /* 0xCB4 */ f32 (dAcItem_c::*mFn_0xCB4)(void);
     /* 0xCC0 */ dAcRef_c<dAcItem_c> mItemQueuePrev;
     /* 0xCCC */ dAcRef_c<dAcItem_c> mItemQueueNext;
     /* 0xCD8 */ f32 field_0xCD8;
@@ -210,11 +537,11 @@ private:
     /* 0xD08 */ u8 _D08[0xD14 - 0xD08];
     /* 0xD14 */ f32 mFreestandingOffsetH;
     /* 0xD18 */ f32 field_0xD18;
-    /* 0xD1C */ int mGetItemPouchSlot;
-    /* 0xD20 */ int field_0xD20;
+    /* 0xD1C */ s32 mGetItemPouchSlot;
+    /* 0xD20 */ s32 field_0xD20;
     /* 0xD24 */ u8 _D24[0xD2C - 0xD24];
     /* 0xD2C */ u32 mFramesInAir;
-    /* 0xD30 */ int mItemQuantity;
+    /* 0xD30 */ s32 mItemQuantity;
     /* 0xD34 */ u32 mItemFlags;
     /* 0xD38 */ mAng3_c field_0xD38;
     /* 0xD3E */ u16 field_0xD3E;
@@ -222,8 +549,7 @@ private:
     /* 0xD42 */ s16 field_0xD42;
     /* 0xD44 */ u16 mRealItemId;
     /* 0xD46 */ s16 mDespawnTimer;
-    /* 0xD48 */ u8 field_0xD48;
-    /* 0xD49 */ u8 field_0xD49;
+    /* 0xD48 */ u16 field_0xD48;
     /* 0xD4A */ u8 field_0xD4A;
     /* 0xD4B */ u8 field_0xD4B;
     /* 0xD4C */ u8 field_0xD4C;
diff --git a/include/d/a/d_a_itembase.h b/include/d/a/d_a_itembase.h
index 9f91e60d..23f64926 100644
--- a/include/d/a/d_a_itembase.h
+++ b/include/d/a/d_a_itembase.h
@@ -234,11 +234,17 @@ struct ItemFlagStruct {
     u8 mFlagKind;
     u8 field_0x07;
 };
+
+struct ItemInitStruct {
+    u8 _0x00[0x0D - 0x00];
+};
+
 class dAcItemBase_c : public dAcObjBase_c {
 public:
     dAcItemBase_c() {}
     virtual ~dAcItemBase_c() {}
     virtual u16 getItemId();
+    virtual u16 getItemIdFromParams() = 0;
 
     static bool isValidItemTypeIdx(int itemId);
     static bool getItemTypeFromId(u16 itemID, u32 *pOutType);
@@ -254,9 +260,12 @@ public:
         return mId;
     }
 
-private:
+protected:
     u16 mId;
 
+    const ItemFlagStruct* getItemFlagStruct() const;
+    static const ItemFlagStruct* getItemFlagStruct(u16 id);
+
     static const ItemFlagStruct sDefaultFlagStruct;
     static const ItemFlagStruct sItemFlagStructs[167];
     static const u32 sItemTypeFlags[MAX_ITEM_ID - 1];
diff --git a/include/d/col/bg/d_bg_s_acch.h b/include/d/col/bg/d_bg_s_acch.h
index 0d12de5d..6756420f 100644
--- a/include/d/col/bg/d_bg_s_acch.h
+++ b/include/d/col/bg/d_bg_s_acch.h
@@ -388,7 +388,7 @@ public:
     // bool ChkRoofHit() {
     //     return MaskRoofHit();
     // }
-    void OffClrSpeedY() {
+    void SetClrSpeedY() {
         mFlags |= CLR_SPEED_Y;
     }
     bool ChkClrSpeedY() {
diff --git a/include/d/col/c/c_cc_d.h b/include/d/col/c/c_cc_d.h
index 58bf05e9..23e88d40 100644
--- a/include/d/col/c/c_cc_d.h
+++ b/include/d/col/c/c_cc_d.h
@@ -461,6 +461,10 @@ public:
     void OffRPrm(u32 m) {
         mRPrm = (mRPrm & ~m) | m;
     }
+
+    void SetCallback(cCcD_HitCallback cb) {
+        mHit_cb = cb;
+    }
 };
 
 class cCcD_ObjAt : public cCcD_GAtTgCoCommonBase {
@@ -491,10 +495,6 @@ public:
         return MskSPrm(1);
     }
 
-    void SetCallback(cCcD_HitCallback cb) {
-        mHit_cb = cb;
-    }
-
     u32 MskType(u32 mask) const {
         return mSrc.mType & mask;
     }
@@ -657,6 +657,10 @@ public:
         field_0x4B = val;
     }
 
+    void SetSrcField_0x0C(u16 val) {
+        mSrc.field_0x0C = val;
+    }
+
     void SetInfo_0x1(u8 val) {
         mSrc.mInfo.field_0x1 = val;
     }
@@ -665,6 +669,10 @@ public:
         mSrc.mInfo.field_0x2 = val;
     }
 
+    void OnInfo_0x2(u16 val) {
+        mSrc.mInfo.field_0x2 |= val;
+    }
+
 public:
     /* 0x1C */ cCcD_SrcGObjTg mSrc;
     /* 0x2C */ mVec3_c mAtHitDir;
@@ -858,6 +866,10 @@ public:
         mTg.SetFlag_0xA(flag);
     }
 
+    void SetTgSrcField_0x0C(u16 val) {
+        mTg.SetSrcField_0x0C(val);
+    }
+
     bool ChkTgHit() {
         return mTg.MskRPrm(1) != 0 && mTg.GetActor() != nullptr;
     }
@@ -917,6 +929,10 @@ public:
         mAt.SetCallback(cb);
     }
 
+    void SetCoCallback(cCcD_HitCallback cb) {
+        mCo.SetCallback(cb);
+    }
+
     u32 ChkTgNoAtHitInfSet() const {
         return mTg.MskSPrm(0x40);
     }
@@ -997,6 +1013,12 @@ public:
     void OnTgElectric() {
         return mTg.OnSPrm(0x40000);
     }
+    void OnTg_0x800000() {
+        return mTg.OnSPrm(0x800000);
+    }
+    void OnTg_0x1000000() {
+        return mTg.OnSPrm(0x1000000);
+    }
     void OnTg_0x8000000() {
         return mTg.OnSPrm(0x8000000);
     }
@@ -1006,6 +1028,9 @@ public:
     void ClrTg_0x10000() {
         return mTg.OffSPrm(0x10000);
     }
+    void ClrTg_0x800000() {
+        return mTg.OffSPrm(0x800000);
+    }
     void ClrTg_0x8000000() {
         return mTg.OffSPrm(0x8000000);
     }
@@ -1016,6 +1041,9 @@ public:
     void OnTg_0x200000() {
         mTg.OnSPrm(0x200000);
     }
+    void ClrTg_0x200000() {
+        mTg.OffSPrm(0x200000);
+    }
 
     void SetTg_0x4B(u8 val) {
         mTg.Set_0x4B(val);
@@ -1026,6 +1054,9 @@ public:
     void SetTgInfo_0x2(u16 val) {
         mTg.SetInfo_0x2(val);
     }
+    void OnTgInfo_0x2(u16 val) {
+        mTg.OnInfo_0x2(val);
+    }
     void SetTg_0x40000000() {
         mTg.OnSPrm(0x40000000);
     }
diff --git a/include/d/t/d_t_force_get_flag.h b/include/d/t/d_t_force_get_flag.h
new file mode 100644
index 00000000..b2dbcba5
--- /dev/null
+++ b/include/d/t/d_t_force_get_flag.h
@@ -0,0 +1,13 @@
+#ifndef D_T_FORCE_GET_FLAG_H
+#define D_T_FORCE_GET_FLAG_H
+
+#include "d/t/d_tg.h"
+
+class dTgForceGetFlag_c : public dTg_c {
+public:
+    static u32 tearIdxToParam(s32 tearNumber);
+
+private:
+};
+
+#endif
diff --git a/include/toBeSorted/item_mdl.h b/include/toBeSorted/item_mdl.h
index 107f9980..d4771617 100644
--- a/include/toBeSorted/item_mdl.h
+++ b/include/toBeSorted/item_mdl.h
@@ -14,6 +14,7 @@ class dAcItem_c;
 // vtable at 80533eb0
 class dItemMdl_c : public dMdl_c {
 public:
+    dItemMdl_c() : field_0x14(ITEM_MDL_UNK0x14_0) {}
     /* 0x08 */ virtual ~dItemMdl_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) = 0;
     /* 0x10 */ virtual void vt_0x10(u8) = 0;
diff --git a/include/toBeSorted/item_mdl_misc.h b/include/toBeSorted/item_mdl_misc.h
index a595fbcb..d34c9ff1 100644
--- a/include/toBeSorted/item_mdl_misc.h
+++ b/include/toBeSorted/item_mdl_misc.h
@@ -69,6 +69,7 @@ private:
 // Maybe a bad name because fairies etc. are also supported
 class dItemMdlBottle_c : public dItemMdl_c {
 public:
+    dItemMdlBottle_c() : mFlags(0) {}
     /* 0x08 */ virtual ~dItemMdlBottle_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
     /* 0x10 */ virtual void vt_0x10(u8) override;
-- 
cgit v1.2.3


From f9754e2edad7e1b69718970b66b07b4194c511ec Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Sat, 2 May 2026 23:50:58 +0200
Subject: dAcItem_c::executeState_Wait almost OK

---
 include/d/a/d_a_base.h   |  1 +
 include/d/a/d_a_item.h   | 26 ++++++++++++++++++++++++--
 include/d/col/c/c_cc_d.h |  5 +++++
 3 files changed, 30 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/d/a/d_a_base.h b/include/d/a/d_a_base.h
index f063e4e2..5bfb0c53 100644
--- a/include/d/a/d_a_base.h
+++ b/include/d/a/d_a_base.h
@@ -238,6 +238,7 @@ public:
     void setParams2Upper_ignoreLower(u32 val);
     int getParams2UpperByte();
     void setParams2UpperByte(u32 val);
+    bool isFirstBitParams2NotSet();
     static u32 buildParams2(u32 lower, u32 upper);
     u32 getParams2Lower() const;
     u32 getFirstBitParams2() const;
diff --git a/include/d/a/d_a_item.h b/include/d/a/d_a_item.h
index c6a22cd1..98952d59 100644
--- a/include/d/a/d_a_item.h
+++ b/include/d/a/d_a_item.h
@@ -100,6 +100,8 @@ public:
 
     virtual u16 getItemIdFromParams() override;
     virtual void setItemId(u16 id);
+    virtual bool shouldDespawn();
+    virtual bool isItemSmallKeyOrHeartPieceOrStaminaFruit();
 
     STATE_FUNC_DECLARE(dAcItem_c, Wait);
     STATE_FUNC_DECLARE(dAcItem_c, Carry);
@@ -242,6 +244,9 @@ private:
     typedef bool (dAcItem_c::*sStaticPtmf)();
     static const sStaticPtmf sStaticPtmfs[];
 
+    static dAcRef_c<dAcObjBase_c> sItemListHead;
+    static dAcRef_c<dAcObjBase_c> sItemListTail;
+
     static const ItemInitStruct *getItemInitStructForId(u16 itemId);
     const ItemInitStruct *getItemInitStruct() const;
     bool isItemDropFromEnemy() const;
@@ -262,6 +267,23 @@ private:
     void setFreestandingYOffset(f32);
     void fn_8024DF30(u32 flags);
 
+    bool fn_80255CF0();
+    bool fn_802574A0();
+    void addToGetQueue();
+    static bool fn_8024A230();
+    void unsetHaveNoGravity();
+    void fn_80252A80();
+    void tickDespawnTimer();
+    void fn_80253D50();
+    bool fn_802577A0();
+    void fn_80256F20();
+    bool fn_80256E80();
+    bool fn_80255C50(u32 specialCode);
+    bool fn_80255CA0(u32 specialCode);
+    void getCurrentModelScale(f32 *scale);
+    void makeLinkLookTowardItem();
+    void fn_80254CA0();
+
     // static PTMF callbacks
     bool fn_80248020();
     bool fn_80248010();
@@ -548,8 +570,8 @@ private:
     /* 0xD40 */ mAng mMdlRotY;
     /* 0xD42 */ s16 field_0xD42;
     /* 0xD44 */ u16 mRealItemId;
-    /* 0xD46 */ s16 mDespawnTimer;
-    /* 0xD48 */ u16 field_0xD48;
+    /* 0xD46 */ u16 mDespawnTimer;
+    /* 0xD48 */ mAng field_0xD48;
     /* 0xD4A */ u8 field_0xD4A;
     /* 0xD4B */ u8 field_0xD4B;
     /* 0xD4C */ u8 field_0xD4C;
diff --git a/include/d/col/c/c_cc_d.h b/include/d/col/c/c_cc_d.h
index 23e88d40..d5fa19bb 100644
--- a/include/d/col/c/c_cc_d.h
+++ b/include/d/col/c/c_cc_d.h
@@ -833,6 +833,11 @@ public:
         mCo.OnSPrm(f);
     }
 
+    void OffTgCoFlag(u32 f) {
+        mTg.OffSPrm(f);
+        mCo.OffSPrm(f);
+    }
+
     void SetAtType(u32 type) {
         mAt.SetType(type);
     }
-- 
cgit v1.2.3


From 9843fc692291bf7532d0b26430d306e2dc47098d Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Sun, 3 May 2026 20:56:05 +0200
Subject: Item progress

---
 include/d/a/d_a_base.h                    |   1 -
 include/d/a/d_a_item.h                    | 211 ++++++++++++++++++++++++++++--
 include/d/a/d_a_itembase.h                |   2 +-
 include/d/a/obj/d_a_obj_warp.h            |   9 +-
 include/d/d_pouch.h                       |   3 +
 include/d/t/d_t_minigame_insect_capture.h |   8 ++
 include/d/t/d_t_siren.h                   |  11 +-
 7 files changed, 228 insertions(+), 17 deletions(-)

(limited to 'include')

diff --git a/include/d/a/d_a_base.h b/include/d/a/d_a_base.h
index 5bfb0c53..f063e4e2 100644
--- a/include/d/a/d_a_base.h
+++ b/include/d/a/d_a_base.h
@@ -238,7 +238,6 @@ public:
     void setParams2Upper_ignoreLower(u32 val);
     int getParams2UpperByte();
     void setParams2UpperByte(u32 val);
-    bool isFirstBitParams2NotSet();
     static u32 buildParams2(u32 lower, u32 upper);
     u32 getParams2Lower() const;
     u32 getFirstBitParams2() const;
diff --git a/include/d/a/d_a_item.h b/include/d/a/d_a_item.h
index 98952d59..7928765a 100644
--- a/include/d/a/d_a_item.h
+++ b/include/d/a/d_a_item.h
@@ -18,7 +18,9 @@
 #include "toBeSorted/actor_event.h"
 #include "toBeSorted/d_emitter.h"
 #include "toBeSorted/dowsing_target.h"
-#include "toBeSorted/item_mdl.h"
+
+class dItemMdl_c;
+class dAcItem_c;
 
 class dAcItem_0xB34 {
 public:
@@ -52,6 +54,12 @@ public:
     virtual void vt_0x14() = 0;
     virtual void vt_0x18() = 0;
 
+    void fn_802579D0();
+    bool fn_80257A10(dAcItem_c*);
+    bool fn_80257A80();
+    void fn_80257AC0();
+    bool fn_80257B10();
+
 protected:
     /* 0x04 */ u8 _0x04[0x08 - 0x04];
 };
@@ -95,8 +103,11 @@ public:
     dAcItem_c();
     virtual ~dAcItem_c();
 
-    virtual int create() override;
     virtual bool createHeap() override;
+    virtual int create() override;
+    virtual int doDelete() override;
+    virtual int actorExecute() override;
+    virtual int draw() override;
 
     virtual u16 getItemIdFromParams() override;
     virtual void setItemId(u16 id);
@@ -136,11 +147,15 @@ public:
 
     static s32 getTotalBombCount();
     static s32 getTotalArrowCount();
+    static s32 getBowArrowCount();
     static s32 getTotalSeedCount();
+    static s32 getSlingshotSeedCount();
 
     static s32 getTotalBombCapacity();
-    static s32 getTotalSeedCapacity();
+    static s32 getBowArrowCapacity();
     static s32 getTotalArrowCapacity();
+    static s32 getTotalSeedCapacity();
+    static s32 getSlingshotSeedCapacity();
 
     static s32 getRupeeCounter();
     static u32 getCurrentWalletCapacity();
@@ -161,10 +176,13 @@ public:
     static bool isTreasure2(ITEM_ID item);
     static bool isTreasure(ITEM_ID item);
     static bool isTear(ITEM_ID item);
+    static bool isAnyPouchItem(ITEM_ID item);
+    static bool isUpgradedPotion(ITEM_ID item);
 
     bool isLightFruit() const;
     bool isSingleArrow() const;
     bool isArrowBundle() const;
+    bool isAnyArrow() const;
     bool isTriforce() const;
     bool isGratitudeCrystal() const;
     bool is5GratitudeCrystals() const;
@@ -183,10 +201,26 @@ public:
     bool isHeartPiece() const;
     bool isTreasure3() const;
     bool isInsect() const;
-    bool isHeart2() const;
     bool isAnyRupee() const;
     bool isAnyTear() const;
     bool isBabyRattle() const;
+    bool is10DekuSeeds() const;
+    bool isAnyBombs() const;
+    bool isLifeTreeFruit() const;
+    bool isBirdStatuette() const;
+
+    // These go through the vtable to retrieve the item id. Can't think of a better name for now
+    bool isKeyPieceV() const;
+    bool isHeartV() const;
+    bool isTreasureV() const;
+    bool isGratitudeCrystalV() const;
+    bool is5GratitudeCrystalsV() const;
+    bool isFairyV() const;
+    bool isBottleFairyV() const;
+    bool isStarryFireflyV() const;
+    bool isAnyRupeeV() const;
+
+    static void increaseRupeeCounter(s32 by);
 
     u32 getParams2Lower_shift1_0x7() const;
 
@@ -194,8 +228,6 @@ public:
     static void itemGetEventStart(dAcBase_c *);
     static void itemGetEventEnd(dAcBase_c *);
 
-    static void addRupees(s32 amount);
-
     static bool hasAnyFairy();
 
     enum Trial_e {
@@ -240,6 +272,8 @@ private:
     static s32 sGetItemQuantity;
 
     static const mVec3_c sFreestandingDowsingOffset;
+    static const mVec3_c sScale1Maybe;
+    static const mVec3_c sScale2Maybe;
 
     typedef bool (dAcItem_c::*sStaticPtmf)();
     static const sStaticPtmf sStaticPtmfs[];
@@ -249,10 +283,103 @@ private:
 
     static const ItemInitStruct *getItemInitStructForId(u16 itemId);
     const ItemInitStruct *getItemInitStruct() const;
+
+    static void setTreasureTempCollect(u16 id);
+    static void setSpawnQuantity(s32 quantity);
+    static void unsetSpawnQuantity();
+
+    void setObtainedItemId(u32, bool);
+    bool checkItemFlagV() const;
+    void setItemFlagV();
+    bool checkFlagV() const;
+    void setFlagV();
+    void setSceneFlag();
+    void setDungeonFlag();
+
+    static void increaseKeyPieceCounter(s32 by);
+    static void increaseHeartPieceCounter(s32 by);
+    static void increaseTotalHeartPieceCounter(s32 by);
+    static void increaseFaronGrasshopperCounter(s32 by);
+    static s32 getFaronGrasshooperCounter();
+    static void increaseWoodlandRhinoBeetleCounter(s32 by);
+    static s32 getWoodlandRhinoBeetleCounter();
+    static void increaseDekuHornetCounter(s32 by);
+    static s32 getDekuHornetCounter();
+    static void increaseSkyloftMantisCounter(s32 by);
+    static s32 getSkyloftMantisCounter();
+    static void increaseVolcanicLadybugCounter(s32 by);
+    static s32 getVolcanicLadybugCounter();
+    static void increaseBlessedButterflyCounter(s32 by);
+    static s32 getBlessedButterflyCounter();
+    static void increaseLanayruAntCounter(s32 by);
+    static s32 getLanayruAntCounter();
+    static void increaseSandCicadaCounter(s32 by);
+    static s32 getSandCicadaCounter();
+    static void increaseGerudoDragonflyCounter(s32 by);
+    static s32 getGerudoDragonflyCounter();
+    static void increaseEldinRollerCounter(s32 by);
+    static s32 getEldinRollerCounter();
+    static void increaseSkyStagBeetleCounter(s32 by);
+    static s32 getSkyStagBeetleCounter();
+    static void increaseStarryFireflyCounter(s32 by);
+    static s32 getStarryFireflyCounter();
+    static void increaseHornetLarvaeCounter(s32 by);
+    static s32 getHornetLarvaeCounter();
+    static void increaseBirdFeatherCounter(s32 by);
+    static s32 getBirdFeatherCounter();
+    static void increaseTumbleWeedCounter(s32 by);
+    static s32 getTumbleWeedCounter();
+    static void increaseLizardTailCounter(s32 by);
+    static s32 getLizardTailCounter();
+    static void increaseEldinOreCounter(s32 by);
+    static s32 getEldinOreCounter();
+    static void increaseAncientFlowerCounter(s32 by);
+    static s32 getAncientFlowerCounter();
+    static void increaseAmberRelicCounter(s32 by);
+    static s32 getAmberRelicCounter();
+    static void increaseDuskRelicCounter(s32 by);
+    static s32 getDuskRelicCounter();
+    static void increaseJellyBlobCounter(s32 by);
+    static s32 getJellyBlobCounter();
+    static void increaseMonsterClawCounter(s32 by);
+    static s32 getMonsterClawCounter();
+    static void increaseMonsterHornCounter(s32 by);
+    static s32 getMonsterHornCounter();
+    static void increaseSkullCounter(s32 by);
+    static s32 getSkullCounter();
+    static void increaseEvilCrystalCounter(s32 by);
+    static s32 getEvilCrystalCounter();
+    static void increaseBlueBirdFeatherCounter(s32 by);
+    static s32 getBlueBirdFeatherCounter();
+    static void increaseGoldenSkullCounter(s32 by);
+    static s32 getGoldenSkullCounter();
+    static void increaseGoddessPlumeCounter(s32 by);
+    static s32 getGoddessPlumeCounter();
+    static void increaseGratitudeCrystalCounter(s32 by);
+    static s32 getGratitudeCrystalCounter();
+    static void increaseExtraWalletCounter(s32 by);
+    static s32 getExtraWalletCounter();
+    static void increaseSmallKeyCounter(s32 by);
+    static void increaseArrowCounter(s32 by);
+    static void increaseDekuSeedCounter(s32 by);
+    static void increaseArrowAndPouchCounter(s32 by);
+    static void increaseBombAndPouchCounter(s32 by);
+    static void increaseDekuSeedAndPouchCounter(s32 by);
+    static void increaseExtraPouchCounter(s32 by);
+
+    static void increaseHealthCapacity(s32 by);
+    static void setLifeTreeSeedlingFlag(s32 by);
+
+    static s32 getLightFruitTime();
+    static s32 getNumRemainingHeartPiecesForNextHeart();
+    static void doFullHeal();
+    static void restoreStamina();
+
     bool isItemDropFromEnemy() const;
     static u16 determineActualItemIdFromItem(u16);
     u16 getItemId2() const;
     static s32 getSubtypeFromParam(u32 params);
+    bool isFirstBitParams2NotSet();
     void setupUnkColliderFlags2();
     static bool hitCallback(dAcObjBase_c *i_actorA, cCcD_Obj *i_objInfA, dAcObjBase_c *i_actorB, cCcD_Obj *i_objInfB);
     void fn_80253F90(bool);
@@ -265,11 +392,15 @@ private:
     void applyBoundingBox();
     s32 getTearIdx();
     void setFreestandingYOffset(f32);
-    void fn_8024DF30(u32 flags);
+    void setFramesInAir(u32 numFrames);
+    void unsetFramesInAir();
+    void incrementFramesInAir();
+    void setItemFlags(u32 flags);
 
     bool fn_80255CF0();
     bool fn_802574A0();
     void addToGetQueue();
+    void removeFromGetQueue();
     static bool fn_8024A230();
     void unsetHaveNoGravity();
     void fn_80252A80();
@@ -281,9 +412,56 @@ private:
     bool fn_80255C50(u32 specialCode);
     bool fn_80255CA0(u32 specialCode);
     void getCurrentModelScale(f32 *scale);
+    f32 getCurrentScale();
+    void fn_802518C0(mVec3_c *out);
     void makeLinkLookTowardItem();
     void fn_80254CA0();
 
+    void fn_802546A0();
+    void fn_80254710();
+    void fn_80254790();
+
+    bool checkAbovePosition();
+
+    bool isMdlHidden() const;
+    static bool isBlinkBeforeDespawnShown(s32 timer);
+
+    void performCollection();
+    void performCollectionPart1();
+    void performCollectionPart2();
+
+    void fn_80254BC0();
+    void fn_80255B10();
+    void updateLightingMaybe();
+
+    void fn_80253E20();
+    void fn_80254BA0();
+
+    void setNotWaiting();
+    void fn_802548A0();
+    void decideOnGetOrForcedGet();
+
+    void fn_80256710(mVec3_c &);
+    void fn_80257560(const mVec3_c &);
+    void fn_80254D10();
+    bool fn_80254D70();
+    void fn_802542E0();
+
+    static bool fn_80247BB0();
+    bool checkShouldDemo();
+    bool fn_80254EC0();
+    void addGetEvent();
+    void fn_80254590(mVec3_c &);
+    void fn_80254680();
+    void fn_80254810();
+    static s16 getItemRotateAngle();
+
+    static void getItemGetEventName(u16 id, char *const *name);
+
+    // Could also return vector
+    static void fn_80247540(mVec3_c &);
+    void fn_80247560(const mVec3_c &);
+
     // static PTMF callbacks
     bool fn_80248020();
     bool fn_80248010();
@@ -314,7 +492,7 @@ private:
     f32 getTreasure3Scale();
     f32 getInsectScale();
     f32 getDefaultScale();
-    
+
     f32 getHighValueRupeePickupScale();
     f32 getDefaultPickupScale();
 
@@ -487,6 +665,9 @@ private:
     f32 fn_802577C0();
     f32 fn_802577D0();
 
+    void fn_80255E80();
+    void fn_80255F40();
+
     /* 0x334 */ dItemMdl_c *mpMdl;
     /* 0x338 */ dShadowCircle_c mShdw;
     /* 0x340 */ mVec3_c field_0x340;
@@ -542,7 +723,7 @@ private:
     /* 0xC78 */ f32 (dAcItem_c::*mFnGetHitKnockback3)();
     /* 0xC84 */ f32 (dAcItem_c::*mFnGetHitKnockbackRand3)();
     /* 0xC90 */ f32 (dAcItem_c::*mFn_0xC90)();
-    /* 0xC9C */ UNKTYPE (dAcItem_c::*mFunc_0xC9C)(UNKTYPE);
+    /* 0xC9C */ void (dAcItem_c::*mFn_0xC9C)();
     /* 0xCA8 */ void (dAcItem_c::*mFnSetBoundingBox)();
     /* 0xCB4 */ f32 (dAcItem_c::*mFn_0xCB4)(void);
     /* 0xCC0 */ dAcRef_c<dAcItem_c> mItemQueuePrev;
@@ -556,18 +737,22 @@ private:
     /* 0xCF0 */ u8 _CF0[0xD00 - 0xCF0];
     /* 0xD00 */ f32 field_0xD00;
     /* 0xD04 */ f32 field_0xD04;
-    /* 0xD08 */ u8 _D08[0xD14 - 0xD08];
+    /* 0xD08 */ u8 _D08[0xD0C - 0xD08];
+    /* 0xD0C */ f32 field_0xD0C;
+    /* 0xD10 */ u8 _D10[0xD14 - 0xD10];
     /* 0xD14 */ f32 mFreestandingOffsetH;
     /* 0xD18 */ f32 field_0xD18;
     /* 0xD1C */ s32 mGetItemPouchSlot;
     /* 0xD20 */ s32 field_0xD20;
     /* 0xD24 */ u8 _D24[0xD2C - 0xD24];
     /* 0xD2C */ u32 mFramesInAir;
-    /* 0xD30 */ s32 mItemQuantity;
+    /* 0xD30 */ u32 mItemQuantity;
     /* 0xD34 */ u32 mItemFlags;
-    /* 0xD38 */ mAng3_c field_0xD38;
+    /* 0xD38 */ s16 field_0xD38;
+    /* 0xD3A */ s16 field_0xD3A;
+    /* 0xD3C */ s16 field_0xD3C;
     /* 0xD3E */ u16 field_0xD3E;
-    /* 0xD40 */ mAng mMdlRotY;
+    /* 0xD40 */ s16 mMdlRotY;
     /* 0xD42 */ s16 field_0xD42;
     /* 0xD44 */ u16 mRealItemId;
     /* 0xD46 */ u16 mDespawnTimer;
diff --git a/include/d/a/d_a_itembase.h b/include/d/a/d_a_itembase.h
index 23f64926..d0f29f23 100644
--- a/include/d/a/d_a_itembase.h
+++ b/include/d/a/d_a_itembase.h
@@ -243,7 +243,7 @@ class dAcItemBase_c : public dAcObjBase_c {
 public:
     dAcItemBase_c() {}
     virtual ~dAcItemBase_c() {}
-    virtual u16 getItemId();
+    virtual u16 getItemId() const;
     virtual u16 getItemIdFromParams() = 0;
 
     static bool isValidItemTypeIdx(int itemId);
diff --git a/include/d/a/obj/d_a_obj_warp.h b/include/d/a/obj/d_a_obj_warp.h
index 33bb80de..ccba8330 100644
--- a/include/d/a/obj/d_a_obj_warp.h
+++ b/include/d/a/obj/d_a_obj_warp.h
@@ -63,9 +63,16 @@ public:
             || isLanayruTrialAndCompleted()
             || isHyliaTrialAndCompleted();
     }
+
+    void onCollectFirstTear() {
+        mFirstTearCollected = true;
+    }
+
 private:
-    /* 0x330 */ u8 field_0x330[0xC66-0x330];
+    /* 0x330 */ u8 field_0x330[0xC66 - 0x330];
     /* 0xC66 */ u8 mTrialIndexBitmask;
+    /* 0xC67 */ u8 field_0xC67[0xC8D - 0xC67];
+    /* 0xC8D */ bool mFirstTearCollected;
     /* 0x??? */ STATE_MGR_DECLARE(dAcOWarp_c);
 };
 
diff --git a/include/d/d_pouch.h b/include/d/d_pouch.h
index 6ef2f808..3b3ae555 100644
--- a/include/d/d_pouch.h
+++ b/include/d/d_pouch.h
@@ -29,4 +29,7 @@ void sortStock();
 
 u16 itemCheckFindItemSlot(ITEM_ID item);
 
+void collectPouchItem(u16 id);
+void collectPouchItemIntoSlot(s32 slot, u16 id, u32, bool);
+
 #endif
diff --git a/include/d/t/d_t_minigame_insect_capture.h b/include/d/t/d_t_minigame_insect_capture.h
index c905809e..a634ce63 100644
--- a/include/d/t/d_t_minigame_insect_capture.h
+++ b/include/d/t/d_t_minigame_insect_capture.h
@@ -1,6 +1,7 @@
 #ifndef D_T_MINIGAME_INSECT_CAPTURE_H
 #define D_T_MINIGAME_INSECT_CAPTURE_H
 
+#include "d/a/d_a_base.h"
 #include "d/t/d_tg.h"
 
 class dTgMinigameInsectCapture_c : public dTg_c {
@@ -8,7 +9,14 @@ public:
     dTgMinigameInsectCapture_c();
     virtual ~dTgMinigameInsectCapture_c();
 
+    static dTgMinigameInsectCapture_c *GetInstance() {
+        return sInstance.get();
+    }
+
+    void recordCollectedInsect(s32 id, s32 count);
+
 private:
+    static dAcRef_c<dTgMinigameInsectCapture_c> sInstance;
 };
 
 #endif
diff --git a/include/d/t/d_t_siren.h b/include/d/t/d_t_siren.h
index 77456fa7..9cda9b7e 100644
--- a/include/d/t/d_t_siren.h
+++ b/include/d/t/d_t_siren.h
@@ -31,12 +31,21 @@ public:
         return sInstance->_hasCollectedAllTears();
     }
 
+    static void setLightFruitTime(u16 time) {
+        if (sInstance == nullptr) {
+            return;
+        }
+        sInstance->mPillarTime = time;
+    }
+
 private:
     bool outOfTime() const;
     bool _hasCollectedAllTears();
     static dTgSiren_c *sInstance;
 
-    /* 0x0FC */ u8 _0x0FC[0x2C0 - 0x0FC];
+    /* 0x0FC */ u8 _0x0FC[0x140 - 0x0FC];
+    /* 0x140 */ u32 mPillarTime;
+    /* 0x144 */ u8 _0x144[0x2C0 - 0x144];
     /* 0x2C0 */ Timekeeper mTimekeeper;
 };
 
-- 
cgit v1.2.3


From 02bab6f41fc616ca7d9aa77f4a81782d65b16200 Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Sun, 3 May 2026 21:26:44 +0200
Subject: Fixes

---
 include/d/a/d_a_item.h                      |  8 +++---
 include/d/col/c/c_cc_d.h                    |  4 +--
 include/toBeSorted/item_mdl.h               | 18 ++++++-------
 include/toBeSorted/item_mdl_item.h          |  4 +--
 include/toBeSorted/item_mdl_light_fruit.h   | 12 ++++-----
 include/toBeSorted/item_mdl_misc.h          | 40 ++++++++++++++---------------
 include/toBeSorted/item_mdl_rupee.h         | 12 ++++-----
 include/toBeSorted/item_mdl_stamina_fruit.h | 12 ++++-----
 8 files changed, 55 insertions(+), 55 deletions(-)

(limited to 'include')

diff --git a/include/d/a/d_a_item.h b/include/d/a/d_a_item.h
index 7928765a..8c28c148 100644
--- a/include/d/a/d_a_item.h
+++ b/include/d/a/d_a_item.h
@@ -241,10 +241,10 @@ public:
     static Trial_e getCurrentTrial();
 
     enum Tear_e {
-        TEAR_0,
-        TEAR_1,
-        TEAR_2,
-        TEAR_3,
+        TEAR_FARON,
+        TEAR_ELDIN,
+        TEAR_LANAYRU,
+        TEAR_GODDESS,
         TEAR_MAX
     };
 
diff --git a/include/d/col/c/c_cc_d.h b/include/d/col/c/c_cc_d.h
index d5fa19bb..edd178ee 100644
--- a/include/d/col/c/c_cc_d.h
+++ b/include/d/col/c/c_cc_d.h
@@ -351,7 +351,7 @@ enum dCcD_ObjAtType {
     /* 0x 0001 0000 */ AT_TYPE_BELLOWS = (1 << 16),
     /* 0x 0002 0000 */ AT_TYPE_0x20000 = (1 << 17),
     /* 0x 0004 0000 */ AT_TYPE_0x40000 = (1 << 18),
-    /* 0x 0008 0000 */ AT_TYPE_0x80000 = (1 << 19),
+    /* 0x 0008 0000 */ AT_TYPE_GLITTERING_SPORES = (1 << 19),
     /* 0x 0010 0000 */ AT_TYPE_BUBBLE = (1 << 20),
     /* 0x 0020 0000 */ AT_TYPE_0x200000 = (1 << 21),
     /* 0x 0040 0000 */ AT_TYPE_BEETLE = (1 << 22),
@@ -361,7 +361,7 @@ enum dCcD_ObjAtType {
     /* 0x 0400 0000 */ AT_TYPE_KOLOKTOS_SWORD = (1 << 26),
     /* 0x 0800 0000 */ AT_TYPE_0x8000000 = (1 << 27),
     /* 0x 0148 8200 */ AT_TYPE_COMMON0 =
-        AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_0x80000 | AT_TYPE_0x8000 | AT_TYPE_WIND,
+        AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_GLITTERING_SPORES | AT_TYPE_0x8000 | AT_TYPE_WIND,
 };
 
 enum cCcD_AtModifiers_e {
diff --git a/include/toBeSorted/item_mdl.h b/include/toBeSorted/item_mdl.h
index d4771617..9897be10 100644
--- a/include/toBeSorted/item_mdl.h
+++ b/include/toBeSorted/item_mdl.h
@@ -14,30 +14,30 @@ class dAcItem_c;
 // vtable at 80533eb0
 class dItemMdl_c : public dMdl_c {
 public:
-    dItemMdl_c() : field_0x14(ITEM_MDL_UNK0x14_0) {}
+    dItemMdl_c() : mDrawMode(DrawMode_None) {}
     /* 0x08 */ virtual ~dItemMdl_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) = 0;
-    /* 0x10 */ virtual void vt_0x10(u8) = 0;
+    /* 0x10 */ virtual void setDrawMode(u8) = 0;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) = 0;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) = 0;
     /* 0x1C */ virtual void draw() = 0;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) = 0;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) = 0;
     /* 0x24 */ virtual void setPriorityDraw() = 0;
     /* 0x28 */ virtual void unsetPriorityDraw() = 0;
     /* 0x2C */ virtual m3d::smdl_c *getMdl() {
         return nullptr;
     }
 
-    enum ItemMdl0x14_e {
-        ITEM_MDL_UNK0x14_0,
-        ITEM_MDL_UNK0x14_1,
-        ITEM_MDL_UNK0x14_2,
-        ITEM_MDL_UNK0x14_3,
+    enum DrawMode_e {
+        DrawMode_None,
+        DrawMode_Put,
+        DrawMode_Get,
+        DrawMode_Max,
     };
 
 protected:
     /* 0x10 */ dAcItem_c *mpItem;
-    /* 0x14 */ u8 field_0x14;
+    /* 0x14 */ u8 mDrawMode;
 };
 
 #endif
diff --git a/include/toBeSorted/item_mdl_item.h b/include/toBeSorted/item_mdl_item.h
index d2dbbfd1..e6f27aef 100644
--- a/include/toBeSorted/item_mdl_item.h
+++ b/include/toBeSorted/item_mdl_item.h
@@ -9,11 +9,11 @@ class dItemMdlItem_c : public dItemMdl_c {
 public:
     /* 0x08 */ virtual ~dItemMdlItem_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
     /* 0x2C */ virtual m3d::smdl_c *getMdl() override;
diff --git a/include/toBeSorted/item_mdl_light_fruit.h b/include/toBeSorted/item_mdl_light_fruit.h
index 0711ed38..3278da3e 100644
--- a/include/toBeSorted/item_mdl_light_fruit.h
+++ b/include/toBeSorted/item_mdl_light_fruit.h
@@ -10,21 +10,21 @@ class dItemMdlLightFruit_c : public dItemMdl_c {
 public:
     /* 0x08 */ virtual ~dItemMdlLightFruit_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
 
     static bool isMdlForItemId(u16 itemId);
 
 private:
-    /* 0x18 */ m3d::smdl_c mMdl1;
-    /* 0x34 */ m3d::smdl_c mMdl2;
-    /* 0x50 */ m3d::anmTexSrt_c mAnmTexSrt1;
-    /* 0x7C */ m3d::anmTexSrt_c mAnmTexSrt2;
+    /* 0x18 */ m3d::smdl_c mPutMdl;
+    /* 0x34 */ m3d::smdl_c mGetMdl;
+    /* 0x50 */ m3d::anmTexSrt_c mPutAnmTexSrt;
+    /* 0x7C */ m3d::anmTexSrt_c mGetAnmTexSrt;
 };
 
 #endif
diff --git a/include/toBeSorted/item_mdl_misc.h b/include/toBeSorted/item_mdl_misc.h
index d34c9ff1..ffee644f 100644
--- a/include/toBeSorted/item_mdl_misc.h
+++ b/include/toBeSorted/item_mdl_misc.h
@@ -14,11 +14,11 @@ class dItemMdlPut_c : public dItemMdl_c {
 public:
     /* 0x08 */ virtual ~dItemMdlPut_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
 
@@ -34,19 +34,19 @@ private:
     static const MdlConfig sMdlConfig[];
     static const u8 sMdlIdx[];
 
-    /* 0x18 */ m3d::smdl_c mGetMdl;
-    /* 0x34 */ m3d::smdl_c mPutMdl;
+    /* 0x18 */ m3d::smdl_c mPutMdl;
+    /* 0x34 */ m3d::smdl_c mGetMdl;
 };
 
 class dItemMdlShield_c : public dItemMdl_c {
 public:
     /* 0x08 */ virtual ~dItemMdlShield_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
 
@@ -72,11 +72,11 @@ public:
     dItemMdlBottle_c() : mFlags(0) {}
     /* 0x08 */ virtual ~dItemMdlBottle_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
     /* 0x2C */ virtual m3d::smdl_c *getMdl() override {
@@ -102,11 +102,11 @@ class dItemMdlTear_c : public dItemMdl_c {
 public:
     /* 0x08 */ virtual ~dItemMdlTear_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
 
@@ -119,23 +119,23 @@ private:
     static const MdlConfig sMdlConfig[];
     static const u8 sMdlIdx[];
 
-    /* 0x18 */ m3d::smdl_c mMdl1;
-    /* 0x34 */ m3d::smdl_c mMdl2;
-    /* 0x50 */ m3d::anmTexPat_c mAnmTexPat1;
-    /* 0x7C */ m3d::anmTexPat_c mAnmTexPat2;
-    /* 0xA8 */ m3d::anmTexSrt_c mAnmTexSrt1;
-    /* 0xD4 */ m3d::anmTexSrt_c mAnmTexSrt2;
+    /* 0x18 */ m3d::smdl_c mPutMdl;
+    /* 0x34 */ m3d::smdl_c mGetMdl;
+    /* 0x50 */ m3d::anmTexPat_c mPutAnmTexPat;
+    /* 0x7C */ m3d::anmTexPat_c mGetAnmTexPat;
+    /* 0xA8 */ m3d::anmTexSrt_c mPutAnmTexSrt;
+    /* 0xD4 */ m3d::anmTexSrt_c mGetAnmTexSrt;
 };
 
 class dItemMdlFirefly_c : public dItemMdl_c {
 public:
     /* 0x08 */ virtual ~dItemMdlFirefly_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
     /* 0x2C */ virtual m3d::smdl_c *getMdl() override;
@@ -152,11 +152,11 @@ class dItemMdlPotion_c : public dItemMdl_c {
 public:
     /* 0x08 */ virtual ~dItemMdlPotion_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
     /* 0x2C */ virtual m3d::smdl_c *getMdl() override;
diff --git a/include/toBeSorted/item_mdl_rupee.h b/include/toBeSorted/item_mdl_rupee.h
index 41757072..1882516e 100644
--- a/include/toBeSorted/item_mdl_rupee.h
+++ b/include/toBeSorted/item_mdl_rupee.h
@@ -10,11 +10,11 @@ class dItemMdlRupee_c : public dItemMdl_c {
 public:
     /* 0x08 */ virtual ~dItemMdlRupee_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
 
@@ -27,10 +27,10 @@ private:
     };
     static const MdlConfig sMdlConfig[];
 
-    /* 0x18 */ m3d::smdl_c mMdl1;
-    /* 0x34 */ m3d::smdl_c mMdl2;
-    /* 0x50 */ m3d::anmTexPat_c mAnmTexPat1;
-    /* 0x7C */ m3d::anmTexPat_c mAnmTexPat2;
+    /* 0x18 */ m3d::smdl_c mPutMdl;
+    /* 0x34 */ m3d::smdl_c mGetMdl;
+    /* 0x50 */ m3d::anmTexPat_c mPutAnmTexPat;
+    /* 0x7C */ m3d::anmTexPat_c mGetAnmTexPat;
 };
 
 #endif
diff --git a/include/toBeSorted/item_mdl_stamina_fruit.h b/include/toBeSorted/item_mdl_stamina_fruit.h
index b2b0adf7..f8cd9d32 100644
--- a/include/toBeSorted/item_mdl_stamina_fruit.h
+++ b/include/toBeSorted/item_mdl_stamina_fruit.h
@@ -10,21 +10,21 @@ class dItemMdlStaminaFruit_c : public dItemMdl_c {
 public:
     /* 0x08 */ virtual ~dItemMdlStaminaFruit_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
 
     static bool isMdlForItemId(u16 itemId);
 
 private:
-    /* 0x18 */ m3d::smdl_c mMdl1;
-    /* 0x34 */ m3d::smdl_c mMdl2;
-    /* 0x50 */ m3d::anmTexSrt_c mAnmTexSrt1;
-    /* 0x7C */ m3d::anmTexSrt_c mAnmTexSrt2;
+    /* 0x18 */ m3d::smdl_c mPutMdl;
+    /* 0x34 */ m3d::smdl_c mGetMdl;
+    /* 0x50 */ m3d::anmTexSrt_c mPutAnmTexSrt;
+    /* 0x7C */ m3d::anmTexSrt_c mGetAnmTexSrt;
 };
 
 #endif
-- 
cgit v1.2.3


From 48fbe8d1da7a82412a73746620291af93354364a Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Thu, 7 May 2026 19:52:36 +0200
Subject: Progress

---
 include/d/a/d_a_item.h     | 120 ++++++++++++++++++++++++++++++++-------------
 include/d/a/d_a_itembase.h |   1 +
 include/d/d_angle.h        |  17 +++++++
 3 files changed, 104 insertions(+), 34 deletions(-)
 create mode 100644 include/d/d_angle.h

(limited to 'include')

diff --git a/include/d/a/d_a_item.h b/include/d/a/d_a_item.h
index 8c28c148..8d06e468 100644
--- a/include/d/a/d_a_item.h
+++ b/include/d/a/d_a_item.h
@@ -1,14 +1,16 @@
 #ifndef D_A_ITEM_H
 #define D_A_ITEM_H
 
+// clang-format off
+// vtable order
 #include "common.h"
+#include "d/d_shadow.h"
 #include "d/a/d_a_base.h"
 #include "d/a/d_a_itembase.h"
 #include "d/a/obj/d_a_obj_scattersand.h"
 #include "d/col/bg/d_bg_s_acch.h"
 #include "d/col/c/c_cc_d.h"
 #include "d/col/cc/d_cc_d.h"
-#include "d/d_shadow.h"
 #include "f/f_list_mg.h"
 #include "f/f_list_nd.h"
 #include "m/m_angle.h"
@@ -18,84 +20,100 @@
 #include "toBeSorted/actor_event.h"
 #include "toBeSorted/d_emitter.h"
 #include "toBeSorted/dowsing_target.h"
+// clang-format on
 
 class dItemMdl_c;
 class dAcItem_c;
 
+/** Positions picked up items for a bit. */
 class dAcItem_0xB34 {
 public:
     virtual ~dAcItem_0xB34() {}
     virtual void vt_0x0C() = 0;
-    virtual void vt_0x10() = 0;
+    virtual bool vt_0x10(dAcItem_c *item) = 0;
 };
 
+/** No-op impl that immediately hides the item */
 class dAcItem_0xB34_1 : public dAcItem_0xB34 {
 public:
     virtual ~dAcItem_0xB34_1() {}
     virtual void vt_0x0C() override;
-    virtual void vt_0x10() override;
+    virtual bool vt_0x10(dAcItem_c *item) override;
 };
 
+/** Impl that positions picked up items above Link's head */
 class dAcItem_0xB34_2 : public dAcItem_0xB34 {
 public:
     virtual ~dAcItem_0xB34_2() {}
     virtual void vt_0x0C() override;
-    virtual void vt_0x10() override;
+    virtual bool vt_0x10(dAcItem_c *item) override;
 
 private:
-    /* 0x04 */ u8 _0x04[0x0C - 0x04];
+    /* 0x04 */ f32 mHighestRelativeHeadHeight;
+    /* 0x08 */ u8 mNumFrames;
 };
 
+/** Respawns certain items. */
 class dAcItem_0xB3C {
 public:
     virtual ~dAcItem_0xB3C() {}
     virtual void vt_0x0C(u16) = 0;
     virtual void vt_0x10() = 0;
-    virtual void vt_0x14() = 0;
-    virtual void vt_0x18() = 0;
+    virtual bool vt_0x14(dAcItem_c *) = 0;
+    virtual UNKWORD vt_0x18() = 0;
 
     void fn_802579D0();
-    bool fn_80257A10(dAcItem_c*);
-    bool fn_80257A80();
+    bool fn_80257A10(dAcItem_c *);
+    void fn_80257A80();
     void fn_80257AC0();
-    bool fn_80257B10();
+    bool fn_80257B10() const;
 
 protected:
-    /* 0x04 */ u8 _0x04[0x08 - 0x04];
+    /* 0x04 */ UNKWORD field_0x04;
 };
 
+/** No-op impl that doesn't respawn items */
 class dAcItem_0xB3C_1 : public dAcItem_0xB3C {
 public:
     dAcItem_0xB3C_1(u16, u16) {}
-    virtual ~dAcItem_0xB3C_1();
+    virtual ~dAcItem_0xB3C_1() {}
     virtual void vt_0x0C(u16) override;
     virtual void vt_0x10() override;
-    virtual void vt_0x14() override;
-    virtual void vt_0x18() override;
+    virtual bool vt_0x14(dAcItem_c *) override;
+    virtual UNKWORD vt_0x18() override;
 };
 
+/** Impl that respawns items */
 class dAcItem_0xB3C_2 : public dAcItem_0xB3C {
 public:
     dAcItem_0xB3C_2(u16 a1, u16 a2) {
         mCb1 = sCb1s[a1];
         mCb2 = sCb2s[a2];
     }
-    virtual ~dAcItem_0xB3C_2();
+    virtual ~dAcItem_0xB3C_2() {}
     virtual void vt_0x0C(u16) override;
     virtual void vt_0x10() override;
-    virtual void vt_0x14() override;
-    virtual void vt_0x18() override;
+    virtual bool vt_0x14(dAcItem_c *) override;
+    virtual UNKWORD vt_0x18() override;
 
 public:
     typedef void (dAcItem_0xB3C_2::*Callback1)();
+    // May or may not take a dAcItem_c* argument...
     typedef bool (dAcItem_0xB3C_2::*Callback2)();
 
     static Callback1 sCb1s[2];
     static Callback2 sCb2s[3];
 
+    void Cb1_1();
+    void Cb1_2();
+
+    bool Cb2_1();
+    bool Cb2_2();
+    bool Cb2_3();
+
     /* 0x08 */ Callback1 mCb1;
     /* 0x14 */ Callback2 mCb2;
-    /* 0x20 */ u8 _0x20[0x24 - 0x20];
+    /* 0x20 */ UNKWORD field_0x20;
 };
 
 class dAcItem_c : public dAcItemBase_c {
@@ -110,10 +128,17 @@ public:
     virtual int draw() override;
 
     virtual u16 getItemIdFromParams() override;
-    virtual void setItemId(u16 id);
+    virtual void setItemId(u16 id) override;
     virtual bool shouldDespawn();
     virtual bool isItemSmallKeyOrHeartPieceOrStaminaFruit();
 
+    enum ItemGetAnim_e {
+        ANIM_DEFAULT,
+        ANIM_GORGEOUS,
+        ANIM_FROWN,
+        ANIM_SMALL,
+    };
+
     STATE_FUNC_DECLARE(dAcItem_c, Wait);
     STATE_FUNC_DECLARE(dAcItem_c, Carry);
     STATE_FUNC_DECLARE(dAcItem_c, GetBeetle);
@@ -141,9 +166,11 @@ public:
     static void setFlag(s32 id);
     static bool checkTreasureTempCollect(u16 itemId);
 
-    void setItemPosition(const mVec3_c &);
     void getItemFromBWheelItem();
-    bool isStateWait();
+    void setItemPosition(const mVec3_c &);
+    void setItemVelocity(f32 f);
+    bool isStateWait() const;
+    void stopCarryAndGet();
 
     static s32 getTotalBombCount();
     static s32 getTotalArrowCount();
@@ -224,7 +251,10 @@ public:
 
     u32 getParams2Lower_shift1_0x7() const;
 
+    static bool getEventNameForAnim(u32 anim, const char **outName);
+    static bool getTboxEventNameForAnim(u32 anim, const char **outName);
     static bool getItemGetEventName(u16 item, const char **outName);
+    static bool getItemGetTboxEventName(u16 item, const char **outName);
     static void itemGetEventStart(dAcBase_c *);
     static void itemGetEventEnd(dAcBase_c *);
 
@@ -248,7 +278,7 @@ public:
         TEAR_MAX
     };
 
-    static Tear_e getTearSubtype(ITEM_ID item);
+    static Tear_e getTearSubtype(u32 item);
 
     static void healLink(u32 amount, bool); // move to dAcPy_c
 
@@ -265,6 +295,10 @@ public:
     }
 
 private:
+    bool isField_0xD04GtZero() const {
+        return 0.0f < field_0xD04;
+    }
+
     static bool sIsPerformingInitialCollection;
     static s32 sCollectionCurrentCount;
 
@@ -275,8 +309,17 @@ private:
     static const mVec3_c sScale1Maybe;
     static const mVec3_c sScale2Maybe;
 
+    static const mVec3_c sUnkOffset1;
+    static const mVec3_c sUnkOffset2;
+    static const mVec3_c sUnkOffset3;
+    static const mVec3_c sUnkOffset4;
+    static const mVec3_c sUnkOffset5;
+    static const mVec3_c sUnkOffset6;
+    static const mVec2_c sUnkVec2;
+
     typedef bool (dAcItem_c::*sStaticPtmf)();
-    static const sStaticPtmf sStaticPtmfs[];
+    static const sStaticPtmf sStaticPtmfs1[];
+    static const sStaticPtmf sStaticPtmfs2[];
 
     static dAcRef_c<dAcObjBase_c> sItemListHead;
     static dAcRef_c<dAcObjBase_c> sItemListTail;
@@ -397,6 +440,11 @@ private:
     void incrementFramesInAir();
     void setItemFlags(u32 flags);
 
+    /** Checks if the ground's specialCode should allow the item to sink, deleting the item when fully submerged */
+    bool isItemDeleteGround(s32 specialCode) const;
+    /** Checks if the ground's specialCode should allow the item to "dip" into the ground */
+    bool isItemSwimGround(s32 specialCode) const;
+
     bool fn_80255CF0();
     bool fn_802574A0();
     void addToGetQueue();
@@ -409,8 +457,6 @@ private:
     bool fn_802577A0();
     void fn_80256F20();
     bool fn_80256E80();
-    bool fn_80255C50(u32 specialCode);
-    bool fn_80255CA0(u32 specialCode);
     void getCurrentModelScale(f32 *scale);
     f32 getCurrentScale();
     void fn_802518C0(mVec3_c *out);
@@ -456,7 +502,10 @@ private:
     void fn_80254810();
     static s16 getItemRotateAngle();
 
-    static void getItemGetEventName(u16 id, char *const *name);
+    bool playHeartStemCutSound();
+
+    void getOffsetPosition(mVec3_c &position) const;
+    f32 scaleBy(f32 f) const;
 
     // Could also return vector
     static void fn_80247540(mVec3_c &);
@@ -662,12 +711,14 @@ private:
     f32 getRupoorHitKnockbackRand3();
     f32 getHeartHitKnockbackRand3();
 
-    f32 fn_802577C0();
-    f32 fn_802577D0();
+    f32 getSinkSpeedHeart();
+    f32 getSinkSpeedDefault();
 
-    void fn_80255E80();
-    void fn_80255F40();
+public:
+    void rotateTowardsCamera();
+    void rotateFixedBirdStatuette();
 
+private:
     /* 0x334 */ dItemMdl_c *mpMdl;
     /* 0x338 */ dShadowCircle_c mShdw;
     /* 0x340 */ mVec3_c field_0x340;
@@ -688,7 +739,7 @@ private:
     /* 0xA60 */ dEmitter_c mEff_0xA60;
     /* 0xA94 */ dAcRef_c<dAcOScatterSand> mCoveredSand;
     /* 0xAA0 */ dAcRef_c<dAcObjBase_c> mForceSignRef;
-    /* 0xAAC */ mVec3_c posCopy;
+    /* 0xAAC */ mVec3_c mItemPosCopy;
     /* 0xAB8 */ fLiNdBa_c mNode;
     /* 0xAC4 */ ActorEventRelated mEventRelated;
     /* 0xB14 */ DowsingTarget mDowsingTarget;
@@ -725,7 +776,7 @@ private:
     /* 0xC90 */ f32 (dAcItem_c::*mFn_0xC90)();
     /* 0xC9C */ void (dAcItem_c::*mFn_0xC9C)();
     /* 0xCA8 */ void (dAcItem_c::*mFnSetBoundingBox)();
-    /* 0xCB4 */ f32 (dAcItem_c::*mFn_0xCB4)(void);
+    /* 0xCB4 */ f32 (dAcItem_c::*mFnGetSinkSpeed)(void);
     /* 0xCC0 */ dAcRef_c<dAcItem_c> mItemQueuePrev;
     /* 0xCCC */ dAcRef_c<dAcItem_c> mItemQueueNext;
     /* 0xCD8 */ f32 field_0xCD8;
@@ -735,9 +786,9 @@ private:
     /* 0xCE8 */ f32 field_0xCE8;
     /* 0xCEC */ f32 field_0xCEC;
     /* 0xCF0 */ u8 _CF0[0xD00 - 0xCF0];
-    /* 0xD00 */ f32 field_0xD00;
+    /* 0xD00 */ f32 mSinkOffset;
     /* 0xD04 */ f32 field_0xD04;
-    /* 0xD08 */ u8 _D08[0xD0C - 0xD08];
+    /* 0xD08 */ f32 field_0xD08;
     /* 0xD0C */ f32 field_0xD0C;
     /* 0xD10 */ u8 _D10[0xD14 - 0xD10];
     /* 0xD14 */ f32 mFreestandingOffsetH;
@@ -790,6 +841,7 @@ private:
 
 public:
     static fLiMgBa_c sItemList;
+    static fLiMgBa_c sUnusedList;
 };
 
 #endif
diff --git a/include/d/a/d_a_itembase.h b/include/d/a/d_a_itembase.h
index d0f29f23..828d98c0 100644
--- a/include/d/a/d_a_itembase.h
+++ b/include/d/a/d_a_itembase.h
@@ -245,6 +245,7 @@ public:
     virtual ~dAcItemBase_c() {}
     virtual u16 getItemId() const;
     virtual u16 getItemIdFromParams() = 0;
+    virtual void setItemId(u16 id);
 
     static bool isValidItemTypeIdx(int itemId);
     static bool getItemTypeFromId(u16 itemID, u32 *pOutType);
diff --git a/include/d/d_angle.h b/include/d/d_angle.h
new file mode 100644
index 00000000..dc12dabc
--- /dev/null
+++ b/include/d/d_angle.h
@@ -0,0 +1,17 @@
+#ifndef D_ANGLE_H
+#define D_ANGLE_H
+
+#include "m/m_angle.h"
+#include "m/m_vec.h"
+
+inline void setRotXY(mAng3_c &rot, s32 x, s32 y) {
+    rot.x.mVal = x;
+    rot.y.mVal = y;
+    rot.z.mVal = 0;
+}
+
+inline void setRotXYVec(mAng3_c &rot, const mVec3_c &direction) {
+    setRotXY(rot, -direction.atan2sY_XZ(), direction.atan2sX_Z());
+}
+
+#endif
-- 
cgit v1.2.3


From e10759e25a682411fac9a12eab44dce162836aa5 Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Thu, 14 May 2026 15:17:03 +0200
Subject: Renames

---
 include/d/a/d_a_item.h | 88 +++++++++++++++++++++++++-------------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

(limited to 'include')

diff --git a/include/d/a/d_a_item.h b/include/d/a/d_a_item.h
index 8d06e468..ae7bddb5 100644
--- a/include/d/a/d_a_item.h
+++ b/include/d/a/d_a_item.h
@@ -26,27 +26,27 @@ class dItemMdl_c;
 class dAcItem_c;
 
 /** Positions picked up items for a bit. */
-class dAcItem_0xB34 {
+class dAcItemPickupPositionIf_c {
 public:
-    virtual ~dAcItem_0xB34() {}
-    virtual void vt_0x0C() = 0;
-    virtual bool vt_0x10(dAcItem_c *item) = 0;
+    virtual ~dAcItemPickupPositionIf_c() {}
+    virtual void init() = 0;
+    virtual bool execute(dAcItem_c *item) = 0;
 };
 
 /** No-op impl that immediately hides the item */
-class dAcItem_0xB34_1 : public dAcItem_0xB34 {
+class dAcItemPickupPositionOff_c : public dAcItemPickupPositionIf_c {
 public:
-    virtual ~dAcItem_0xB34_1() {}
-    virtual void vt_0x0C() override;
-    virtual bool vt_0x10(dAcItem_c *item) override;
+    virtual ~dAcItemPickupPositionOff_c() {}
+    virtual void init() override;
+    virtual bool execute(dAcItem_c *item) override;
 };
 
 /** Impl that positions picked up items above Link's head */
-class dAcItem_0xB34_2 : public dAcItem_0xB34 {
+class dAcItemPickupPositionOn_c : public dAcItemPickupPositionIf_c {
 public:
-    virtual ~dAcItem_0xB34_2() {}
-    virtual void vt_0x0C() override;
-    virtual bool vt_0x10(dAcItem_c *item) override;
+    virtual ~dAcItemPickupPositionOn_c() {}
+    virtual void init() override;
+    virtual bool execute(dAcItem_c *item) override;
 
 private:
     /* 0x04 */ f32 mHighestRelativeHeadHeight;
@@ -54,52 +54,52 @@ private:
 };
 
 /** Respawns certain items. */
-class dAcItem_0xB3C {
+class dAcItemResurgeIf_c {
 public:
-    virtual ~dAcItem_0xB3C() {}
-    virtual void vt_0x0C(u16) = 0;
-    virtual void vt_0x10() = 0;
-    virtual bool vt_0x14(dAcItem_c *) = 0;
-    virtual UNKWORD vt_0x18() = 0;
-
-    void fn_802579D0();
-    bool fn_80257A10(dAcItem_c *);
-    void fn_80257A80();
-    void fn_80257AC0();
-    bool fn_80257B10() const;
+    virtual ~dAcItemResurgeIf_c() {}
+    virtual void setTimerInitVal(u16) = 0;
+    virtual void postReset() = 0;
+    virtual bool isResurgeAllowed(dAcItem_c *) = 0;
+    virtual s32 getTimerInitVal() = 0;
+
+    void startResurgeTimer();
+    bool canResurge(dAcItem_c *);
+    void resetTimer();
+    void execute();
+    bool isTimerExpired() const;
 
 protected:
-    /* 0x04 */ UNKWORD field_0x04;
+    /* 0x04 */ s32 mTimer;
 };
 
 /** No-op impl that doesn't respawn items */
-class dAcItem_0xB3C_1 : public dAcItem_0xB3C {
+class dAcItemResurgeOff_c : public dAcItemResurgeIf_c {
 public:
-    dAcItem_0xB3C_1(u16, u16) {}
-    virtual ~dAcItem_0xB3C_1() {}
-    virtual void vt_0x0C(u16) override;
-    virtual void vt_0x10() override;
-    virtual bool vt_0x14(dAcItem_c *) override;
-    virtual UNKWORD vt_0x18() override;
+    dAcItemResurgeOff_c(u16, u16) {}
+    virtual ~dAcItemResurgeOff_c() {}
+    virtual void setTimerInitVal(u16) override;
+    virtual void postReset() override;
+    virtual bool isResurgeAllowed(dAcItem_c *) override;
+    virtual s32 getTimerInitVal() override;
 };
 
 /** Impl that respawns items */
-class dAcItem_0xB3C_2 : public dAcItem_0xB3C {
+class dAcItemResurgeOn_c : public dAcItemResurgeIf_c {
 public:
-    dAcItem_0xB3C_2(u16 a1, u16 a2) {
+    dAcItemResurgeOn_c(u16 a1, u16 a2) {
         mCb1 = sCb1s[a1];
         mCb2 = sCb2s[a2];
     }
-    virtual ~dAcItem_0xB3C_2() {}
-    virtual void vt_0x0C(u16) override;
-    virtual void vt_0x10() override;
-    virtual bool vt_0x14(dAcItem_c *) override;
-    virtual UNKWORD vt_0x18() override;
+    virtual ~dAcItemResurgeOn_c() {}
+    virtual void setTimerInitVal(u16) override;
+    virtual void postReset() override;
+    virtual bool isResurgeAllowed(dAcItem_c *) override;
+    virtual s32 getTimerInitVal() override;
 
 public:
-    typedef void (dAcItem_0xB3C_2::*Callback1)();
+    typedef void (dAcItemResurgeOn_c::*Callback1)();
     // May or may not take a dAcItem_c* argument...
-    typedef bool (dAcItem_0xB3C_2::*Callback2)();
+    typedef bool (dAcItemResurgeOn_c::*Callback2)();
 
     static Callback1 sCb1s[2];
     static Callback2 sCb2s[3];
@@ -113,7 +113,7 @@ public:
 
     /* 0x08 */ Callback1 mCb1;
     /* 0x14 */ Callback2 mCb2;
-    /* 0x20 */ UNKWORD field_0x20;
+    /* 0x20 */ s32 mInitVal;
 };
 
 class dAcItem_c : public dAcItemBase_c {
@@ -743,8 +743,8 @@ private:
     /* 0xAB8 */ fLiNdBa_c mNode;
     /* 0xAC4 */ ActorEventRelated mEventRelated;
     /* 0xB14 */ DowsingTarget mDowsingTarget;
-    /* 0xB34 */ dAcItem_0xB34 *field_0xB34[2];
-    /* 0xB34 */ dAcItem_0xB3C *field_0xB3C;
+    /* 0xB34 */ dAcItemPickupPositionIf_c *mpPickupPositionCtl[2];
+    /* 0xB34 */ dAcItemResurgeIf_c *mpResurgeCtl;
     /* 0xB40 */ void (dAcItem_c::*mFnAction)();
     /* 0xB4C */ void (dAcItem_c::*mFnBounce)();
     /* 0xB58 */ void (dAcItem_c::*mFunc_0xB58)();
-- 
cgit v1.2.3


From 174f848c281a6bdc77531b6b0a7a59f1bd99565e Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Sun, 24 May 2026 23:00:19 +0200
Subject: Consistency fix

---
 include/d/a/d_a_item.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/d/a/d_a_item.h b/include/d/a/d_a_item.h
index ae7bddb5..42abaa95 100644
--- a/include/d/a/d_a_item.h
+++ b/include/d/a/d_a_item.h
@@ -776,7 +776,7 @@ private:
     /* 0xC90 */ f32 (dAcItem_c::*mFn_0xC90)();
     /* 0xC9C */ void (dAcItem_c::*mFn_0xC9C)();
     /* 0xCA8 */ void (dAcItem_c::*mFnSetBoundingBox)();
-    /* 0xCB4 */ f32 (dAcItem_c::*mFnGetSinkSpeed)(void);
+    /* 0xCB4 */ f32 (dAcItem_c::*mFnGetSinkSpeed)();
     /* 0xCC0 */ dAcRef_c<dAcItem_c> mItemQueuePrev;
     /* 0xCCC */ dAcRef_c<dAcItem_c> mItemQueueNext;
     /* 0xCD8 */ f32 field_0xCD8;
-- 
cgit v1.2.3