Merge pull request #311 from robojumper/item_mdl

some item model stuff

11 files changed, 774 insertions, 66 deletions

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 24fcd785..42abaa95 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,10 +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 dAcItemPickupPositionIf_c {
+public:
+    virtual ~dAcItemPickupPositionIf_c() {}
+    virtual void init() = 0;
+    virtual bool execute(dAcItem_c *item) = 0;
+};
+
+/** No-op impl that immediately hides the item */
+class dAcItemPickupPositionOff_c : public dAcItemPickupPositionIf_c {
+public:
+    virtual ~dAcItemPickupPositionOff_c() {}
+    virtual void init() override;
+    virtual bool execute(dAcItem_c *item) override;
+};
 
-class dAcItem_0xB34 {
+/** Impl that positions picked up items above Link's head */
+class dAcItemPickupPositionOn_c : public dAcItemPickupPositionIf_c {
 public:
-    virtual ~dAcItem_0xB34();
+    virtual ~dAcItemPickupPositionOn_c() {}
+    virtual void init() override;
+    virtual bool execute(dAcItem_c *item) override;
+
+private:
+    /* 0x04 */ f32 mHighestRelativeHeadHeight;
+    /* 0x08 */ u8 mNumFrames;
+};
+
+/** Respawns certain items. */
+class dAcItemResurgeIf_c {
+public:
+    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 */ s32 mTimer;
+};
+
+/** No-op impl that doesn't respawn items */
+class dAcItemResurgeOff_c : public dAcItemResurgeIf_c {
+public:
+    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 dAcItemResurgeOn_c : public dAcItemResurgeIf_c {
+public:
+    dAcItemResurgeOn_c(u16 a1, u16 a2) {
+        mCb1 = sCb1s[a1];
+        mCb2 = sCb2s[a2];
+    }
+    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 (dAcItemResurgeOn_c::*Callback1)();
+    // May or may not take a dAcItem_c* argument...
+    typedef bool (dAcItemResurgeOn_c::*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 */ s32 mInitVal;
 };
 
 class dAcItem_c : public dAcItemBase_c {
@@ -29,6 +121,24 @@ public:
     dAcItem_c();
     virtual ~dAcItem_c();
 
+    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) 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);
@@ -56,17 +166,23 @@ 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();
+    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();
@@ -75,20 +191,73 @@ 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 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;
+    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 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;
+
+    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 *);
 
-    static void addRupees(s32 amount);
-
     static bool hasAnyFairy();
 
     enum Trial_e {
@@ -101,6 +270,16 @@ public:
 
     static Trial_e getCurrentTrial();
 
+    enum Tear_e {
+        TEAR_FARON,
+        TEAR_ELDIN,
+        TEAR_LANAYRU,
+        TEAR_GODDESS,
+        TEAR_MAX
+    };
+
+    static Tear_e getTearSubtype(u32 item);
+
     static void healLink(u32 amount, bool); // move to dAcPy_c
 
     static bool isPerformingInitialCollection() {
@@ -116,10 +295,431 @@ public:
     }
 
 private:
+    bool isField_0xD04GtZero() const {
+        return 0.0f < field_0xD04;
+    }
+
     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;
+    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 sStaticPtmfs1[];
+    static const sStaticPtmf sStaticPtmfs2[];
+
+    static dAcRef_c<dAcObjBase_c> sItemListHead;
+    static dAcRef_c<dAcObjBase_c> sItemListTail;
+
+    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);
+    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 setFramesInAir(u32 numFrames);
+    void unsetFramesInAir();
+    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();
+    void removeFromGetQueue();
+    static bool fn_8024A230();
+    void unsetHaveNoGravity();
+    void fn_80252A80();
+    void tickDespawnTimer();
+    void fn_80253D50();
+    bool fn_802577A0();
+    void fn_80256F20();
+    bool fn_80256E80();
+    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();
+
+    bool playHeartStemCutSound();
+
+    void getOffsetPosition(mVec3_c &position) const;
+    f32 scaleBy(f32 f) const;
+
+    // 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();
+    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 getSinkSpeedHeart();
+    f32 getSinkSpeedDefault();
+
+public:
+    void rotateTowardsCamera();
+    void rotateFixedBirdStatuette();
+
+private:
+    /* 0x334 */ dItemMdl_c *mpMdl;
     /* 0x338 */ dShadowCircle_c mShdw;
     /* 0x340 */ mVec3_c field_0x340;
     /* 0x34C */ nw4r::ut::Color mColorFilter;
@@ -138,45 +738,45 @@ private:
     /* 0xA2C */ dEmitter_c mEff_0xA2C;
     /* 0xA60 */ dEmitter_c mEff_0xA60;
     /* 0xA94 */ dAcRef_c<dAcOScatterSand> mCoveredSand;
-    /* 0xAA0 */ dAcRef_c<dAcObjBase_c> mUnkRef;
-    /* 0xAAC */ mVec3_c posCopy;
+    /* 0xAA0 */ dAcRef_c<dAcObjBase_c> mForceSignRef;
+    /* 0xAAC */ mVec3_c mItemPosCopy;
     /* 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 */ dAcItemPickupPositionIf_c *mpPickupPositionCtl[2];
+    /* 0xB34 */ dAcItemResurgeIf_c *mpResurgeCtl;
+    /* 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);
-    /* 0xC9C */ UNKTYPE (dAcItem_c::*mFunc_0xC9C)(UNKTYPE);
-    /* 0xCA8 */ UNKTYPE (dAcItem_c::*mFunc_0xCA8)(UNKTYPE);
-    /* 0xCB4 */ UNKTYPE (dAcItem_c::*mFunc_0xCB4)(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 */ void (dAcItem_c::*mFn_0xC9C)();
+    /* 0xCA8 */ void (dAcItem_c::*mFnSetBoundingBox)();
+    /* 0xCB4 */ f32 (dAcItem_c::*mFnGetSinkSpeed)();
     /* 0xCC0 */ dAcRef_c<dAcItem_c> mItemQueuePrev;
     /* 0xCCC */ dAcRef_c<dAcItem_c> mItemQueueNext;
     /* 0xCD8 */ f32 field_0xCD8;
@@ -186,25 +786,28 @@ 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[0xD14 - 0xD08];
+    /* 0xD08 */ f32 field_0xD08;
+    /* 0xD0C */ f32 field_0xD0C;
+    /* 0xD10 */ u8 _D10[0xD14 - 0xD10];
     /* 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 */ 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 */ s16 mDespawnTimer;
-    /* 0xD48 */ u8 field_0xD48;
-    /* 0xD49 */ u8 field_0xD49;
+    /* 0xD46 */ u16 mDespawnTimer;
+    /* 0xD48 */ mAng field_0xD48;
     /* 0xD4A */ u8 field_0xD4A;
     /* 0xD4B */ u8 field_0xD4B;
     /* 0xD4C */ u8 field_0xD4C;
@@ -238,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 9f91e60d..828d98c0 100644
--- a/include/d/a/d_a_itembase.h
+++ b/include/d/a/d_a_itembase.h
@@ -234,11 +234,18 @@ 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 getItemId() const;
+    virtual u16 getItemIdFromParams() = 0;
+    virtual void setItemId(u16 id);
 
     static bool isValidItemTypeIdx(int itemId);
     static bool getItemTypeFromId(u16 itemID, u32 *pOutType);
@@ -254,9 +261,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/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/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..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 {
@@ -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;
@@ -825,6 +833,11 @@ public:
         mCo.OnSPrm(f);
     }
 
+    void OffTgCoFlag(u32 f) {
+        mTg.OffSPrm(f);
+        mCo.OffSPrm(f);
+    }
+
     void SetAtType(u32 type) {
         mAt.SetType(type);
     }
@@ -858,6 +871,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 +934,10 @@ public:
         mAt.SetCallback(cb);
     }
 
+    void SetCoCallback(cCcD_HitCallback cb) {
+        mCo.SetCallback(cb);
+    }
+
     u32 ChkTgNoAtHitInfSet() const {
         return mTg.MskSPrm(0x40);
     }
@@ -997,6 +1018,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 +1033,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 +1046,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 +1059,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/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
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_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/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;
 };