Progress

2 files changed, 41 insertions, 40 deletions

diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt
index af44b95e..c8a60407 100644
--- a/config/SOUE01/splits.txt
+++ b/config/SOUE01/splits.txt
@@ -1495,6 +1495,7 @@ d/a/d_a_player.cpp:
 	.rodata     start:0x804EACF0 end:0x804EBBB0
 	.data       start:0x80530170 end:0x80533268
 	.sbss       start:0x805757B8 end:0x805758B8
+	.sdata2     start:0x8057B650 end:0x8057BD88
 
 d/a/d_a_item.cpp:
 	.text       start:0x80247200 end:0x80258E58 align:16
diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
index b5a0aca9..5cc32b3a 100644
--- a/config/SOUE01/symbols.txt
+++ b/config/SOUE01/symbols.txt
@@ -13324,10 +13324,10 @@ AcItem__isGoddessPlume = .text:0x802477D0; // type:function size:0x10
 isItemRevitalizingPotionPlusPlus = .text:0x802477E0; // type:function size:0x10
 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
-AcItem__isItemFromMitts = .text:0x80247980; // type:function size:0x10
-fn_80247990 = .text:0x80247990; // type:function size:0x8
+isDefaultDeleteGround__Fl = .text:0x80247930; // type:function size:0x20
+isDefaultSwimGround__Fl = .text:0x80247950; // type:function size:0x28
+isHeartDeleteGround__Fl = .text:0x80247980; // type:function size:0x10
+isHeartSwimGround__Fl = .text:0x80247990; // type:function size:0x8
 getRandomEntryFromWeightedList = .text:0x802479A0; // type:function size:0x17C
 determineActualItemIdFromItem__9dAcItem_cFUs = .text:0x80247B20; // type:function size:0x84
 fn_80247BB0 = .text:0x80247BB0; // type:function size:0x10C
@@ -13337,7 +13337,7 @@ fn_80247E70 = .text:0x80247E70; // type:function size:0x50
 increment__FPUl = .text:0x80247EC0; // type:function size:0x28
 fn_80247EF0 = .text:0x80247EF0; // type:function size:0xA4
 getItemId__13dAcItemBase_cCFv = .text:0x80247FA0; // type:function size:0x8
-fn_80247FB0 = .text:0x80247FB0; // type:function size:0x8
+setItemId__13dAcItemBase_cFUs = .text:0x80247FB0; // type:function size:0x8
 dAcItem_c_classInit__Fv = .text:0x80247FC0; // type:function size:0x30
 AcItem__dontForceDemo = .text:0x80247FF0; // type:function size:0x8
 AcItem__shouldForceDemo = .text:0x80248000; // type:function size:0x8
@@ -13392,7 +13392,7 @@ getTearIdx__9dAcItem_cFv = .text:0x8024A2C0; // type:function size:0xC
 getFirstBitParams2__9dAcBase_cCFv = .text:0x8024A2D0; // type:function size:0x24
 getParams2Lower_shift1_0x7__9dAcItem_cCFv = .text:0x8024A300; // type:function size:0x24
 getCurrentTrial__9dAcItem_cFv = .text:0x8024A330; // type:function size:0x68
-getTearSubtype__9dAcItem_cF7ITEM_ID = .text:0x8024A3A0; // type:function size:0x68
+getTearSubtype__9dAcItem_cFUl = .text:0x8024A3A0; // type:function size:0x68
 AcItem__GetItemGetType = .text:0x8024A410; // type:function size:0x3C
 AcItem__getItemListElement = .text:0x8024A450; // type:function size:0x8
 AcItem__getFinalDeterminedItemId = .text:0x8024A460; // type:function size:0x8
@@ -13450,9 +13450,9 @@ executeState_WaitSacredDewGetEffect__9dAcItem_cFv = .text:0x802506B0; // type:fu
 finalizeState_WaitSacredDewGetEffect__9dAcItem_cFv = .text:0x80250730; // type:function size:0x4
 getItemFromBWheelItem__9dAcItem_cFv = .text:0x80250740; // type:function size:0xEC
 setItemPosition__9dAcItem_cFRC7mVec3_c = .text:0x80250830; // type:function size:0x40
-fn_80250870 = .text:0x80250870; // type:function size:0x38
-isStateWait__9dAcItem_cFv = .text:0x802508B0; // type:function size:0x50
-AcItem__setCarriedAndTransitionToGetState = .text:0x80250900; // type:function size:0x50
+setItemVelocity__9dAcItem_cFf = .text:0x80250870; // type:function size:0x38
+isStateWait__9dAcItem_cCFv = .text:0x802508B0; // type:function size:0x50
+stopCarryAndGet__9dAcItem_cFv = .text:0x80250900; // type:function size:0x50
 AcItem__isGreenRupee = .text:0x80250950; // type:function size:0x10
 AcItem__isBlueRupee = .text:0x80250960; // type:function size:0x10
 AcItem__isRedRupee = .text:0x80250970; // type:function size:0x10
@@ -13506,13 +13506,13 @@ 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
 fn_80251180 = .text:0x80251180; // type:function size:0x44
-AcItem__getEventName = .text:0x802511D0; // type:function size:0x6C
-fn_80251240 = .text:0x80251240; // type:function size:0x6C
-AcItem__getEventNamePtrForItemId = .text:0x802512B0; // type:function size:0x4C
-getItemGetEventName__9dAcItem_cFUsPPCc = .text:0x80251300; // type:function size:0x4C
-fn_80251350 = .text:0x80251350; // type:function size:0x54
-AcItem__getPosition = .text:0x802513B0; // type:function size:0x24
-fn_802513E0 = .text:0x802513E0; // type:function size:0xC
+getEventNameForAnim__9dAcItem_cFUlPPCc = .text:0x802511D0; // type:function size:0x6C
+getTboxEventNameForAnim__9dAcItem_cFUlPPCc = .text:0x80251240; // type:function size:0x6C
+getItemGetEventName__9dAcItem_cFUsPPCc = .text:0x802512B0; // type:function size:0x4C
+getItemGetTboxEventName__9dAcItem_cFUsPPCc = .text:0x80251300; // type:function size:0x4C
+playHeartStemCutSound__9dAcItem_cFv = .text:0x80251350; // type:function size:0x54
+getOffsetPosition__9dAcItem_cCFR7mVec3_c = .text:0x802513B0; // type:function size:0x24
+scaleBy__9dAcItem_cCFf = .text:0x802513E0; // type:function size:0xC
 AcItem__getSmallKeyFreestandingScale = .text:0x802513F0; // type:function size:0x38
 fn_80251430 = .text:0x80251430; // type:function size:0x8
 fn_80251440 = .text:0x80251440; // type:function size:0x8
@@ -13746,14 +13746,14 @@ fn_80255B30 = .text:0x80255B30; // type:function size:0x6C
 fn_80255BA0 = .text:0x80255BA0; // type:function size:0x28
 fn_80255BD0 = .text:0x80255BD0; // type:function size:0x6C
 fn_80255C40 = .text:0x80255C40; // type:function size:0x10
-AcItem__IsSpawnedFromMittsOrSwordMaybe = .text:0x80255C50; // type:function size:0x48
-fn_80255CA0 = .text:0x80255CA0; // type:function size:0x48
+isItemDeleteGround__9dAcItem_cCFl = .text:0x80255C50; // type:function size:0x48
+isItemSwimGround__9dAcItem_cCFl = .text:0x80255CA0; // type:function size:0x48
 fn_80255CF0 = .text:0x80255CF0; // type:function size:0x60
 isDayOrInDungeon = .text:0x80255D50; // type:function size:0x54
 fn_80255DB0 = .text:0x80255DB0; // type:function size:0x3C
 fn_80255DF0 = .text:0x80255DF0; // type:function size:0x84
-fn_80255E80 = .text:0x80255E80; // type:function size:0xB4
-fn_80255F40 = .text:0x80255F40; // type:function size:0x1C
+rotateTowardsCamera__9dAcItem_cFv = .text:0x80255E80; // type:function size:0xB4
+rotateFixedBirdStatuette__9dAcItem_cFv = .text:0x80255F40; // type:function size:0x1C
 fn_80255F60 = .text:0x80255F60; // type:function size:0x8
 fn_80255F70 = .text:0x80255F70; // type:function size:0x8
 fn_80255F80 = .text:0x80255F80; // type:function size:0x8
@@ -13923,32 +13923,32 @@ isFirstBitParams2NotSet__9dAcItem_cFv = .text:0x80257770; // type:function size:
 fn_802577A0 = .text:0x802577A0; // type:function size:0x18
 fn_802577C0 = .text:0x802577C0; // type:function size:0x8
 fn_802577D0 = .text:0x802577D0; // type:function size:0x8
-fn_802577E0 = .text:0x802577E0; // type:function size:0x4
-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
+vt_0x0C__15dAcItem_0xB34_1Fv = .text:0x802577E0; // type:function size:0x4
+vt_0x10__15dAcItem_0xB34_1FP9dAcItem_c = .text:0x802577F0; // type:function size:0x8
+vt_0x0C__15dAcItem_0xB34_2Fv = .text:0x80257800; // type:function size:0x6C
+vt_0x10__15dAcItem_0xB34_2FP9dAcItem_c = .text:0x80257870; // type:function size:0x15C
+fn_802579D0__13dAcItem_0xB3CFv = .text:0x802579D0; // type:function size:0x40
 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
-fn_80257B50 = .text:0x80257B50; // type:function size:0x8
+fn_80257B10__13dAcItem_0xB3CCFv = .text:0x80257B10; // type:function size:0x10
+vt_0x0C__15dAcItem_0xB3C_1FUs = .text:0x80257B20; // type:function size:0x4
+vt_0x10__15dAcItem_0xB3C_1Fv = .text:0x80257B30; // type:function size:0x4
+vt_0x14__15dAcItem_0xB3C_1FP9dAcItem_c = .text:0x80257B40; // type:function size:0x8
+vt_0x18__15dAcItem_0xB3C_1Fv = .text:0x80257B50; // type:function size:0x8
 fn_80257B60 = .text:0x80257B60; // type:function size:0x4
 fn_80257B70 = .text:0x80257B70; // type:function size:0x4
 fn_80257B80 = .text:0x80257B80; // type:function size:0x8
 fn_80257B90 = .text:0x80257B90; // type:function size:0x8
 isOutOfTime = .text:0x80257BA0; // type:function size:0x1C
-fn_80257BC0 = .text:0x80257BC0; // type:function size:0x8
-fn_80257BD0 = .text:0x80257BD0; // type:function size:0x4
-fn_80257BE0 = .text:0x80257BE0; // type:function size:0x28
-fn_80257C10 = .text:0x80257C10; // type:function size:0x8
-fn_80257C20 = .text:0x80257C20; // type:function size:0x40
-fn_80257C60 = .text:0x80257C60; // type:function size:0x40
-fn_80257CA0 = .text:0x80257CA0; // type:function size:0x40
-fn_80257CE0 = .text:0x80257CE0; // type:function size:0x40
+vt_0x0C__15dAcItem_0xB3C_2FUs = .text:0x80257BC0; // type:function size:0x8
+vt_0x10__15dAcItem_0xB3C_2Fv = .text:0x80257BD0; // type:function size:0x4
+vt_0x14__15dAcItem_0xB3C_2FP9dAcItem_c = .text:0x80257BE0; // type:function size:0x28
+vt_0x18__15dAcItem_0xB3C_2Fv = .text:0x80257C10; // type:function size:0x8
+__dt__15dAcItem_0xB3C_2Fv = .text:0x80257C20; // type:function size:0x40
+__dt__15dAcItem_0xB3C_1Fv = .text:0x80257C60; // type:function size:0x40
+__dt__15dAcItem_0xB34_2Fv = .text:0x80257CA0; // type:function size:0x40
+__dt__15dAcItem_0xB34_1Fv = .text:0x80257CE0; // type:function size:0x40
 build__24sFStateFct_c<9dAcItem_c>FRC12sStateIDIf_c = .text:0x80257D20; // type:function size:0x60
 dispose__24sFStateFct_c<9dAcItem_c>FRP10sStateIf_c = .text:0x80257D80; // type:function size:0xC
 initialize__21sFState_c<9dAcItem_c>Fv = .text:0x80257D90; // type:function size:0x1C
@@ -28530,7 +28530,7 @@ DEFAULT_ITEM_INIT_STRUCT = .rodata:0x804EC42C; // type:object size:0x14
 sItemFlagStructs__13dAcItemBase_c = .rodata:0x804EC440; // type:object size:0x538 scope:local
 sItemTypeFlags__13dAcItemBase_c = .rodata:0x804EC978; // type:object size:0x7F8 scope:local
 TRIAL_INDEX_STRUCTS = .rodata:0x804ED170; // type:object size:0x20
-GLITTERING_SPORES_CHANCES = .rodata:0x804ED190; // type:object size:0x20 data:4byte
+sSporeRupeeChances = .rodata:0x804ED190; // type:object size:0x20 data:4byte
 lbl_804ED1B0 = .rodata:0x804ED1B0; // type:object size:0x18
 lbl_804ED1C8 = .rodata:0x804ED1C8; // type:object size:0x18
 lbl_804ED1E0 = .rodata:0x804ED1E0; // type:object size:0x10
@@ -48030,7 +48030,7 @@ lbl_8057BD74 = .sdata2:0x8057BD74; // type:object size:0x4 align:4 data:float
 lbl_8057BD78 = .sdata2:0x8057BD78; // type:object size:0x4 align:4 data:float
 lbl_8057BD7C = .sdata2:0x8057BD7C; // type:object size:0x4 align:4 data:float
 lbl_8057BD80 = .sdata2:0x8057BD80; // type:object size:0x4 align:4 data:float
-DEFAULT_ITEM_FLAG_STRUCT = .sdata2:0x8057BD88; // type:object size:0x8
+sDefaultFlagStruct__13dAcItemBase_c = .sdata2:0x8057BD88; // type:object size:0x8
 lbl_8057BD90 = .sdata2:0x8057BD90; // type:object size:0x4 data:4byte
 lbl_8057BD94 = .sdata2:0x8057BD94; // type:object size:0x4 data:4byte
 lbl_8057BD98 = .sdata2:0x8057BD98; // type:object size:0x4 data:4byte