implement freestanding heart pieces

src/d/actor/d_a_obj_item.cpp

@@ -897,6 +897,12 @@ void daItem_c::itemGetNextExecute() {
         // is better than littering the original switch statement with #if TARGET_PC
         if (randomizer_IsActive()) {
             switch (m_itemNo) {
+            case dItemNo_HEART_e:
+            case dItemNo_GREEN_RUPEE_e:
+            case dItemNo_ARROW_10_e:
+            case dItemNo_ARROW_20_e:
+            case dItemNo_ARROW_30_e:
+            case dItemNo_ARROW_1_e:
             case dItemNo_BLUE_RUPEE_e:
             case dItemNo_YELLOW_RUPEE_e:
             case dItemNo_RED_RUPEE_e:

src/d/actor/d_a_obj_life_container.cpp

@@ -12,6 +12,13 @@
 #include "SSystem/SComponent/c_math.h"
 #include <cstring>
 
+#if TARGET_PC
+#include "d/actor/d_a_alink.h"
+#include "dusk/randomizer/game/tools.h"
+#include "dusk/randomizer/game/verify_item_functions.h"
+#include "dusk/randomizer/game/stages.h"
+#endif
+
 const static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xffffffff, 0x11}, 0x59}}, // mObj
@@ -97,6 +104,22 @@ int daObjLife_c::Create() {
     field_0x94c = 0.7f;
     mRotateSpeed = 7000;
 
+#if TARGET_PC
+    if (randomizer_IsActive()) {
+        // If we're on certain stages, turn the item's gravity off
+        if (daAlink_c::checkStageName(allStages[Hyrule_Field]) ||
+            daAlink_c::checkStageName(allStages[Upper_Zoras_River]) ||
+            daAlink_c::checkStageName(allStages[Sacred_Grove]) ||
+            daAlink_c::checkStageName(allStages[Stallord]) ||
+            daAlink_c::checkStageName(allStages[Zant_Main_Room]))
+        {
+            mRotateSpeed = 550;
+            fopAcM_SetGravity(this, 0.f);
+        }
+
+        // TODO: rando Foolish item stuff
+    }
+#endif
     setEffect();
     mSound.init(&current.pos, 1);
     return 1;
@@ -105,7 +128,7 @@ int daObjLife_c::Create() {
 void daObjLife_c::setEffect() {
 #if TARGET_PC
     if (randomizer_IsActive()) {
-        // We don't want rupees or poe souls to sparkle. They are bright enough.
+        // In randomizer, we don't want rupees or poe souls to sparkle. They are bright enough.
         switch(m_itemNo)
         {
             case dItemNo_Randomizer_GREEN_RUPEE_e:
@@ -163,6 +186,111 @@ int daObjLife_c::create() {
         mIsPrmsInit = true;
     }
 
+#if TARGET_PC
+    if (randomizer_IsActive()) {
+        u32 params = fopAcM_GetParam(this);
+        u8 flag = getSaveBitNo();
+        u8 stageIdx = getStageID();
+        const auto& freestandingOverrides = randomizer_GetContext().mFreestandingItemOverrides;
+        // If we found an override for this freestanding item
+        if (freestandingOverrides.contains(stageIdx) && freestandingOverrides.at(stageIdx).contains(flag)) {
+            // Clear the itemId and set it to out new itemId
+            params &= 0xFFFFFF00;
+            u8 overrideItem = freestandingOverrides.at(stageIdx).at(flag);
+            u8 newItemId = verifyProgressiveItem(overrideItem);
+            params |= newItemId;
+            fopAcM_SetParam(this, params);
+
+            // Also adjust the height of the object depending on the item
+            switch (newItemId) {
+                case dItemNo_Randomizer_MASTER_SWORD_e:
+                case dItemNo_Randomizer_LIGHT_SWORD_e:
+                case dItemNo_Randomizer_WOOD_SHIELD_e:
+                case dItemNo_Randomizer_HYLIA_SHIELD_e:
+                case dItemNo_Randomizer_SHIELD_e:
+                case dItemNo_Randomizer_SPINNER_e:
+                {
+                    current.pos.y += 30.f;
+                    break;
+                }
+                case dItemNo_Randomizer_WOOD_STICK_e:
+                {
+                    current.pos.y += 60.f;
+                    break;
+                }
+                case dItemNo_Randomizer_SWORD_e:
+                case dItemNo_Randomizer_MIRROR_PIECE_1_e:
+                case dItemNo_Randomizer_MIRROR_PIECE_2_e:
+                case dItemNo_Randomizer_MIRROR_PIECE_3_e:
+                case dItemNo_Randomizer_MIRROR_PIECE_4_e:
+                case dItemNo_Randomizer_FUSED_SHADOW_1_e:
+                case dItemNo_Randomizer_FUSED_SHADOW_2_e:
+                case dItemNo_Randomizer_FUSED_SHADOW_3_e:
+                case dItemNo_Randomizer_COPY_ROD_e:
+                case dItemNo_Randomizer_COPY_ROD_2_e:
+                {
+                    current.pos.y += 50.f;
+                    break;
+                }
+
+                case dItemNo_Randomizer_BOW_e:
+                {
+                    current.pos.y += 55.f;
+                    break;
+                }
+                case dItemNo_Randomizer_BOOMERANG_e:
+                case dItemNo_Randomizer_FISHING_ROD_1_e:
+                case dItemNo_Randomizer_ARROW_LV2_e:
+                case dItemNo_Randomizer_ARROW_LV3_e:
+                {
+                    current.pos.y += 40.f;
+                    break;
+                }
+                case dItemNo_Randomizer_FOREST_SMALL_KEY_e:
+                case dItemNo_Randomizer_MINES_SMALL_KEY_e:
+                case dItemNo_Randomizer_LAKEBED_SMALL_KEY_e:
+                case dItemNo_Randomizer_ARBITERS_SMALL_KEY_e:
+                case dItemNo_Randomizer_SNOWPEAK_SMALL_KEY_e:
+                case dItemNo_Randomizer_TEMPLE_OF_TIME_SMALL_KEY_e:
+                case dItemNo_Randomizer_CITY_SMALL_KEY_e:
+                case dItemNo_Randomizer_PALACE_SMALL_KEY_e:
+                case dItemNo_Randomizer_HYRULE_SMALL_KEY_e:
+                case dItemNo_Randomizer_FOREST_BOSS_KEY_e:
+                case dItemNo_Randomizer_LAKEBED_BOSS_KEY_e:
+                case dItemNo_Randomizer_ARBITERS_BOSS_KEY_e:
+                case dItemNo_Randomizer_TEMPLE_OF_TIME_BOSS_KEY_e:
+                case dItemNo_Randomizer_CITY_BOSS_KEY_e:
+                case dItemNo_Randomizer_PALACE_BOSS_KEY_e:
+                case dItemNo_Randomizer_HYRULE_BOSS_KEY_e:
+                case dItemNo_Randomizer_SMALL_KEY2_e:
+                case dItemNo_Randomizer_LV5_BOSS_KEY_e:
+                case dItemNo_Randomizer_CAMP_SMALL_KEY_e:
+                case dItemNo_Randomizer_BOSSRIDER_KEY_e:
+                case dItemNo_Randomizer_PACHINKO_e:
+                case dItemNo_Randomizer_BOMB_BAG_LV2_e:
+                case dItemNo_Randomizer_BOMB_BAG_LV1_e:
+                case dItemNo_Randomizer_BOMB_IN_BAG_e:
+                case dItemNo_Randomizer_NORMAL_BOMB_e:
+                case dItemNo_Randomizer_POU_SPIRIT_e:
+                {
+                    current.pos.y += 20.f;
+                    break;
+                }
+
+                case dItemNo_Randomizer_ARMOR_e:
+                {
+                    current.pos.y += 25.f;
+                    break;
+                }
+                default:
+                {
+                    break;
+                }
+            }
+        }
+    }
+#endif
+
     m_itemNo = getItemNo();
     if (m_itemNo != dItemNo_KAKERA_HEART_e && m_itemNo != dItemNo_UTAWA_HEART_e) {
         // "Heart Container: Item No is incorrect!<%d>\n"
@@ -173,7 +301,8 @@ int daObjLife_c::create() {
         return cPhs_ERROR_e;
     }
 
-    if (m_itemNo == dItemNo_UTAWA_HEART_e && dComIfGs_isStageLife()) {
+    // Don't return an error here in randomizer
+    if (m_itemNo == dItemNo_UTAWA_HEART_e && dComIfGs_isStageLife() IF_DUSK(&& !randomizer_IsActive())) {
         return cPhs_ERROR_e;
     }
 
@@ -415,8 +544,40 @@ int daObjLife_c::actionWait2() {
 }
 
 void daObjLife_c::calcScale() {
+#if TARGET_PC
+    // If rando is active, make certain modifications
+    f32 newScale = 1.0f;
+    if (randomizer_IsActive()) {
+        // Change scale for certain items
+        switch (m_itemNo) {
+        case dItemNo_Randomizer_KAKERA_HEART_e:
+        case dItemNo_Randomizer_UTAWA_HEART_e:
+        case dItemNo_Randomizer_ARROW_10_e:
+        case dItemNo_Randomizer_ARROW_20_e:
+        case dItemNo_Randomizer_ARROW_30_e:
+            newScale = 1.0f;
+            break;
+        case dItemNo_Randomizer_BOW_e:
+            newScale = 1.5f;
+            break;
+        case dItemNo_Randomizer_MASTER_SWORD_e:
+        case dItemNo_Randomizer_LIGHT_SWORD_e:
+        case dItemNo_Randomizer_MIRROR_PIECE_1_e:
+        case dItemNo_Randomizer_MIRROR_PIECE_2_e:
+        case dItemNo_Randomizer_MIRROR_PIECE_3_e:
+        case dItemNo_Randomizer_MIRROR_PIECE_4_e:
+            newScale = 0.7f;
+            break;
+        default:
+            newScale = 2.0f;
+        }
+    }
+    cLib_chaseF(&field_0x954, newScale, 0.2f);
+    if (field_0x954 == newScale) {
+#else
     cLib_chaseF(&field_0x954, 1.0f, 0.2f);
     if (field_0x954 == 1.0f) {
+#endif
         cLib_chaseF(&field_0x94c, 0.0f, 0.05f);
         field_0x950 = field_0x94c * cM_ssin(field_0x95e * 3000);
 

src/dusk/imgui/ImGuiMenuRandomizer.cpp

@@ -64,7 +64,7 @@ namespace dusk {
             }
 
             // Freestanding Overrides
-            if (location->HasCategories("Rupee - Freestanding") || location->HasCategories("Golden Bug")) {
+            if (location->HasCategories("Freestanding Item")) {
                 u8 stage = metaData[0]["Stage"].as<u8>();
                 u8 flag = metaData[0]["Flag"].as<u8>();
                 u8 itemId = location->GetCurrentItem()->GetID();

src/dusk/randomizer/generator/data/actor_patches.yaml

@@ -127,9 +127,9 @@ F_SP111:
         y: 0x0000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x91
-        name: item
-        parameters: 0xF1FF91D4
+        # Turn this bug into a htPiece actor with collectible flag 0x91
+        name: htPiece
+        parameters: 0x00FF91D4
       layers:
         - 0
         - 2
@@ -151,9 +151,9 @@ F_SP113:
         y: 0x0000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x9F
-        name: item
-        parameters: 0xF1FF9FD2
+        # Turn this bug into a htPiece actor with collectible flag 0x9F
+        name: htPiece
+        parameters: 0x00FF9FD2
         position:
           y: -5300
       layers:
@@ -176,9 +176,9 @@ F_SP117:
         y: 0x0000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x99
-        name: item
-        parameters: 0xF1FF99D0
+        # Turn this bug into a htPiece actor with collectible flag 0x99
+        name: htPiece
+        parameters: 0x00FF99D0
         position:
           y: 1383
       layers:
@@ -198,9 +198,9 @@ F_SP117:
         y: 0x5D27
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x98
-        name: item
-        parameters: 0xF1FF98D1
+        # Turn this bug into a htPiece actor with collectible flag 0x98
+        name: htPiece
+        parameters: 0x00FF98D1
       layers:
         - 2
 
@@ -220,9 +220,9 @@ F_SP121:
         y: 0x0000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x99
-        name: item
-        parameters: 0xF1FF99C2
+        # Turn this bug into a htPiece actor with collectible flag 0x99
+        name: htPiece
+        parameters: 0x00FF99C2
       layers:
         - 0
         - 6
@@ -240,9 +240,9 @@ F_SP121:
         y: 0x0000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x98
-        name: item
-        parameters: 0xF1FF98C3
+        # Turn this bug into a htPiece actor with collectible flag 0x98
+        name: htPiece
+        parameters: 0x00FF98C3
       layers:
         - 0
         - 6
@@ -260,9 +260,9 @@ F_SP121:
         y: 0x4000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x97
-        name: item
-        parameters: 0xF1FF97C8
+        # Turn this bug into a htPiece actor with collectible flag 0x97
+        name: htPiece
+        parameters: 0x00FF97C8
       layers:
         - 0
         - 6
@@ -280,9 +280,9 @@ F_SP121:
         y: 0x58E3
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x96
-        name: item
-        parameters: 0xF1FF96C9
+        # Turn this bug into a htPiece actor with collectible flag 0x96
+        name: htPiece
+        parameters: 0x00FF96C9
       layers:
         - 0
         - 6
@@ -302,9 +302,9 @@ F_SP121:
         y: 0x8000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x95
-        name: item
-        parameters: 0xF1FF95CA
+        # Turn this bug into a htPiece actor with collectible flag 0x95
+        name: htPiece
+        parameters: 0x00FF95CA
       layers:
         - 0
         - 6
@@ -321,9 +321,9 @@ F_SP121:
         y: 0x8000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x94
-        name: item
-        parameters: 0xF1FF94CB
+        # Turn this bug into a htPiece actor with collectible flag 0x94
+        name: htPiece
+        parameters: 0x00FF94CB
       layers:
         - 0
         - 6
@@ -342,9 +342,9 @@ F_SP121:
         y: 0x0000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x9F
-        name: item
-        parameters: 0xF1FF9FC0
+        # Turn this bug into a htPiece actor with collectible flag 0x9F
+        name: htPiece
+        parameters: 0x00FF9FC0
         position:
           y: -8910 # Lower by 100 so Link can reach it
       layers:
@@ -365,9 +365,9 @@ F_SP121:
         y: 0x2000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x9E
-        name: item
-        parameters: 0xF1FF9EC1
+        # Turn this bug into a htPiece actor with collectible flag 0x9E
+        name: htPiece
+        parameters: 0x00FF9EC1
       layers:
         - 0
         - 6
@@ -388,9 +388,9 @@ F_SP121:
         y: 0x0000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x9B
-        name: item
-        parameters: 0xF1FF9BC4
+        # Turn this bug into a htPiece actor with collectible flag 0x9B
+        name: htPiece
+        parameters: 0x00FF9BC4
       layers:
         - 0
         - 6
@@ -407,9 +407,9 @@ F_SP121:
         y: 0x0000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x9A
-        name: item
-        parameters: 0xF1FF9AC5
+        # Turn this bug into a htPiece actor with collectible flag 0x9A
+        name: htPiece
+        parameters: 0x00FF9AC5
       layers:
         - 0
         - 6
@@ -428,9 +428,9 @@ F_SP121:
         y: 0x4000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x93
-        name: item
-        parameters: 0xF1FF93CC
+        # Turn this bug into a htPiece actor with collectible flag 0x93
+        name: htPiece
+        parameters: 0x00FF93CC
       layers:
         - 0
         - 6
@@ -447,9 +447,9 @@ F_SP121:
         y: 0xC000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x92
-        name: item
-        parameters: 0xF1FF92CD
+        # Turn this bug into a htPiece actor with collectible flag 0x92
+        name: htPiece
+        parameters: 0x00FF92CD
       layers:
         - 0
         - 6
@@ -470,9 +470,9 @@ F_SP122:
         y: 0x0000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x9D
-        name: item
-        parameters: 0xF1FF9DC2
+        # Turn this bug into a htPiece actor with collectible flag 0x9D
+        name: htPiece
+        parameters: 0x00FF9DC2
         position:
           y: -471
       layers:
@@ -490,9 +490,9 @@ F_SP122:
         y: 0x0000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x9D
-        name: item
-        parameters: 0xF1FF9DC2
+        # Turn this bug into a htPiece actor with collectible flag 0x9D
+        name: htPiece
+        parameters: 0x00FF9DC2
         position:
           y: -471
       layers:
@@ -510,9 +510,9 @@ F_SP122:
         y: 0x0000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x9C
-        name: item
-        parameters: 0xF1FF9CCD
+        # Turn this bug into a htPiece actor with collectible flag 0x9C
+        name: htPiece
+        parameters: 0x00FF9CCD
         position:
           y: -706
       layers:
@@ -533,9 +533,9 @@ F_SP122:
         y: 0x0000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x91
-        name: item
-        parameters: 0xF1FF91CE
+        # Turn this bug into a htPiece actor with collectible flag 0x91
+        name: htPiece
+        parameters: 0x00FF91CE
         position:
           y: -6081 # Lower the item so it isn't awkwardly floating
       layers:
@@ -555,9 +555,9 @@ F_SP122:
         y: 0x0000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x90
-        name: item
-        parameters: 0xF1FF90CF
+        # Turn this bug into a htPiece actor with collectible flag 0x90
+        name: htPiece
+        parameters: 0x00FF90CF
       layers:
         - 0
         - 1
@@ -579,9 +579,9 @@ F_SP124:
         y: 0x0000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x99
-        name: item
-        parameters: 0xF1FF99D6
+        # Turn this bug into a htPiece actor with collectible flag 0x99
+        name: htPiece
+        parameters: 0x00FF99D6
       layers:
         - 0
 
@@ -597,9 +597,9 @@ F_SP124:
         y: 0x0000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x98
-        name: item
-        parameters: 0xF1FF98D7
+        # Turn this bug into a htPiece actor with collectible flag 0x98
+        name: htPiece
+        parameters: 0x00FF98D7
       layers:
         - 0
 
@@ -619,9 +619,9 @@ F_SP126:
         y: 0x0000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x9E
-        name: item
-        parameters: 0xF1FF9ED3
+        # Turn this bug into a htPiece actor with collectible flag 0x9E
+        name: htPiece
+        parameters: 0x00FF9ED3
       layers:
         - 0
         - 1
@@ -642,9 +642,9 @@ R_SP109:
         y: 0x8000
         z: 0x0000
       patch:
-        # Turn this bug into an item actor with collectible flag 0x90
-        name: item
-        parameters: 0xF1FF90D5
+        # Turn this bug into a htPiece actor with collectible flag 0x90
+        name: htPiece
+        parameters: 0x00FF90D5
       layers:
         - 0
         - 1

src/dusk/randomizer/generator/data/locations.yaml

@@ -81,6 +81,7 @@
     - Overworld
     - Ordona Province
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 43
       Flag: 0x80
@@ -91,6 +92,7 @@
     - Overworld
     - Ordona Province
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 43
       Flag: 0x8B
@@ -101,6 +103,7 @@
     - Overworld
     - Ordona Province
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 43
       Flag: 0x8A
@@ -111,6 +114,7 @@
     - Overworld
     - Ordona Province
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 43
       Flag: 0x86
@@ -121,6 +125,7 @@
     - Overworld
     - Ordona Province
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 43
       Flag: 0x88
@@ -131,6 +136,7 @@
     - Overworld
     - Ordona Province
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 43
       Flag: 0x96
@@ -141,6 +147,7 @@
     - Overworld
     - Ordona Province
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 43
       Flag: 0x95
@@ -151,6 +158,7 @@
     - Overworld
     - Ordona Province
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 43
       Flag: 0x91
@@ -161,6 +169,7 @@
     - Overworld
     - Ordona Province
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 43
       Flag: 0x82
@@ -171,6 +180,7 @@
     - Overworld
     - Ordona Province
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 43
       Flag: 0x87
@@ -181,6 +191,7 @@
     - Overworld
     - Ordona Province
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 43
       Flag: 0x85
@@ -191,6 +202,7 @@
     - Overworld
     - Ordona Province
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 43
       Flag: 0x84
@@ -201,6 +213,7 @@
     - Overworld
     - Ordona Province
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 43
       Flag: 0x81
@@ -211,6 +224,7 @@
     - Overworld
     - Ordona Province
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 43
       Flag: 0x94
@@ -221,6 +235,7 @@
     - Overworld
     - Ordona Province
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 43
       Flag: 0x97
@@ -231,6 +246,7 @@
     - Overworld
     - Ordona Province
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 43
       Flag: 0x89
@@ -633,6 +649,7 @@
     - Golden Bug
     - Hyrule Field - Faron Province
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 56
       Flag: 0x9F
@@ -644,6 +661,7 @@
     - Golden Bug
     - Hyrule Field - Faron Province
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 56
       Flag: 0x9E
@@ -664,8 +682,10 @@
     - Overworld
     - Hyrule Field - Faron Province
     - ARC
+    - Freestanding Item
   Metadata:
-    - None
+    - Stage: 56
+      Flag: 0x81
 
 - Name: Lost Woods Boulder Poe
   Original Item: Poe Soul
@@ -756,6 +776,7 @@
     - Golden Bug
     - Sacred Grove
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 54
       Flag: 0x98
@@ -767,6 +788,7 @@
     - Golden Bug
     - Sacred Grove
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 54
       Flag: 0x99
@@ -1006,8 +1028,10 @@
     - Overworld
     - Hyrule Field - Eldin Province
     - ARC
+    - Freestanding Item
   Metadata:
-    - None
+    - Stage: 56
+      Flag: 0x82
 
 - Name: Kakariko Gorge Double Clawshot Chest
   Original Item: Piece of Heart
@@ -1099,8 +1123,10 @@
     - Overworld
     - Kakariko Village
     - DZX
+    - Freestanding Item
   Metadata:
-    - None
+    - Stage: 46
+      Flag: 0x8C
 
 - Name: Kakariko Village Bell Rupee
   Original Item: Silver Rupee
@@ -1196,6 +1222,7 @@
     - Golden Bug
     - Kakariko Village
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 68
       Flag: 0x90
@@ -1329,6 +1356,7 @@
     - Golden Bug
     - Kakariko Graveyard
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 48
       Flag: 0x91
@@ -1388,6 +1416,7 @@
     - Overworld
     - Death Mountain
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -1398,6 +1427,7 @@
     - Overworld
     - Death Mountain
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -1408,6 +1438,7 @@
     - Overworld
     - Death Mountain
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -1472,6 +1503,7 @@
     - Golden Bug
     - Hyrule Field - Eldin Province
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 56
       Flag: 0x98
@@ -1483,6 +1515,7 @@
     - Golden Bug
     - Hyrule Field - Eldin Province
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 56
       Flag: 0x99
@@ -1494,8 +1527,10 @@
     - Npc
     - Hyrule Field - Eldin Province
     - Boss
+    - Freestanding Item
   Metadata:
-    - None
+    - Stage: 56
+      Flag: 0x80
 
 - Name: Eldin Field Water Bomb Fish Grotto Chest
   Original Item: Purple Rupee
@@ -1516,6 +1551,7 @@
     - Golden Bug
     - Hyrule Field - Eldin Province
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 56
       Flag: 0x96
@@ -1527,6 +1563,7 @@
     - Golden Bug
     - Hyrule Field - Eldin Province
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 56
       Flag: 0x97
@@ -1643,9 +1680,10 @@
     - Overworld
     - Npc
     - Hidden Village
-    - DZX
+    - Freestanding Item
   Metadata:
-    - None
+    - Stage: 63
+      Flag: 0x8B
 
 - Name: Hidden Village Poe
   Original Item: Poe Soul
@@ -1869,6 +1907,7 @@
     - Golden Bug
     - Hyrule Field - Lanayru Province
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 56
       Flag: 0x9A
@@ -1880,6 +1919,7 @@
     - Golden Bug
     - Hyrule Field - Lanayru Province
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 56
       Flag: 0x9B
@@ -1974,6 +2014,7 @@
     - Golden Bug
     - Hyrule Field - Lanayru Province
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 57
       Flag: 0x9C
@@ -1985,6 +2026,7 @@
     - Golden Bug
     - Hyrule Field - Lanayru Province
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 57
       Flag: 0x9D
@@ -2469,6 +2511,7 @@
     - Golden Bug
     - Hyrule Field - Lanayru Province
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 57
       Flag: 0x91
@@ -2480,6 +2523,7 @@
     - Golden Bug
     - Hyrule Field - Lanayru Province
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 57
       Flag: 0x90
@@ -2592,6 +2636,7 @@
     - Golden Bug
     - Hyrule Field - Lanayru Province
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 56
       Flag: 0x92
@@ -2603,6 +2648,7 @@
     - Golden Bug
     - Hyrule Field - Lanayru Province
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 56
       Flag: 0x93
@@ -2905,6 +2951,7 @@
     - Overworld
     - Lake Hylia
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -2924,6 +2971,7 @@
     - Overworld
     - Lake Hylia
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3169,6 +3217,7 @@
     - Golden Bug
     - Upper Zoras River
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 61
       Flag: 0x9E
@@ -3256,8 +3305,10 @@
     - Fishing Hole
     - ARC
     - REL
+    - Freestanding Item
   Metadata:
-    - None
+    - Stage: 62
+      Flag: 0x80
 
 - Name: Zoras Domain Male Dragonfly
   Original Item: Male Dragonfly
@@ -3266,6 +3317,7 @@
     - Golden Bug
     - Zoras Domain
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 50
       Flag: 0x9F
@@ -3318,6 +3370,7 @@
     - Overworld
     - Zoras Domain
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3346,6 +3399,7 @@
     - Overworld
     - Zoras Domain
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3374,6 +3428,7 @@
     - Overworld
     - Zoras Domain
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3384,6 +3439,7 @@
     - Overworld
     - Zoras Domain
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3394,6 +3450,7 @@
     - Overworld
     - Zoras Domain
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3436,6 +3493,7 @@
     - Overworld
     - Zoras Domain
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3446,6 +3504,7 @@
     - Overworld
     - Zoras Domain
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3456,6 +3515,7 @@
     - Overworld
     - Zoras Domain
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3466,6 +3526,7 @@
     - Overworld
     - Zoras Domain
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3476,6 +3537,7 @@
     - Overworld
     - Zoras Domain
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3486,6 +3548,7 @@
     - Overworld
     - Zoras Domain
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3590,6 +3653,7 @@
     - Overworld
     - Snowpeak
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3600,6 +3664,7 @@
     - Overworld
     - Snowpeak
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3610,6 +3675,7 @@
     - Overworld
     - Snowpeak
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3620,6 +3686,7 @@
     - Overworld
     - Snowpeak
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3630,6 +3697,7 @@
     - Overworld
     - Snowpeak
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3640,6 +3708,7 @@
     - Overworld
     - Snowpeak
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3650,6 +3719,7 @@
     - Overworld
     - Snowpeak
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3660,6 +3730,7 @@
     - Overworld
     - Snowpeak
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3670,6 +3741,7 @@
     - Overworld
     - Snowpeak
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3680,6 +3752,7 @@
     - Overworld
     - Snowpeak
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3690,6 +3763,7 @@
     - Overworld
     - Snowpeak
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3700,6 +3774,7 @@
     - Overworld
     - Snowpeak
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3710,6 +3785,7 @@
     - Overworld
     - Snowpeak
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3720,6 +3796,7 @@
     - Overworld
     - Snowpeak
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3730,6 +3807,7 @@
     - Overworld
     - Snowpeak
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3740,6 +3818,7 @@
     - Overworld
     - Snowpeak
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3750,6 +3829,7 @@
     - Overworld
     - Snowpeak
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3760,6 +3840,7 @@
     - Overworld
     - Snowpeak
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3770,6 +3851,7 @@
     - Overworld
     - Snowpeak
     - Rupee - Freestanding
+    - Freestanding Item
   Metadata:
     - Stage: 0xFF
       Flag: 0xFF
@@ -3848,6 +3930,7 @@
     - Golden Bug
     - Gerudo Desert
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 59
       Flag: 0x99
@@ -3859,6 +3942,7 @@
     - Golden Bug
     - Gerudo Desert
     - DZX
+    - Freestanding Item
   Metadata:
     - Stage: 59
       Flag: 0x98
@@ -4062,8 +4146,10 @@
     - Overworld
     - Bulblin Camp
     - Boss
+    - Freestanding Item
   Metadata:
-    - None
+    - Stage: 55
+      Flag: 0x9F
 
 - Name: Bulblin Guard Key
   Original Item: Gerudo Desert Bulblin Camp Key