Item progress

config/SOUE01/symbols.txt

@@ -2471,7 +2471,7 @@ fn_8005BBB0 = .text:0x8005BBB0; // type:function size:0xC
 fairyHeal__17daPlayerActBase_cFP11dAcOFairy_c = .text:0x8005BBC0; // type:function size:0xC
 turnSoupCold = .text:0x8005BBD0; // type:function size:0x8
 addExtraHearts = .text:0x8005BBE0; // type:function size:0x74
-AcItem__healLink = .text:0x8005BC60; // type:function size:0x18
+healLink__9dAcItem_cFUlb = .text:0x8005BC60; // type:function size:0x18
 getCurrentHealthCapacity__7dAcPy_cFv = .text:0x8005BC80; // type:function size:0x54
 addDigInteractionTarget__7dAcPy_cFP9dAcBase_cf = .text:0x8005BCE0; // type:function size:0xC
 fn_8005BCF0 = .text:0x8005BCF0; // type:function size:0x30
@@ -10067,7 +10067,7 @@ drawPopups__16dLytMapMarkers_cFv = .text:0x80189B90; // type:function size:0x27C
 resetPopups__16dLytMapMarkers_cFv = .text:0x80189E10; // type:function size:0xF4
 loadPopups__16dLytMapMarkers_cFv = .text:0x80189F10; // type:function size:0x8C
 getPouchSlotCount__Fb = .text:0x80189FA0; // type:function size:0x6C
-isPouchItem = .text:0x8018A010; // type:function size:0x88
+isAnyPouchItem__9dAcItem_cF7ITEM_ID = .text:0x8018A010; // type:function size:0x88
 isItemShield__Fl = .text:0x8018A0A0; // type:function size:0x18
 isItemExtraAmmo__Fl = .text:0x8018A0C0; // type:function size:0x18
 fn_8018A0E0 = .text:0x8018A0E0; // type:function size:0x20
@@ -10080,9 +10080,9 @@ isItemAnyRevitalizingPotion = .text:0x8018A280; // type:function size:0x28
 isItemInBottle2 = .text:0x8018A2B0; // type:function size:0x68
 getAdditionalInfoForPouchItem = .text:0x8018A320; // type:function size:0x4
 getAdditionalInfoForPouchItem2 = .text:0x8018A330; // type:function size:0xC0
-setPouchSlotToValueWithExtraInfo = .text:0x8018A3F0; // type:function size:0x130
+collectPouchItemIntoSlot__FlUsUlb = .text:0x8018A3F0; // type:function size:0x130
 tryCollectPouchItemInPouch = .text:0x8018A520; // type:function size:0x60
-collectPouchItem = .text:0x8018A580; // type:function size:0xD0
+collectPouchItem__FUs = .text:0x8018A580; // type:function size:0xD0
 adventurePouchFindItemSlot__F7ITEM_ID = .text:0x8018A650; // type:function size:0x84
 adventurePouchCountItem__F7ITEM_ID = .text:0x8018A6E0; // type:function size:0x74
 convertLytPouchSlot__Fl = .text:0x8018A760; // type:function size:0x1C
@@ -10480,7 +10480,7 @@ fn_801961F0 = .text:0x801961F0; // type:function size:0x220
 fn_80196410 = .text:0x80196410; // type:function size:0x64
 fn_80196480 = .text:0x80196480; // type:function size:0x10
 fn_80196490 = .text:0x80196490; // type:function size:0x44
-TgInsectCaptureMinigame__addToCollectedBugs = .text:0x801964E0; // type:function size:0x6C
+recordCollectedInsect__26dTgMinigameInsectCapture_cFll = .text:0x801964E0; // type:function size:0x6C
 TgInsectCaptureMinigame__getBugIndex = .text:0x80196550; // type:function size:0x44
 TgStream__initList = .text:0x801965A0; // type:function size:0x50
 TgStream__dtorList = .text:0x801965F0; // type:function size:0x58
@@ -13276,11 +13276,11 @@ fn_80246890 = .text:0x80246890; // type:function size:0x4
 fn_802468A0 = .text:0x802468A0; // type:function size:0x4
 fn_802468B0 = .text:0x802468B0; // type:function size:0xA8
 ActorLink__sinit = .text:0x80246960; // type:function size:0x898
-fn_80247200 = .text:0x80247200; // type:function size:0x18
-AcItem__getItemTypeMaybeMaybeFromId = .text:0x80247220; // type:function size:0x54
-AcItem__getItemAnimType = .text:0x80247280; // type:function size:0x44
-AcItem__getHeartContainerHeartIncrease = .text:0x802472D0; // type:function size:0x8
-AcItem__getCompletedHeatpieceHeartIncrease = .text:0x802472E0; // type:function size:0x8
+isValidItemTypeIdx__13dAcItemBase_cFi = .text:0x80247200; // type:function size:0x18
+getItemTypeFromId__13dAcItemBase_cFUsPUl = .text:0x80247220; // type:function size:0x54
+getItemAnimType__13dAcItemBase_cFUsPUl = .text:0x80247280; // type:function size:0x44
+getHeartContainerHeartIncrease__13dAcItemBase_cFv = .text:0x802472D0; // type:function size:0x8
+getCompletedHeartPieceHeartIncrease__13dAcItemBase_cFv = .text:0x802472E0; // type:function size:0x8
 getTearIdx__13dAcItemBase_cFi = .text:0x802472F0; // type:function size:0x24
 getFlagIdxForTear__13dAcItemBase_cFiPUl = .text:0x80247320; // type:function size:0x60
 getTearBit__13dAcItemBase_cFi = .text:0x80247380; // type:function size:0x34
@@ -13289,7 +13289,7 @@ getTrialIndex2 = .text:0x80247470; // type:function size:0xA8
 fn_80247520 = .text:0x80247520; // type:function size:0xC
 fn_80247530 = .text:0x80247530; // type:function size:0xC
 fn_80247540 = .text:0x80247540; // type:function size:0x78
-AcItem__doFullHeal = .text:0x802475C0; // type:function size:0x28
+doFullHeal__9dAcItem_cFv = .text:0x802475C0; // type:function size:0x28
 AcItem__isHeart = .text:0x802475F0; // type:function size:0x10
 AcItem__isRupoor = .text:0x80247600; // type:function size:0x10
 isItemBottleWithGlitteringSpores = .text:0x80247610; // type:function size:0x10
@@ -13322,7 +13322,7 @@ AcItem__isBluebirdFeather = .text:0x802477B0; // type:function size:0x10
 AcItem__isGoldenSkull = .text:0x802477C0; // type:function size:0x10
 AcItem__isGoddessPlume = .text:0x802477D0; // type:function size:0x10
 isItemRevitalizingPotionPlusPlus = .text:0x802477E0; // type:function size:0x10
-isUpgradedPotionItem = .text:0x802477F0; // type:function size:0xC8
+isUpgradedPotion__9dAcItem_cF7ITEM_ID = .text:0x802477F0; // type:function size:0xC8
 fn_802478C0 = .text:0x802478C0; // type:function size:0x68
 AcItem__isItemFromMittsOrSword = .text:0x80247930; // type:function size:0x20
 fn_80247950 = .text:0x80247950; // type:function size:0x28
@@ -13334,9 +13334,9 @@ fn_80247BB0 = .text:0x80247BB0; // type:function size:0x10C
 m3d__smdl_c__getNodePos = .text:0x80247CC0; // type:function size:0x58
 fn_80247D20 = .text:0x80247D20; // type:function size:0x14C
 fn_80247E70 = .text:0x80247E70; // type:function size:0x50
-increment = .text:0x80247EC0; // type:function size:0x28
+increment__FPUl = .text:0x80247EC0; // type:function size:0x28
 fn_80247EF0 = .text:0x80247EF0; // type:function size:0xA4
-getItemId__13dAcItemBase_cFv = .text:0x80247FA0; // type:function size:0x8
+getItemId__13dAcItemBase_cCFv = .text:0x80247FA0; // type:function size:0x8
 fn_80247FB0 = .text:0x80247FB0; // type:function size:0x8
 dAcItem_c_classInit__Fv = .text:0x80247FC0; // type:function size:0x30
 AcItem__dontForceDemo = .text:0x80247FF0; // type:function size:0x8
@@ -13400,18 +13400,18 @@ createHeap__9dAcItem_cFv = .text:0x8024A470; // type:function size:0x75C
 create__9dAcItem_cFv = .text:0x8024ABD0; // type:function size:0x2888
 changeState__77sStateMgr_c<9dAcItem_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x8024D460; // type:function size:0x10
 getStateID__77sStateMgr_c<9dAcItem_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x8024D470; // type:function size:0x10
-AcItem__destroy = .text:0x8024D480; // type:function size:0xEC
-AcItem__update = .text:0x8024D570; // type:function size:0x66C
+doDelete__9dAcItem_cFv = .text:0x8024D480; // type:function size:0xEC
+actorExecute__9dAcItem_cFv = .text:0x8024D570; // type:function size:0x66C
 executeState__77sStateMgr_c<9dAcItem_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x8024DBE0; // type:function size:0x10
-AcItem__draw = .text:0x8024DBF0; // type:function size:0x304
-setNumberOfItems = .text:0x8024DF00; // type:function size:0x8
+draw__9dAcItem_cFv = .text:0x8024DBF0; // type:function size:0x304
+setSpawnQuantity__9dAcItem_cFl = .text:0x8024DF00; // type:function size:0x8
 setFreestandingYOffset__9dAcItem_cFf = .text:0x8024DF10; // type:function size:0x8
-AcItem__setFramesInAir = .text:0x8024DF20; // type:function size:0x8
-fn_8024DF30 = .text:0x8024DF30; // type:function size:0x8
+setFramesInAir__9dAcItem_cFUl = .text:0x8024DF20; // type:function size:0x8
+setItemFlags__9dAcItem_cFUl = .text:0x8024DF30; // type:function size:0x8
 isItemDropFromEnemy__9dAcItem_cCFv = .text:0x8024DF40; // type:function size:0x24
-resetNumberOfItems = .text:0x8024DF70; // type:function size:0xC
-AcItem__resetFramesInAir = .text:0x8024DF80; // type:function size:0x8
-AcItem__incrementFramesInAir = .text:0x8024DF90; // type:function size:0x44
+unsetSpawnQuantity__9dAcItem_cFv = .text:0x8024DF70; // type:function size:0xC
+unsetFramesInAir__9dAcItem_cFv = .text:0x8024DF80; // type:function size:0x8
+incrementFramesInAir__9dAcItem_cFv = .text:0x8024DF90; // type:function size:0x44
 initializeState_Wait__9dAcItem_cFv = .text:0x8024DFE0; // type:function size:0xA8
 executeState_Wait__9dAcItem_cFv = .text:0x8024E090; // type:function size:0x10AC
 finalizeState_Wait__9dAcItem_cFv = .text:0x8024F140; // type:function size:0x7C
@@ -13489,19 +13489,19 @@ AcItem__is_Larvae_Ore_JellyBlob_Claw_Horn_EvilCryst_OrnSkull_GoldSkull = .text:0
 AcItem__isBug = .text:0x80250D50; // type:function size:0x7C
 isTreasure2__9dAcItem_cF7ITEM_ID = .text:0x80250DD0; // type:function size:0x138
 isTreasure__9dAcItem_cF7ITEM_ID = .text:0x80250F10; // type:function size:0x88
-isHeart2__9dAcItem_cCFv = .text:0x80250FA0; // type:function size:0x34
+isHeartV__9dAcItem_cCFv = .text:0x80250FA0; // type:function size:0x34
 isSingleArrow__9dAcItem_cCFv = .text:0x80250FE0; // type:function size:0x8
 isArrowBundle__9dAcItem_cCFv = .text:0x80250FF0; // type:function size:0x8
 isSilverRupee__9dAcItem_cCFv = .text:0x80251000; // type:function size:0x8
 isGoldRupee__9dAcItem_cCFv = .text:0x80251010; // type:function size:0x8
 AcItem__isKeyPiece2 = .text:0x80251020; // type:function size:0x8
-isItem10DekuSeeds = .text:0x80251030; // type:function size:0x8
+is10DekuSeeds__9dAcItem_cCFv = .text:0x80251030; // type:function size:0x8
 isHeartPiece__9dAcItem_cCFv = .text:0x80251040; // type:function size:0x8
 AcItem__isItemBirdStatuette = .text:0x80251050; // type:function size:0x8
-AcItem__isLifeTreeFruit = .text:0x80251060; // type:function size:0x8
-AcItem__isItemAnyRupee = .text:0x80251070; // type:function size:0x34
+isLifeTreeFruit__9dAcItem_cCFv = .text:0x80251060; // type:function size:0x8
+isAnyRupeeV__9dAcItem_cCFv = .text:0x80251070; // type:function size:0x34
 isAnyTear__9dAcItem_cCFv = .text:0x802510B0; // type:function size:0x8
-AcItem__isBombRefill = .text:0x802510C0; // type:function size:0x8
+isAnyBombs__9dAcItem_cCFv = .text:0x802510C0; // type:function size:0x8
 isTriforce__9dAcItem_cCFv = .text:0x802510D0; // type:function size:0x8
 fn_802510E0 = .text:0x802510E0; // type:function size:0x44
 fn_80251130 = .text:0x80251130; // type:function size:0x44
@@ -13534,8 +13534,8 @@ fn_80251620 = .text:0x80251620; // type:function size:0x8
 AcItem__getPickupDemoScale = .text:0x80251630; // type:function size:0x64
 AcItem__getFreestandingModelScale3 = .text:0x802516A0; // type:function size:0x4
 AcItem__getPickupBeetleScale = .text:0x802516B0; // type:function size:0x6C
-AcItem__getCurrentModelScale = .text:0x80251720; // type:function size:0x94
-AcItem__getCurrentModelScale2 = .text:0x802517C0; // type:function size:0x48
+getCurrentModelScale__9dAcItem_cFPf = .text:0x80251720; // type:function size:0x94
+getCurrentScale__9dAcItem_cFv = .text:0x802517C0; // type:function size:0x48
 fn_80251810 = .text:0x80251810; // type:function size:0xA8
 fn_802518C0 = .text:0x802518C0; // type:function size:0x78
 fn_80251940 = .text:0x80251940; // type:function size:0xA8
@@ -13544,109 +13544,109 @@ AcItem__getPositionOffset = .text:0x80251A90; // type:function size:0x5C
 fn_80251AF0 = .text:0x80251AF0; // type:function size:0x78
 checkFlag__9dAcItem_cFUl = .text:0x80251B70; // type:function size:0x128
 setFlag__9dAcItem_cFl = .text:0x80251CA0; // type:function size:0xC0
-AcItem__checkFlagForItem = .text:0x80251D60; // type:function size:0x34
+checkFlagV__9dAcItem_cCFv = .text:0x80251D60; // type:function size:0x34
 AcItem__checkItemFlag = .text:0x80251DA0; // type:function size:0x48
 hasAnyFairy__9dAcItem_cFv = .text:0x80251DF0; // type:function size:0x50
 setItemflag = .text:0x80251E40; // type:function size:0x1C
 getRupeeCounter = .text:0x80251E60; // type:function size:0x8
 getRupeeCounter__9dAcItem_cFv = .text:0x80251E70; // type:function size:0x4
 fn_80251E80 = .text:0x80251E80; // type:function size:0xC
-addRupees__9dAcItem_cFl = .text:0x80251E90; // type:function size:0x18
+increaseRupeeCounter__9dAcItem_cFl = .text:0x80251E90; // type:function size:0x18
 getCurrentWalletCapacity = .text:0x80251EB0; // type:function size:0x8
 getCurrentWalletCapacity__9dAcItem_cFv = .text:0x80251EC0; // type:function size:0x4
-AcItem__getCurrentArrowCount = .text:0x80251ED0; // type:function size:0x8
+getBowArrowCount__9dAcItem_cFv = .text:0x80251ED0; // type:function size:0x8
 getTotalArrowCount__9dAcItem_cFv = .text:0x80251EE0; // type:function size:0x38
-changeArrowCounter = .text:0x80251F20; // type:function size:0xC
-AddOrRemoveArrows = .text:0x80251F30; // type:function size:0x9C
-AcItem__getMaxNumberOfArrows = .text:0x80251FD0; // type:function size:0x8
+increaseArrowCounter__9dAcItem_cFl = .text:0x80251F20; // type:function size:0xC
+increaseArrowAndPouchCounter__9dAcItem_cFl = .text:0x80251F30; // type:function size:0x9C
+getBowArrowCapacity__9dAcItem_cFv = .text:0x80251FD0; // type:function size:0x8
 getTotalArrowCapacity__9dAcItem_cFv = .text:0x80251FE0; // type:function size:0x38
 getBombsCounter = .text:0x80252020; // type:function size:0x8
 getTotalBombCount__9dAcItem_cFv = .text:0x80252030; // type:function size:0x38
 changeBombCounter = .text:0x80252070; // type:function size:0xC
-changeBombCounterAndPouch = .text:0x80252080; // type:function size:0x9C
+increaseBombAndPouchCounter__9dAcItem_cFl = .text:0x80252080; // type:function size:0x9C
 getMaxStandardBombCapacity = .text:0x80252120; // type:function size:0x8
 getTotalBombCapacity__9dAcItem_cFv = .text:0x80252130; // type:function size:0x38
 getCurrentTearCount = .text:0x80252170; // type:function size:0x8
 AcItem__incrementTearCount = .text:0x80252180; // type:function size:0xC
 getMaxTearCount = .text:0x80252190; // type:function size:0x8
-AcItem__getCurrentSlingshotSeedCount = .text:0x802521A0; // type:function size:0x8
+getSlingshotSeedCount__9dAcItem_cFv = .text:0x802521A0; // type:function size:0x8
 getTotalSeedCount__9dAcItem_cFv = .text:0x802521B0; // type:function size:0x38
-AcItem__changeSlingshotSeedCount = .text:0x802521F0; // type:function size:0xC
-addDekuSeeds = .text:0x80252200; // type:function size:0x9C
-AcItem__getMaxNumberOfSlingshotSeeds = .text:0x802522A0; // type:function size:0x8
+increaseDekuSeedCounter__9dAcItem_cFl = .text:0x802521F0; // type:function size:0xC
+increaseDekuSeedAndPouchCounter__9dAcItem_cFl = .text:0x80252200; // type:function size:0x9C
+getSlingshotSeedCapacity__9dAcItem_cFv = .text:0x802522A0; // type:function size:0x8
 getTotalSeedCapacity__9dAcItem_cFv = .text:0x802522B0; // type:function size:0x38
 getKeyPieceCount__9dAcItem_cFv = .text:0x802522F0; // type:function size:0x8
-increaseKeyPieceCounter = .text:0x80252300; // type:function size:0xC
+increaseKeyPieceCounter__9dAcItem_cFl = .text:0x80252300; // type:function size:0xC
 getSmallKeyCount__9dAcItem_cFv = .text:0x80252310; // type:function size:0x8
-increaseSmallKeyCounter = .text:0x80252320; // type:function size:0xC
+increaseSmallKeyCounter__9dAcItem_cFl = .text:0x80252320; // type:function size:0xC
 getAdditionalPouchSlotCounter = .text:0x80252330; // type:function size:0x8
-addToAdditionalAdventurePouchCounter = .text:0x80252340; // type:function size:0xC
-AcItem__getNumOfRemainingHeartPiecesForHeart = .text:0x80252350; // type:function size:0x8
-addToHeartPieceCounter = .text:0x80252360; // type:function size:0xC
+increaseExtraPouchCounter__9dAcItem_cFl = .text:0x80252340; // type:function size:0xC
+getNumRemainingHeartPiecesForNextHeart__9dAcItem_cFv = .text:0x80252350; // type:function size:0x8
+increaseHeartPieceCounter__9dAcItem_cFl = .text:0x80252360; // type:function size:0xC
 getHeartContainerHealthCount__9dAcItem_cFv = .text:0x80252370; // type:function size:0x8
-addToHeartPieceCounter2 = .text:0x80252380; // type:function size:0xC
+increaseTotalHeartPieceCounter__9dAcItem_cFl = .text:0x80252380; // type:function size:0xC
 getFaronGrasshopperCount = .text:0x80252390; // type:function size:0x8
-increaseFaronGrasshopperCounter = .text:0x802523A0; // type:function size:0xC
+increaseFaronGrasshopperCounter__9dAcItem_cFl = .text:0x802523A0; // type:function size:0xC
 getWoodlandRhinoBeetleCount = .text:0x802523B0; // type:function size:0x8
-increaseRhinoBeetleCounter = .text:0x802523C0; // type:function size:0xC
+increaseWoodlandRhinoBeetleCounter__9dAcItem_cFl = .text:0x802523C0; // type:function size:0xC
 getDekuHornetCount = .text:0x802523D0; // type:function size:0x8
-increaseDekuHornetCounter = .text:0x802523E0; // type:function size:0xC
+increaseDekuHornetCounter__9dAcItem_cFl = .text:0x802523E0; // type:function size:0xC
 getSkyloftMantisCount = .text:0x802523F0; // type:function size:0x8
-increaseMantisCounter = .text:0x80252400; // type:function size:0xC
+increaseSkyloftMantisCounter__9dAcItem_cFl = .text:0x80252400; // type:function size:0xC
 getVolcanicLadybugCount = .text:0x80252410; // type:function size:0x8
-increaseLadybugCounter = .text:0x80252420; // type:function size:0xC
+increaseVolcanicLadybugCounter__9dAcItem_cFl = .text:0x80252420; // type:function size:0xC
 getBlessedButterflyCount = .text:0x80252430; // type:function size:0x8
-increaseButterflyCounter = .text:0x80252440; // type:function size:0xC
+increaseBlessedButterflyCounter__9dAcItem_cFl = .text:0x80252440; // type:function size:0xC
 getLanayruAntCount = .text:0x80252450; // type:function size:0x8
-increaseAntCounter = .text:0x80252460; // type:function size:0xC
+increaseLanayruAntCounter__9dAcItem_cFl = .text:0x80252460; // type:function size:0xC
 getSandCicadaCount = .text:0x80252470; // type:function size:0x8
-increaseCicadaCounter = .text:0x80252480; // type:function size:0xC
+increaseSandCicadaCounter__9dAcItem_cFl = .text:0x80252480; // type:function size:0xC
 getGerudoDragonflyCount = .text:0x80252490; // type:function size:0x8
-increaseDragonflyCounter = .text:0x802524A0; // type:function size:0xC
+increaseGerudoDragonflyCounter__9dAcItem_cFl = .text:0x802524A0; // type:function size:0xC
 getEldinRollerCount = .text:0x802524B0; // type:function size:0x8
-increaseEldinRollerCounter = .text:0x802524C0; // type:function size:0xC
+increaseEldinRollerCounter__9dAcItem_cFl = .text:0x802524C0; // type:function size:0xC
 getSkyStagBeetleCount = .text:0x802524D0; // type:function size:0x8
-increaseSkyStagBeetleCounter = .text:0x802524E0; // type:function size:0xC
+increaseSkyStagBeetleCounter__9dAcItem_cFl = .text:0x802524E0; // type:function size:0xC
 getStarryFireFlyCount = .text:0x802524F0; // type:function size:0x8
-increaseStarryFireflyCounter = .text:0x80252500; // type:function size:0xC
+increaseStarryFireflyCounter__9dAcItem_cFl = .text:0x80252500; // type:function size:0xC
 getHornetlarvaeCount = .text:0x80252510; // type:function size:0x8
-increaseHornetLarvaeCounter = .text:0x80252520; // type:function size:0xC
+increaseHornetLarvaeCounter__9dAcItem_cFl = .text:0x80252520; // type:function size:0xC
 getBirdFeatherCount = .text:0x80252530; // type:function size:0x8
-increaseBirdFeatherCounter = .text:0x80252540; // type:function size:0xC
+increaseBirdFeatherCounter__9dAcItem_cFl = .text:0x80252540; // type:function size:0xC
 getTumbleweedCount = .text:0x80252550; // type:function size:0x8
-increaseTumbleweedCounter = .text:0x80252560; // type:function size:0xC
+increaseTumbleWeedCounter__9dAcItem_cFl = .text:0x80252560; // type:function size:0xC
 getLizardTailCount = .text:0x80252570; // type:function size:0x8
-increaseLizardTailCounter = .text:0x80252580; // type:function size:0xC
+increaseLizardTailCounter__9dAcItem_cFl = .text:0x80252580; // type:function size:0xC
 getEldinOreCount = .text:0x80252590; // type:function size:0x8
-increaseEldinOreCounter = .text:0x802525A0; // type:function size:0xC
+increaseEldinOreCounter__9dAcItem_cFl = .text:0x802525A0; // type:function size:0xC
 getAncientFlowerCount = .text:0x802525B0; // type:function size:0x8
-increaseAncientFlowerCounter = .text:0x802525C0; // type:function size:0xC
+increaseAncientFlowerCounter__9dAcItem_cFl = .text:0x802525C0; // type:function size:0xC
 getAmberRelicCount = .text:0x802525D0; // type:function size:0x8
-increaseAmberRelicCounter = .text:0x802525E0; // type:function size:0xC
+increaseAmberRelicCounter__9dAcItem_cFl = .text:0x802525E0; // type:function size:0xC
 getDuskRelicCount = .text:0x802525F0; // type:function size:0x8
-increaseDuskRelicCounter = .text:0x80252600; // type:function size:0xC
+increaseDuskRelicCounter__9dAcItem_cFl = .text:0x80252600; // type:function size:0xC
 getJellyBlobCount = .text:0x80252610; // type:function size:0x8
-increaseJellyBlobCounter = .text:0x80252620; // type:function size:0xC
+increaseJellyBlobCounter__9dAcItem_cFl = .text:0x80252620; // type:function size:0xC
 getMonsterClawCount = .text:0x80252630; // type:function size:0x8
-increaseMonsterClawCounter = .text:0x80252640; // type:function size:0xC
+increaseMonsterClawCounter__9dAcItem_cFl = .text:0x80252640; // type:function size:0xC
 getMonsterHornCount = .text:0x80252650; // type:function size:0x8
-increaseMonsterHornCounter = .text:0x80252660; // type:function size:0xC
+increaseMonsterHornCounter__9dAcItem_cFl = .text:0x80252660; // type:function size:0xC
 getOrnamentalSkullCount = .text:0x80252670; // type:function size:0x8
-increaseSkullCounter = .text:0x80252680; // type:function size:0xC
+increaseSkullCounter__9dAcItem_cFl = .text:0x80252680; // type:function size:0xC
 getEvilCrystalCount = .text:0x80252690; // type:function size:0x8
-increaseEviLCrystalCounter = .text:0x802526A0; // type:function size:0xC
+increaseEvilCrystalCounter__9dAcItem_cFl = .text:0x802526A0; // type:function size:0xC
 getBlueBirdFeatherCount = .text:0x802526B0; // type:function size:0x8
-increaseBlueBirdFeatherCounter = .text:0x802526C0; // type:function size:0xC
+increaseBlueBirdFeatherCounter__9dAcItem_cFl = .text:0x802526C0; // type:function size:0xC
 getGoldenSkullCount = .text:0x802526D0; // type:function size:0x8
-increaseGoldenSkullCounter = .text:0x802526E0; // type:function size:0xC
+increaseGoldenSkullCounter__9dAcItem_cFl = .text:0x802526E0; // type:function size:0xC
 getGoddesPlumeCount = .text:0x802526F0; // type:function size:0x8
-increaseGoddessPlumeCounter = .text:0x80252700; // type:function size:0xC
+increaseGoddessPlumeCounter__9dAcItem_cFl = .text:0x80252700; // type:function size:0xC
 getGratitudeCrystalCount__9dAcItem_cFv = .text:0x80252710; // type:function size:0x8
-increaseGratitudeCrystalCounter = .text:0x80252720; // type:function size:0xC
+increaseGratitudeCrystalCounter__9dAcItem_cFl = .text:0x80252720; // type:function size:0xC
 ActorLink__hasLifeTreeSeeding = .text:0x80252730; // type:function size:0x38
-AcItem__giveLifeTreeSeedling = .text:0x80252770; // type:function size:0x94
+setLifeTreeSeedlingFlag__9dAcItem_cFl = .text:0x80252770; // type:function size:0x94
 getExtraWalletCount__9dAcItem_cFv = .text:0x80252810; // type:function size:0x8
-increaseExtraWalletCounter = .text:0x80252820; // type:function size:0xC
+increaseExtraWalletCounter__9dAcItem_cFl = .text:0x80252820; // type:function size:0xC
 getTotalRequiredKeyPieceCount__9dAcItem_cFv = .text:0x80252830; // type:function size:0x8
 hasAllKeyPieces = .text:0x80252840; // type:function size:0x44
 AcItem__getDefaultOffset = .text:0x80252890; // type:function size:0xC
@@ -13658,8 +13658,8 @@ fn_802528E0 = .text:0x802528E0; // type:function size:0xC
 fn_802528F0 = .text:0x802528F0; // type:function size:0x6C
 unsetHaveNoGravity__9dAcItem_cFv = .text:0x80252960; // type:function size:0xC
 getItemRotateAngle = .text:0x80252970; // type:function size:0x24
-getLightFruitTime = .text:0x802529A0; // type:function size:0x8
-shouldBlinkBeforeDespawn = .text:0x802529B0; // type:function size:0x30
+getLightFruitTime__9dAcItem_cFv = .text:0x802529A0; // type:function size:0x8
+isBlinkBeforeDespawnShown__9dAcItem_cFl = .text:0x802529B0; // type:function size:0x30
 AcItem__canBeLinkedToWoodTag = .text:0x802529E0; // type:function size:0x4
 AcItem__doDrop = .text:0x802529F0; // type:function size:0x24
 fn_80252A20 = .text:0x80252A20; // type:function size:0x8
@@ -13667,7 +13667,7 @@ fn_80252A30 = .text:0x80252A30; // type:function size:0x4
 ActorLink__getItemGetBottlePouchSlot = .text:0x80252A40; // type:function size:0x8
 fn_80252A50 = .text:0x80252A50; // type:function size:0xC
 fn_80252A60 = .text:0x80252A60; // type:function size:0xC
-AcItem__shouldNotShowModel = .text:0x80252A70; // type:function size:0xC
+isMdlHidden__9dAcItem_cCFv = .text:0x80252A70; // type:function size:0xC
 fn_80252A80 = .text:0x80252A80; // type:function size:0xC
 fn_80252A90 = .text:0x80252A90; // type:function size:0xC
 fn_80252AA0 = .text:0x80252AA0; // type:function size:0xC
@@ -13679,7 +13679,7 @@ AcItem__setFinalDeterminedItemId = .text:0x80252C70; // type:function size:0x8
 getItemInitStructForItem = .text:0x80252C80; // type:function size:0x5C
 getItemInitStruct__9dAcItem_cCFv = .text:0x80252CE0; // type:function size:0x8
 getItemFlagStruct__13dAcItemBase_cFUs = .text:0x80252CF0; // type:function size:0x54
-AcItem__setFlagForItem = .text:0x80252D50; // type:function size:0x34
+setFlagV__9dAcItem_cFv = .text:0x80252D50; // type:function size:0x34
 AcItem__checkFlagForItem2 = .text:0x80252D90; // type:function size:0x34
 AcItem__setItemFlagBasedOnId = .text:0x80252DD0; // type:function size:0x34
 AcItem__getTreasureShift = .text:0x80252E10; // type:function size:0x48
@@ -13690,9 +13690,9 @@ fn_80252F80 = .text:0x80252F80; // type:function size:0x88
 fn_80253010 = .text:0x80253010; // type:function size:0x88
 fn_802530A0 = .text:0x802530A0; // type:function size:0xFC
 applyBoundingBox__9dAcItem_cFv = .text:0x802531A0; // type:function size:0x28
-AcItem__performCollection1&2 = .text:0x802531D0; // type:function size:0x34
-AcItem__performCollection1 = .text:0x80253210; // type:function size:0x7E4
-AcItem__performCollection2 = .text:0x80253A00; // type:function size:0x350
+performCollection__9dAcItem_cFv = .text:0x802531D0; // type:function size:0x34
+performCollectionPart1__9dAcItem_cFv = .text:0x80253210; // type:function size:0x7E4
+performCollectionPart2__9dAcItem_cFv = .text:0x80253A00; // type:function size:0x350
 fn_80253D50 = .text:0x80253D50; // type:function size:0xC8
 fn_80253E20 = .text:0x80253E20; // type:function size:0xC
 fn_80253E30 = .text:0x80253E30; // type:function size:0x15C
@@ -13703,7 +13703,7 @@ AcItem__decideOnGetOrForcedGet = .text:0x80254260; // type:function size:0x80
 fn_802542E0 = .text:0x802542E0; // type:function size:0xA4
 AcItem__checkAbovePosition = .text:0x80254390; // type:function size:0x78
 fn_80254410 = .text:0x80254410; // type:function size:0x34
-AcItem__updateLightingMaybe = .text:0x80254450; // type:function size:0x134
+updateLightingMaybe__9dAcItem_cFv = .text:0x80254450; // type:function size:0x134
 fn_80254590 = .text:0x80254590; // type:function size:0xF0
 fn_80254680 = .text:0x80254680; // type:function size:0x20
 fn_802546A0 = .text:0x802546A0; // type:function size:0x64
@@ -13900,26 +13900,26 @@ isBabyRattle__9dAcItem_cCFv = .text:0x80256C30; // type:function size:0x8
 isEldinOre__9dAcItem_cCFv = .text:0x80256C40; // type:function size:0x8
 isJellyBlob__9dAcItem_cCFv = .text:0x80256C50; // type:function size:0x8
 isAnyRupee__9dAcItem_cCFv = .text:0x80256C60; // type:function size:0x8
-AcItem__isSingleArrowOrBundle = .text:0x80256C70; // type:function size:0x20
+isAnyArrow__9dAcItem_cCFv = .text:0x80256C70; // type:function size:0x20
 isInsect__9dAcItem_cCFv = .text:0x80256C90; // type:function size:0x8
 isUnkTreasureGroup1__9dAcItem_cCFv = .text:0x80256CA0; // type:function size:0x8
 isTreasure3__9dAcItem_cCFv = .text:0x80256CB0; // type:function size:0x8
-AcItem__isKeyPiece3 = .text:0x80256CC0; // type:function size:0x34
-AcItem__is5GratitudeCrystals2 = .text:0x80256D00; // type:function size:0x34
-AcItem__isItemSingleGratitudeCrystal = .text:0x80256D40; // type:function size:0x34
-AcItem__isFairy = .text:0x80256D80; // type:function size:0x34
-AcItem__isBottleFairy = .text:0x80256DC0; // type:function size:0x34
-AcItem__isStarryFirefly3 = .text:0x80256E00; // type:function size:0x34
-AcItem__isTreasureItem = .text:0x80256E40; // type:function size:0x34
+isKeyPieceV__9dAcItem_cCFv = .text:0x80256CC0; // type:function size:0x34
+is5GratitudeCrystals__9dAcItem_cCFv = .text:0x80256D00; // type:function size:0x34
+isGratitudeCrystal__9dAcItem_cCFv = .text:0x80256D40; // type:function size:0x34
+isFairyV__9dAcItem_cCFv = .text:0x80256D80; // type:function size:0x34
+isBottleFairyV__9dAcItem_cCFv = .text:0x80256DC0; // type:function size:0x34
+isStarryFireflyV__9dAcItem_cCFv = .text:0x80256E00; // type:function size:0x34
+isTreasureV__9dAcItem_cCFv = .text:0x80256E40; // type:function size:0x34
 fn_80256E80 = .text:0x80256E80; // type:function size:0x68
-AcItem__setSceneflagForItem = .text:0x80256EF0; // type:function size:0x28
+setSceneFlag__9dAcItem_cFv = .text:0x80256EF0; // type:function size:0x28
 fn_80256F20 = .text:0x80256F20; // type:function size:0x564
 AcItem__setGrabbableByBeetle = .text:0x80257490; // type:function size:0x10
 fn_802574A0 = .text:0x802574A0; // type:function size:0x6C
-AcItem__setDungeonflagForTear = .text:0x80257510; // type:function size:0x4C
+setDungeonFlag__9dAcItem_cFv = .text:0x80257510; // type:function size:0x4C
 fn_80257560 = .text:0x80257560; // type:function size:0x1A4
 fn_80257710 = .text:0x80257710; // type:function size:0x5C
-isFirstBitParams2NotSet = .text:0x80257770; // type:function size:0x28
+isFirstBitParams2NotSet__9dAcItem_cFv = .text:0x80257770; // type:function size:0x28
 fn_802577A0 = .text:0x802577A0; // type:function size:0x18
 fn_802577C0 = .text:0x802577C0; // type:function size:0x8
 fn_802577D0 = .text:0x802577D0; // type:function size:0x8
@@ -13928,10 +13928,10 @@ fn_802577F0 = .text:0x802577F0; // type:function size:0x8
 fn_80257800 = .text:0x80257800; // type:function size:0x6C
 fn_80257870 = .text:0x80257870; // type:function size:0x15C
 fn_802579D0 = .text:0x802579D0; // type:function size:0x40
-fn_80257A10 = .text:0x80257A10; // type:function size:0x68
-fn_80257A80 = .text:0x80257A80; // type:function size:0x3C
-fn_80257AC0 = .text:0x80257AC0; // type:function size:0x44
-fn_80257B10 = .text:0x80257B10; // type:function size:0x10
+fn_80257A10__13dAcItem_0xB3CFP9dAcItem_c = .text:0x80257A10; // type:function size:0x68
+fn_80257A80__13dAcItem_0xB3CFv = .text:0x80257A80; // type:function size:0x3C
+fn_80257AC0__13dAcItem_0xB3CFv = .text:0x80257AC0; // type:function size:0x44
+fn_80257B10__13dAcItem_0xB3CFv = .text:0x80257B10; // type:function size:0x10
 fn_80257B20 = .text:0x80257B20; // type:function size:0x4
 fn_80257B30 = .text:0x80257B30; // type:function size:0x4
 fn_80257B40 = .text:0x80257B40; // type:function size:0x8
@@ -13964,10 +13964,10 @@ finalizeState__23sFStateID_c<9dAcItem_c>CFR9dAcItem_c = .text:0x80257E50; // typ
 executeState__23sFStateID_c<9dAcItem_c>CFR9dAcItem_c = .text:0x80257E80; // type:function size:0x30
 initializeState__23sFStateID_c<9dAcItem_c>CFR9dAcItem_c = .text:0x80257EB0; // type:function size:0x30
 __sinit_\d_a_item_cpp = .text:0x80257EE0; // type:function size:0xDD0 scope:local
-fn_80258CB0 = .text:0x80258CB0; // type:function size:0x1C
-fn_80258CD0 = .text:0x80258CD0; // type:function size:0x40
-fn_80258D10 = .text:0x80258D10; // type:function size:0x1C
-fn_80258D30 = .text:0x80258D30; // type:function size:0x40
+__arraydtor$27711 = .text:0x80258CB0; // type:function size:0x1C
+__dt__9TearIdIdxFv = .text:0x80258CD0; // type:function size:0x40
+__arraydtor$28351 = .text:0x80258D10; // type:function size:0x1C
+__dt__20TearEffectColorThingFv = .text:0x80258D30; // type:function size:0x40
 __dt__23sFStateID_c<9dAcItem_c>Fv = .text:0x80258D70; // type:function size:0x58
 isSameName__23sFStateID_c<9dAcItem_c>CFPCc = .text:0x80258DD0; // type:function size:0x88
 dAcBomb_c_classInit__Fv = .text:0x80258E60; // type:function size:0x134
@@ -36252,7 +36252,7 @@ lbl_80533278 = .data:0x80533278; // type:object size:0x10 data:string
 lbl_80533288 = .data:0x80533288; // type:object size:0x13 data:string
 lbl_8053329C = .data:0x8053329C; // type:object size:0x14 data:string
 lbl_805332B0 = .data:0x805332B0; // type:object size:0xC data:string
-AcItem__TearGetDemoThings = .data:0x805332C0; // type:object size:0x40
+sTearIdxes = .data:0x805332C0; // type:object size:0x40
 lbl_80533300 = .data:0x80533300; // type:object size:0xE data:string
 lbl_80533310 = .data:0x80533310; // type:object size:0x11 data:string
 g_profile_ITEM = .data:0x80533328; // type:object size:0x10
@@ -36266,7 +36266,7 @@ lbl_80533D70 = .data:0x80533D70; // type:object size:0xC data:4byte
 jumptable_80533D7C = .data:0x80533D7C; // type:object size:0x90 scope:local
 lbl_80533E0C = .data:0x80533E0C; // type:object size:0xF data:string
 jumptable_80533E1C = .data:0x80533E1C; // type:object size:0x90 scope:local
-lbl_80533EAC = .data:0x80533EAC; // type:object size:0x34
+lbl_80533EB0 = .data:0x80533EB0; // type:object size:0x30
 __vt__9dAcItem_c = .data:0x80533EE0; // type:object size:0x98
 __vt__47sFStateMgr_c<9dAcItem_c,20sStateMethodUsr_FI_c> = .data:0x80533F78; // type:object size:0x30
 __vt__77sStateMgr_c<9dAcItem_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x80533FA8; // type:object size:0x30
@@ -41222,7 +41222,7 @@ lbl_8057396C = .sdata:0x8057396C; // type:object size:0x5 data:string
 lbl_80573974 = .sdata:0x80573974; // type:object size:0x5 data:string
 lbl_8057397C = .sdata:0x8057397C; // type:object size:0x5 data:string
 lbl_80573984 = .sdata:0x80573984; // type:object size:0x5 data:string
-ITEM_GET_BOTTLE_POUCH_SLOT = .sdata:0x8057398C; // type:object size:0x4 data:4byte
+sGetItemPouchSlot__9dAcItem_c = .sdata:0x8057398C; // type:object size:0x4 data:4byte
 lbl_80573990 = .sdata:0x80573990; // type:object size:0x6 data:string
 lbl_80573998 = .sdata:0x80573998; // type:object size:0x5 data:string
 lbl_805739A0 = .sdata:0x805739A0; // type:object size:0x5 data:string
@@ -42589,7 +42589,7 @@ lbl_805758B8 = .sbss:0x805758B8; // type:object size:0x4 align:4 data:float
 lbl_805758BC = .sbss:0x805758BC; // type:object size:0x4 align:4 data:float
 sItemList__9dAcItem_c = .sbss:0x805758C0; // type:object size:0x8 data:4byte
 lbl_805758C8 = .sbss:0x805758C8; // type:object size:0x8 data:4byte
-NUMBER_OF_ITEMS = .sbss:0x805758D0; // type:object size:0x4 data:4byte
+sGetItemQuantity__9dAcItem_c = .sbss:0x805758D0; // type:object size:0x4 data:4byte
 sIsPerformingInitialCollection__9dAcItem_c = .sbss:0x805758D4; // type:object size:0x1 data:byte
 TREASURE_TEMP_COLLECT = .sbss:0x805758D8; // type:object size:0x4 data:4byte
 sCollectionCurrentCount__9dAcItem_c = .sbss:0x805758DC; // type:object size:0x4 data:4byte
@@ -52262,7 +52262,7 @@ AcSalbageNpc__STATE_CARRIED = .bss:0x805B2334; // type:object size:0xF4 data:4by
 lbl_805B2428 = .bss:0x805B2428; // type:object size:0x10
 lbl_805B2438 = .bss:0x805B2438; // type:object size:0x6C align:4 data:float
 lbl_805B24A4 = .bss:0x805B24A4; // type:object size:0xC
-TgInsectCaptureMinigame__ACTOR_REF = .bss:0x805B24B0; // type:object size:0x10 data:4byte
+sInstance__26dTgMinigameInsectCapture_c = .bss:0x805B24B0; // type:object size:0x10 data:4byte
 lbl_805B24C0 = .bss:0x805B24C0; // type:object size:0x20
 lbl_805B24E0 = .bss:0x805B24E0; // type:object size:0x10
 StageMgr__STATE_READ_STAGE_RES = .bss:0x805B24F0; // type:object size:0x40 data:4byte
@@ -52362,8 +52362,8 @@ AcItem__DEFAULT_OFFSET = .bss:0x805B4548; // type:object size:0xC align:4 data:f
 AcItem__ZERO_OFFSET = .bss:0x805B4554; // type:object size:0xC align:4 data:float
 lbl_805B4560 = .bss:0x805B4560; // type:object size:0xC align:4 data:float
 lbl_805B456C = .bss:0x805B456C; // type:object size:0x18 align:4 data:float
-START_OF_ITEM_LIST = .bss:0x805B4584; // type:object size:0x18 data:4byte
-END_OF_ITEM_LIST = .bss:0x805B459C; // type:object size:0x1C data:4byte
+sItemListHead__9dAcItem_c = .bss:0x805B4584; // type:object size:0x18 data:4byte
+sItemListTail__9dAcItem_c = .bss:0x805B459C; // type:object size:0x1C data:4byte
 AcItem__STATE_WAIT = .bss:0x805B45B8; // type:object size:0x40 data:4byte
 AcItem__STATE_CARRY = .bss:0x805B45F8; // type:object size:0x40 data:4byte
 AcItem__STATE_GET_BEETLE = .bss:0x805B4638; // type:object size:0x40 data:4byte

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;

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;

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);

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);
 };
 

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

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

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;
 };
 

src/d/d_message.cpp

@@ -335,7 +335,7 @@ bool dFlow_c::handleEventInternal(const MsbFlowInfo *element) {
             if (dMessage_c::getInstance()->getField_0x2FC() != -1) {
                 dMessage_c::getInstance()->setField_0x2FC(0x3C);
             }
-            dAcItem_c::addRupees(params1n2);
+            dAcItem_c::increaseRupeeCounter(params1n2);
             if ((s32)params1n2 > 0) {
                 dLytMeter_c::setRupyField_0x8AD(1);
             }