diff --git a/include/d/d_item.h b/include/d/d_item.h
index 533908bc6c..4a91549697 100644
--- a/include/d/d_item.h
+++ b/include/d/d_item.h
@@ -250,6 +250,7 @@ void item_func_FUSED_SHADOW_1();
 void item_func_FUSED_SHADOW_2();
 void item_func_FUSED_SHADOW_3();
 void item_func_MIRROR_PIECE_1();
+void item_func_ARCHIPELAGO_ITEM();
 #endif
 void item_func_POU_SPIRIT();
 #if TARGET_PC
diff --git a/include/d/d_item_data.h b/include/d/d_item_data.h
index f917cd3b1f..1775be079a 100644
--- a/include/d/d_item_data.h
+++ b/include/d/d_item_data.h
@@ -638,7 +638,7 @@ enum {
     /* 0xD9 */ dItemNo_Randomizer_FUSED_SHADOW_2_e,
     /* 0xDA */ dItemNo_Randomizer_FUSED_SHADOW_3_e,
     /* 0xDB */ dItemNo_Randomizer_MIRROR_PIECE_1_e,
-    /* 0xDC */ dItemNo_Randomizer_NOENTRY_220_e,
+    /* 0xDC */ dItemNo_Randomizer_ARCHIPELAGO_ITEM_e,
     /* 0xDD */ dItemNo_Randomizer_NOENTRY_221_e,
     /* 0xDE */ dItemNo_Randomizer_NOENTRY_222_e,
     /* 0xDF */ dItemNo_Randomizer_NOENTRY_223_e,
diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp
index ab0ea890e9..a785f4bfac 100644
--- a/src/d/d_item.cpp
+++ b/src/d/d_item.cpp
@@ -16,6 +16,8 @@
 #endif
 #include <cstring>
 
+#include "dusk/archipelago/archipelago_context.hpp"
+
 static void (*item_func_ptr[256])() = {
     item_func_HEART,
     item_func_GREEN_RUPEE,
@@ -497,7 +499,7 @@ static void (*item_func_ptr_randomizer[256])() = {
     /* 0xD9 */ item_func_FUSED_SHADOW_2,
     /* 0xDA */ item_func_FUSED_SHADOW_3,
     /* 0xDB */ item_func_MIRROR_PIECE_1,
-    /* 0xDC */ item_func_noentry,
+    /* 0xDC */ item_func_ARCHIPELAGO_ITEM,
     /* 0xDD */ item_func_noentry,
     /* 0xDE */ item_func_noentry,
     /* 0xDF */ item_func_noentry,
@@ -2180,6 +2182,13 @@ void item_func_MIRROR_PIECE_1() {
         dComIfGs_onCollectMirror(0);
     }
 }
+
+void item_func_ARCHIPELAGO_ITEM() {
+    if (randomizer_IsActive()) {
+        dusk::archi::ArchipelagoContext::UpdateCheckedLocations();
+    }
+}
+
 #endif
 
 void item_func_POU_SPIRIT() {
diff --git a/src/dusk/archipelago/archipelago_context.cpp b/src/dusk/archipelago/archipelago_context.cpp
index ce7b9e32e7..c944c91e66 100644
--- a/src/dusk/archipelago/archipelago_context.cpp
+++ b/src/dusk/archipelago/archipelago_context.cpp
@@ -6,6 +6,7 @@
 #include "d/d_item.h"
 #include "dusk/config.hpp"
 #include "dusk/logging.h"
+#include "dusk/randomizer/game/tools.h"
 #include "dusk/ui/ui.hpp"
 
 namespace dusk::archi
@@ -13,11 +14,53 @@ namespace dusk::archi
 
 static constexpr int ARCHI_ITEM_OFFSET = 2320000;
 
+struct SettingsNameConvert {
+    std::string apName;
+    std::string dusklightName;
+    bool invert = false;
+};
+
+static auto sArchiSettingToDusklight = std::to_array<SettingsNameConvert>({
+    {"", ""},
+    {"golden_bugs_shuffled", "Golden Bugs"},
+    {"sky_characters_shuffled", "Sky Characters"},
+    {"npc_items_shuffled", "Gifts From NPCs"},
+    {"shop_items_shuffled", "Shop Items"},
+    {"hidden_skills_shuffled", "Hidden Skills"},
+    // {"poe_shuffled", ""}, // poe shuffle is Overworld, Dungeon, All, or Vanilla, so special logic is needed to convert
+    // {"heart_piece_shuffled", ""},
+    // {"overworld_shuffled", ""},
+    // {"dungeons_shuffled", ""},
+    {"dungeon_rewards_progression", "Dungeon Rewards Can Be Anywhere"},
+    {"small_keys_on_bosses", "No Small Keys on Bosses", true},
+    {"skip_prologue", "Skip Prologue"},
+    {"faron_twilight_cleared", "Faron Twilight Cleared"},
+    {"eldin_twilight_cleared", "Eldin Twilight Cleared"},
+    {"lanayru_twilight_cleared", "Lanayru Twilight Cleared"},
+    {"skip_mdh", "Skip Midna's Desparate Hour"},
+    {"open_map", "Unlock Map Regions"},
+    {"increase_wallet", "Increase Wallet Capacity"},
+    {"transform_anywhere", "Logic Transform Anywhere"},
+    {"bonks_do_damage", "Bonks Do Damage"},
+    {"skip_lakebed_entrance", "Lakebed Does Not Require Water Bombs"},
+    {"skip_arbiters_grounds_entrance", "Arbiters Does Not Require Bulblin Camp"},
+    {"skip_snowpeak_entrance", "Snowpeak Does Not Require Reekfish Scent"},
+    {"skip_city_in_the_sky_entrance", "City Does Not Require Filled Skybook"},
+});
+
 ArchipelagoContext& instance() {
     static ArchipelagoContext instance;
     return instance;
 }
 
+const SettingsNameConvert& GetAPSettingNameConvert(const std::string& apSettingName) {
+    for (const auto& entry : sArchiSettingToDusklight) {
+        if (entry.apName == apSettingName)
+            return entry;
+    }
+    return sArchiSettingToDusklight[0];
+}
+
 const char* getMessageTypeName(AP_MessageType type) {
     switch (type) {
     case AP_MessageType::Plaintext:
@@ -87,7 +130,35 @@ void ArchipelagoContext::LoadTempItemInfo() {
     }
 }
 
-void ArchipelagoContext::itemRecvImpl(int id) {
+void ArchipelagoContext::LoadTempLocationInfo() {
+    auto locDataTree = LOAD_EMBED_YAML(RANDO_DATA_PATH "locations.yaml");
+    for (const auto& locNode : locDataTree) {
+        const auto& metadata = locNode["Metadata"];
+        auto locationName =  locNode["Name"].as<std::string>();
+
+        if (!metadata.IsMap()) {
+            DuskLog.warn("Location {} missing correct Metadata field!", locationName);
+            continue;
+        }
+
+        if (!metadata["APLocationId"]) {
+            DuskLog.warn("Location {} missing APLocationId field!", locationName);
+            continue;
+        }
+
+        auto apLocationId = metadata["APLocationId"].as<int>();
+
+        if (apLocationId == -1)
+            continue;
+
+        m_apLocToGameLoc.push_back({
+            apLocationId,
+            locationName
+        });
+    }
+}
+
+void ArchipelagoContext::itemRecvImpl(int id, bool notify) {
     if (!m_apItemToGameItem.contains(id)) {
         DuskLog.warn("Got an invalid Item Id: {}", id);
         return;
@@ -104,6 +175,25 @@ void ArchipelagoContext::itemRecvImpl(int id) {
     }
 }
 
+int ArchipelagoContext::getItemIdFromApId(int apId) {
+    if (!m_apItemToGameItem.contains(apId)) {
+        DuskLog.warn("Got an invalid Item Id: {}", apId);
+        return -1;
+    }
+
+    auto& item = m_apItemToGameItem[apId];
+
+    return item.itemId;
+}
+
+std::string ArchipelagoContext::getLocationNameFromApId(int apId) const {
+    for (const auto& entry : m_apLocToGameLoc) {
+        if (entry.apId == apId)
+            return entry.locName;
+    }
+    return "";
+}
+
 ArchipelagoContext::ArchipelagoContext() {
 
 }
@@ -137,6 +227,8 @@ void ArchipelagoContext::ConnectToServer() {
 
     instance().LoadTempItemInfo();
 
+    instance().LoadTempLocationInfo();
+
     AP_Init(GetServerIp().c_str(), "Twilight Princess", GetSlotName().c_str(), GetPassword().c_str());
 
     AP_NetworkVersion ver{0, 6,7};
@@ -144,6 +236,7 @@ void ArchipelagoContext::ConnectToServer() {
 
     AP_SetItemClearCallback([]() {
         DuskLog.info("Item Clear Callback Called!");
+        // HandleResetInventory();
     });
 
     AP_SetItemRecvCallback([](int id, bool notify) {
@@ -155,6 +248,11 @@ void ArchipelagoContext::ConnectToServer() {
         DuskLog.info("Location Checked Callback Called! Location: {}", loc);
     });
 
+    AP_SetLocationInfoCallback([](std::vector<AP_NetworkItem> items) {
+        DuskLog.info("Got {} Location Scouts from Server.", items.size());
+        HandleReceiveLocationScout(items);
+    });
+
     AP_Start();
 
     if (AP_GetConnectionStatus() == AP_ConnectionStatus::ConnectionRefused) {
@@ -182,10 +280,14 @@ bool ArchipelagoContext::IsConnected() {
 
 void ArchipelagoContext::MainThreadFunc() {
     // wait a bit before checking connection state, as websocket is probably not connected yet
-    std::this_thread::sleep_for(std::chrono::seconds(1));
+    // (i really am not liking APCpp, why cant I check if the websocket is in the process of connecting???)
+    std::this_thread::sleep_for(std::chrono::seconds(2));
 
     DuskLog.info("AP Thread started.");
 
+    if (IsConnected())
+        RequestAllLocationScout();
+
     while (IsConnected()) {
         if (AP_IsMessagePending())
             ParseMessageData();
@@ -193,7 +295,7 @@ void ArchipelagoContext::MainThreadFunc() {
         instance().m_queueMutex.lock();
         if (randomizer_IsActive() && !instance().m_inactiveItemsQueue.empty()) {
             for (auto item : instance().m_inactiveItemsQueue) {
-                instance().itemRecvImpl(item);
+                instance().itemRecvImpl(item, false);
             }
 
             instance().m_inactiveItemsQueue.clear();
@@ -205,9 +307,11 @@ void ArchipelagoContext::MainThreadFunc() {
 }
 
 void ArchipelagoContext::HandleItemReceived(int id, bool notify) {
-    // TODO: instead of skipping inventory fill, we should clear the inventory when the clear item callback is called.
+    int relativeId = id - ARCHI_ITEM_OFFSET;
+
+    //  && ((relativeId >= 0 && relativeId <= 6) || relativeId == 7)
     if (!notify) {
-        DuskLog.info("Skipping Item.");
+        // skip rupee refills so players cant abuse disconnect/reconnect
         return;
     }
 
@@ -215,11 +319,187 @@ void ArchipelagoContext::HandleItemReceived(int id, bool notify) {
         DuskLog.info("Randomizer not active, adding item to queue.");
 
         instance().m_queueMutex.lock();
-        instance().m_inactiveItemsQueue.push_back(id - ARCHI_ITEM_OFFSET);
+        instance().m_inactiveItemsQueue.push_back(relativeId);
         instance().m_queueMutex.unlock();
         return;
     }
 
-    instance().itemRecvImpl(id - ARCHI_ITEM_OFFSET);
+    instance().itemRecvImpl(relativeId, notify);
+}
+
+void ArchipelagoContext::HandleResetInventory() {
+    // NOTE: this does not clear ALL things from save, so if a player managed to do something while disconnected from the archi, it might mess with things
+
+    auto& playerInfo = g_dComIfG_gameInfo.info.getPlayer();
+
+    // reset items
+    playerInfo.getItem().init();
+
+    // reset collect (poes, shards, swords)
+    playerInfo.getCollect().init();
+
+    playerInfo.getPlayerStatusA().setMaxLife(15);
+    playerInfo.getPlayerStatusA().setWalletSize(WALLET);
+    // dont reset rupees, and instead reject rupee updates while refilling inv
+
+}
+
+void ArchipelagoContext::HandleReceiveLocationScout(const std::vector<AP_NetworkItem>& items) {
+    for (const auto& item : items) {
+        int parsedItemId = dItemNo_Randomizer_ARCHIPELAGO_ITEM_e;
+        if (item.player == AP_GetPlayerID()) {
+            parsedItemId = instance().getItemIdFromApId(item.item - ARCHI_ITEM_OFFSET);
+        }
+        int locationId = item.location - ARCHI_ITEM_OFFSET;
+
+        auto locName = instance().getLocationNameFromApId(locationId);
+
+        if (locName.empty()) {
+            DuskLog.info("No location with ID {} found.", locationId);
+            continue;
+        }
+
+        instance().m_locationItemInfo[locName] = {
+            parsedItemId,
+            item.location,
+            false
+        };
+    }
+}
+
+void ArchipelagoContext::UpdateCheckedLocations() {
+    // TODO: we need a randomizer world to be able to check all valid locations and compare collection
+    // state against a previously cached value, and if collected we can send a location update packet.
+
+    return;
+
+    // non-usable example code
+
+    // replace this with however we'll be getting our world
+    std::unique_ptr<randomizer::logic::world::World> world = std::make_unique<randomizer::logic::world::World>(1, nullptr);
+
+    for (auto location : world->GetAllLocations()) {
+        auto locName = location->GetName();
+
+        if (!instance().m_locationItemInfo.contains(locName)) {
+            DuskLog.warn("No item found for ({}).", locName);
+            continue;
+        }
+
+        auto& cachedLocData = instance().m_locationItemInfo[locName];
+
+        bool isCollected = isLocationObtained(location);
+
+        if (isCollected && !cachedLocData.collected) {
+            cachedLocData.collected = true;
+            AP_SendItem(cachedLocData.apLocationId);
+        }
+    }
+}
+
+void ArchipelagoContext::RequestAllLocationScout(bool isHint) {
+    std::set<int64_t> locations;
+    // TEMP: apworld has 475 locations with ids in sequential order, so add them all individually to location set
+    // (eventually we will iterate through locations.yaml for a better data-driven solution)
+    for (int i = 0; i < 475; i++) {
+        locations.insert(ARCHI_ITEM_OFFSET + i);
+    }
+
+    AP_SendLocationScouts(locations, isHint);
+}
+
+void ArchipelagoContext::SetAPConfigYamlPath(const std::string_view& path) {
+    instance().m_apConfigPath = path;
+}
+
+bool ArchipelagoContext::GenerateConfigFromAP(randomizer::seedgen::config::Config& outConfig) {
+    if (instance().m_apConfigPath.empty()) {
+        DuskLog.warn("AP Config Path Empty!");
+        return false;
+    }
+
+    if (!std::filesystem::exists(instance().m_apConfigPath)) {
+        DuskLog.warn("AP Config Path does not exist!");
+        return false;
+    }
+
+    YAML::Node apConfigYaml;
+    try {
+        apConfigYaml = YAML::LoadFile(instance().m_apConfigPath);
+    }catch (YAML::BadFile& e) {
+        DuskLog.warn("Failed to load AP Config YAML file!");
+        return false;
+    }
+
+    outConfig.SetSeed("Archipelago");
+
+    randomizer::seedgen::settings::Settings settings;
+
+    auto defaultSettings = randomizer::seedgen::settings::GetAllSettingsInfo();
+
+    // add default settings to config first
+    for (const auto& [name, info] : *defaultSettings) {
+        if (info->GetType() == randomizer::seedgen::settings::Type::STANDARD)
+            settings.InsertSetting(name, randomizer::seedgen::settings::Setting(info.get(), info->GetDefaultOption()));
+    }
+
+    // update settings using ap config
+    for (const auto& apSettingEntry : apConfigYaml["Twilight Princess"]) {
+        auto apSettingName = apSettingEntry.first.as<std::string>();
+
+        // ignore AP-only settings
+        if (apSettingName == "progression_balancing" ||
+            apSettingName == "accessibility" ||
+            apSettingName == "local_items" ||
+            apSettingName == "non_local_items" ||
+            apSettingName == "start_inventory" ||
+            apSettingName == "start_hints" ||
+            apSettingName == "start_location_hints" ||
+            apSettingName == "exclude_locations" ||
+            apSettingName == "priority_locations" ||
+            apSettingName == "start_inventory_from_pool")
+            continue;
+
+        const auto& settingConvert = GetAPSettingNameConvert(apSettingName);
+
+        if (!settingConvert.apName.empty()) {
+            bool apSettingValue = apSettingEntry.second.as<bool>();
+
+            if (settingConvert.invert)
+                apSettingValue = !apSettingValue;
+
+            auto& setting = settings.GetMap().at(settingConvert.dusklightName);
+
+            if (apSettingValue) {
+                setting.SetCurrentOption("On");
+            }else {
+                setting.SetCurrentOption("Off");
+            }
+
+            continue;
+        }
+        // remaining settings will have string values
+
+        auto apSettingValue = apSettingEntry.second.as<std::string>();
+
+        // TODO: the rest of the translations
+
+        if (apSettingName == "castle_requirements") {
+
+        }
+
+    }
+
+    outConfig.GetSettingsList().push_back(settings);
+
+    return true;
+}
+
+int ArchipelagoContext::GetItemAtLocation(const std::string& locName) {
+    if (!instance().m_locationItemInfo.contains(locName)) {
+        DuskLog.warn("No item found for ({}).", locName);
+        return 0;
+    }
+    return instance().m_locationItemInfo[locName].itemId;
 }
 } // dusk::archi
\ No newline at end of file
diff --git a/src/dusk/archipelago/archipelago_context.hpp b/src/dusk/archipelago/archipelago_context.hpp
index 77a68b9ac7..5024f0abff 100644
--- a/src/dusk/archipelago/archipelago_context.hpp
+++ b/src/dusk/archipelago/archipelago_context.hpp
@@ -3,6 +3,8 @@
 #include <mutex>
 #include <string>
 
+#include "Archipelago.h"
+
 namespace dusk::archi
 {
     class ArchipelagoContext {
@@ -13,15 +15,36 @@ namespace dusk::archi
             std::string itemName;
         };
 
+        struct TEMP_GameLocationInfo {
+            int apId;
+            std::string locName;
+        };
+
+        struct GameLocationInfo {
+            int itemId;
+            int64_t apLocationId;
+            bool collected;
+        };
+
         std::vector<int> m_inactiveItemsQueue;
         std::mutex m_queueMutex;
 
+        std::unordered_map<std::string, GameLocationInfo> m_locationItemInfo;
+
         // TEMP
         std::map<int, TEMP_GameItemInfo> m_apItemToGameItem;
+        std::vector<TEMP_GameLocationInfo> m_apLocToGameLoc;
+        std::string m_apConfigPath;
 
         void LoadTempItemInfo();
 
-        void itemRecvImpl(int id);
+        void LoadTempLocationInfo();
+
+        void itemRecvImpl(int id, bool notify);
+
+        int getItemIdFromApId(int apId);
+
+        std::string getLocationNameFromApId(int apId) const;
     public:
         ArchipelagoContext();
 
@@ -49,5 +72,23 @@ namespace dusk::archi
 
         static void HandleItemReceived(int id, bool notify);
 
+        static void HandleResetInventory();
+
+        static void HandleReceiveLocationScout(const std::vector<AP_NetworkItem>& items);
+
+        static void UpdateCheckedLocations();
+
+        // State Requesters
+
+        static void RequestAllLocationScout(bool isHint = false);
+
+        // AP -> Internal Rando Converters
+
+        static void SetAPConfigYamlPath(const std::string_view& path);
+
+        static bool GenerateConfigFromAP(randomizer::seedgen::config::Config& outConfig);
+
+        static int GetItemAtLocation(const std::string& locName);
+
     };
 } // dusk::archi
\ No newline at end of file
diff --git a/src/dusk/imgui/ImGuiArchipelagoDebug.cpp b/src/dusk/imgui/ImGuiArchipelagoDebug.cpp
index 2d042d278e..a17242aa92 100644
--- a/src/dusk/imgui/ImGuiArchipelagoDebug.cpp
+++ b/src/dusk/imgui/ImGuiArchipelagoDebug.cpp
@@ -3,9 +3,30 @@
 #include "imgui.h"
 
 #include "Archipelago.h"
+#include "aurora/lib/window.hpp"
+#include "dusk/file_select.hpp"
 #include "dusk/archipelago/archipelago_context.hpp"
 
 namespace dusk {
+
+constexpr std::array<SDL_DialogFileFilter, 2> kFileFilters{{
+    {"Archipelago Configuration File", "yaml"},
+    {"All Files", "*"},
+}};
+
+void FileDialogCallback(void*, const char* path, const char* error) {
+    if (path == nullptr || error != nullptr) {
+        return;
+    }
+
+    archi::ArchipelagoContext::SetAPConfigYamlPath(path);
+}
+
+void OpenApFilePicker() noexcept {
+    ShowFileSelect(&FileDialogCallback, nullptr, aurora::window::get_sdl_window(),
+        kFileFilters.data(), kFileFilters.size(), nullptr, false);
+}
+
 ImGuiArchipelagoDebug::ImGuiArchipelagoDebug() {
 
 }
@@ -44,6 +65,15 @@ void ImGuiArchipelagoDebug::drawWindow() {
         archi::ArchipelagoContext::SetSlotName(m_slotNameInputBuffer);
     }
 
+    if (ImGui::Button("Set Archipelago Config Path")) {
+        OpenApFilePicker();
+    }
+
+    if (ImGui::Button("Test Config Convert")) {
+        randomizer::seedgen::config::Config config;
+        archi::ArchipelagoContext::GenerateConfigFromAP(config);
+    }
+
     if (archi::ArchipelagoContext::IsConnected()) {
         if (ImGui::Button("Disconnect")) {
             archi::ArchipelagoContext::DisconnectFromServer();
diff --git a/src/dusk/randomizer/generator/data/items.yaml b/src/dusk/randomizer/generator/data/items.yaml
index 18e0f72949..fe4e1e8565 100644
--- a/src/dusk/randomizer/generator/data/items.yaml
+++ b/src/dusk/randomizer/generator/data/items.yaml
@@ -130,6 +130,7 @@
 #- Name: Water Bombs 3
 #  Importance: Junk
 #  Id: 0x19
+#  APItemId: 16
 
 - Name: Bomblings 5
   Importance: Junk
@@ -144,6 +145,7 @@
 #- Name: Bomblings 3
 #  Importance: Junk
 #  Id: 0x1C
+#  APItemId: 20
 #
 #- Name: Bomblings 1
 #  Importance: Junk
@@ -601,7 +603,7 @@
 - Name: Horse Call
   Importance: Minor
   Id: 0x84
-  APItemId: -1
+  APItemId: 53
 
 - Name: Forest Temple Small Key
   Importance: Major
@@ -1133,7 +1135,7 @@
 - Name: North Faron Woods Gate Key
   Importance: Major
   Id: 0xEE
-  APItemId: -1
+  APItemId: 63
 
 #- Name: Blue Fire
 #  Importance: Major
@@ -1205,7 +1207,7 @@
 - Name: Coro Key
   Importance: Major
   Id: 0xFE
-  APItemId: -1
+  APItemId: 64
 
 #- Name: Invalid
 #  Importance: Major
diff --git a/src/dusk/randomizer/generator/data/locations.yaml b/src/dusk/randomizer/generator/data/locations.yaml
index 10848dc3ce..945c6ec861 100644
--- a/src/dusk/randomizer/generator/data/locations.yaml
+++ b/src/dusk/randomizer/generator/data/locations.yaml
@@ -14,6 +14,7 @@
     Chest:
       - Stage: 65
         Tbox Id: 4
+    APLocationId: 464
 
 - Name: Links Basement Chest
   Original Item: Purple Rupee Links House
@@ -25,6 +26,7 @@
     Chest:
       - Stage: 65
         Tbox Id: 1
+    APLocationId: 456
 
 - Name: Uli Cradle Delivery
   Original Item: Progressive Fishing Rod
@@ -36,6 +38,7 @@
     Name Lookup:
       - Uli Cradle Delivery
     Event Flag: 0x0301
+    APLocationId: 463
 
 - Name: Ordon Cat Rescue
   Original Item: Bottle with Half Milk
@@ -47,6 +50,7 @@
     Name Lookup:
       - Ordon Cat Rescue
     Event Flag: 0x1408
+    APLocationId: 457
 
 - Name: Sera Shop Slingshot
   Original Item: Slingshot
@@ -58,6 +62,7 @@
       - Stage: 65
         Item: 0x4B
     Event Flag: 0x4902
+    APLocationId: 462
 
 - Name: Ordon Shield
   Original Item: Ordon Shield
@@ -70,6 +75,7 @@
     Switch Flag:
       Stage: 65
       Flag: 0x1A
+    APLocationId: 459
 
 - Name: Ordon Sword
   Original Item: Progressive Sword
@@ -82,6 +88,7 @@
     Switch Flag:
       Stage: 65
       Flag: 0x18
+    APLocationId: 461
 
 - Name: Wrestling With Bo
   Original Item: Iron Boots
@@ -93,6 +100,7 @@
     Chest:
       - Stage: 65
         Tbox Id: 2
+    APLocationId: 465
 
 - Name: Ordon Bo Cliff Rupee
   Original Item: Yellow Rupee
@@ -104,6 +112,7 @@
     Freestanding Item:
       - Stage: 43
         Flag: 0x80
+    APLocationId: -1
 
 - Name: Ordon Bo Roof Rupee
   Original Item: Yellow Rupee
@@ -115,6 +124,7 @@
     Freestanding Item:
       - Stage: 43
         Flag: 0x8B
+    APLocationId: -1
 
 - Name: Ordon Bo Window Rupee 1
   Original Item: Green Rupee
@@ -126,6 +136,7 @@
     Freestanding Item:
       - Stage: 43
         Flag: 0x8A
+    APLocationId: -1
 
 - Name: Ordon Bo Window Rupee 2
   Original Item: Green Rupee
@@ -137,6 +148,7 @@
     Freestanding Item:
       - Stage: 43
         Flag: 0x86
+    APLocationId: -1
 
 - Name: Ordon Hidden Rusl House Rupee
   Original Item: Orange Rupee
@@ -148,6 +160,7 @@
     Freestanding Item:
       - Stage: 43
         Flag: 0x88
+    APLocationId: -1
 
 - Name: Ordon Rupee In Grass By Bo
   Original Item: Green Rupee
@@ -159,6 +172,7 @@
     Freestanding Item:
       - Stage: 43
         Flag: 0x96
+    APLocationId: -1
 
 - Name: Ordon Rupee In River 1
   Original Item: Green Rupee
@@ -170,6 +184,7 @@
     Freestanding Item:
       - Stage: 43
         Flag: 0x95
+    APLocationId: -1
 
 - Name: Ordon Rupee In River 2
   Original Item: Green Rupee
@@ -181,6 +196,7 @@
     Freestanding Item:
       - Stage: 43
         Flag: 0x91
+    APLocationId: -1
 
 - Name: Ordon Rupee Under Bridge
   Original Item: Green Rupee
@@ -192,6 +208,7 @@
     Freestanding Item:
       - Stage: 43
         Flag: 0x82
+    APLocationId: -1
 
 - Name: Ordon Rupee Under Tall Tree 1
   Original Item: Green Rupee
@@ -203,6 +220,7 @@
     Freestanding Item:
       - Stage: 43
         Flag: 0x87
+    APLocationId: -1
 
 - Name: Ordon Rupee Under Tall Tree 2
   Original Item: Green Rupee
@@ -214,6 +232,7 @@
     Freestanding Item:
       - Stage: 43
         Flag: 0x85
+    APLocationId: -1
 
 - Name: Ordon Rusl House Roof Rupee 1
   Original Item: Yellow Rupee
@@ -225,6 +244,7 @@
     Freestanding Item:
       - Stage: 43
         Flag: 0x84
+    APLocationId: -1
 
 - Name: Ordon Rusl House Roof Rupee 2
   Original Item: Yellow Rupee
@@ -236,6 +256,7 @@
     Freestanding Item:
       - Stage: 43
         Flag: 0x81
+    APLocationId: -1
 
 - Name: Ordon Shield House Ledge Grass Rupee
   Original Item: Purple Rupee
@@ -247,6 +268,7 @@
     Freestanding Item:
       - Stage: 43
         Flag: 0x94
+    APLocationId: -1
 
 - Name: Ordon Tree Long Branch Rupee
   Original Item: Yellow Rupee
@@ -258,6 +280,7 @@
     Freestanding Item:
       - Stage: 43
         Flag: 0x97
+    APLocationId: -1
 
 - Name: Ordon Tree Short Branch Rupee
   Original Item: Blue Rupee
@@ -269,6 +292,7 @@
     Freestanding Item:
       - Stage: 43
         Flag: 0x89
+    APLocationId: -1
 
 - Name: Herding Goats Reward
   Original Item: Piece of Heart
@@ -280,6 +304,7 @@
     Name Lookup:
       - Herding Goats Reward
     Event Flag: 0x4240
+    APLocationId: 455
 
 - Name: Ordon Ranch Grotto Lantern Chest
   Original Item: Purple Rupee
@@ -292,6 +317,7 @@
     Chest:
       - Stage: 35
         Tbox Id: 7
+    APLocationId: 458
 
 - Name: Ordon Spring Golden Wolf
   Original Item: Progressive Hidden Skill
@@ -302,6 +328,7 @@
   Metadata:
     Golden Wolf:
       - Flag: 0x3C08
+    APLocationId: 460
 
 - Name: Ordon Spring Warp Portal
   Original Item: Ordon Spring Portal
@@ -323,6 +350,7 @@
     Twilit Insect:
       - Stage: 45
         Flag: 0x1
+    APLocationId: -1
 
 - Name: South Faron Woods Twilit Insect in Tunnel 2
   Original Item: Faron Twilight Tear
@@ -333,6 +361,7 @@
     Twilit Insect:
       - Stage: 45
         Flag: 0x6
+    APLocationId: -1
 
 - Name: Faron Woods Coros House Interior Twilit Insect 1
   Original Item: Faron Twilight Tear
@@ -343,6 +372,7 @@
     Twilit Insect:
       - Stage: 67
         Flag: 0x9
+    APLocationId: -1
 
 - Name: Faron Woods Coros House Interior Twilit Insect 2
   Original Item: Faron Twilight Tear
@@ -353,6 +383,7 @@
     Twilit Insect:
       - Stage: 67
         Flag: 0x4
+    APLocationId: -1
 
 - Name: South Faron Woods Coros House Exterior Twilit Insect
   Original Item: Faron Twilight Tear
@@ -363,6 +394,7 @@
     Twilit Insect:
       - Stage: 45
         Flag: 0x0
+    APLocationId: -1
 
 - Name: South Faron Woods Twilit Insect Behind Gate 1
   Original Item: Faron Twilight Tear
@@ -373,6 +405,7 @@
     Twilit Insect:
       - Stage: 45
         Flag: 0xB
+    APLocationId: -1
 
 - Name: South Faron Woods Twilit Insect Behind Gate 2
   Original Item: Faron Twilight Tear
@@ -383,6 +416,7 @@
     Twilit Insect:
       - Stage: 45
         Flag: 0x5
+    APLocationId: -1
 
 - Name: Faron Mist Twilit Insect on Wall 1
   Original Item: Faron Twilight Tear
@@ -393,6 +427,7 @@
     Twilit Insect:
       - Stage: 45
         Flag: 0x12
+    APLocationId: -1
 
 - Name: Faron Mist Twilit Insect on Wall 2
   Original Item: Faron Twilight Tear
@@ -403,6 +438,7 @@
     Twilit Insect:
       - Stage: 45
         Flag: 0x11
+    APLocationId: -1
 
 - Name: Faron Mist Twilit Insect on Center Stump 1
   Original Item: Faron Twilight Tear
@@ -413,6 +449,7 @@
     Twilit Insect:
       - Stage: 45
         Flag: 0xE
+    APLocationId: -1
 
 - Name: Faron Mist Twilit Insect on Center Stump 2
   Original Item: Faron Twilight Tear
@@ -423,6 +460,7 @@
     Twilit Insect:
       - Stage: 45
         Flag: 0xD
+    APLocationId: -1
 
 - Name: Faron Mist Twilit Insect on Center Stump 3
   Original Item: Faron Twilight Tear
@@ -433,6 +471,7 @@
     Twilit Insect:
       - Stage: 45
         Flag: 0xC
+    APLocationId: -1
 
 - Name: Faron Mist Burrowing Twilit Insect 1
   Original Item: Faron Twilight Tear
@@ -443,6 +482,7 @@
     Twilit Insect:
       - Stage: 45
         Flag: 0x17
+    APLocationId: -1
 
 - Name: Faron Mist Burrowing Twilit Insect 2
   Original Item: Faron Twilight Tear
@@ -453,6 +493,7 @@
     Twilit Insect:
       - Stage: 45
         Flag: 0x8
+    APLocationId: -1
 
 - Name: North Faron Woods Twilit Insect 1
   Original Item: Faron Twilight Tear
@@ -464,6 +505,7 @@
     Twilit Insect:
       - Stage: 45
         Flag: 0x15
+    APLocationId: -1
 
 - Name: North Faron Woods Twilit Insect 2
   Original Item: Faron Twilight Tear
@@ -475,6 +517,7 @@
     Twilit Insect:
       - Stage: 45
         Flag: 0x14
+    APLocationId: -1
 
 - Name: South Faron Warp Portal
   Original Item: South Faron Portal
@@ -496,6 +539,7 @@
     Name Lookup:
       - Coro Bottle
     Event Flag: 0x1A08
+    APLocationId: 266
 
 - Name: Faron Woods Coro Boulder Rupee 1
   Original Item: Green Rupee
@@ -507,6 +551,7 @@
     Freestanding Item:
       - Stage: 45
         Flag: 0x80
+    APLocationId: -1
 
 - Name: Faron Woods Coro Boulder Rupee 2
   Original Item: Green Rupee
@@ -518,6 +563,7 @@
     Freestanding Item:
       - Stage: 45
         Flag: 0x81
+    APLocationId: -1
 
 - Name: Faron Woods Coro Boulder Rupee 3
   Original Item: Blue Rupee
@@ -529,6 +575,7 @@
     Freestanding Item:
       - Stage: 45
         Flag: 0x82
+    APLocationId: -1
 
 - Name: Faron Woods Coro Boulder Rupee 4
   Original Item: Yellow Rupee
@@ -540,6 +587,7 @@
     Freestanding Item:
       - Stage: 45
         Flag: 0x83
+    APLocationId: -1
 
 - Name: South Faron Cave Chest
   Original Item: Yellow Rupee
@@ -551,6 +599,7 @@
     Chest:
       - Stage: 40
         Tbox Id: 31
+    APLocationId: 297
 
 - Name: Faron Mist South Chest
   Original Item: Purple Rupee
@@ -562,6 +611,7 @@
     Chest:
       - Stage: 45
         Tbox Id: 29
+    APLocationId: 279
 
 - Name: Faron Mist Stump Chest
   Original Item: Red Rupee
@@ -573,6 +623,7 @@
     Chest:
       - Stage: 45
         Tbox Id: 28
+    APLocationId: 280
 
 - Name: Faron Mist North Chest
   Original Item: Yellow Rupee
@@ -584,6 +635,7 @@
     Chest:
       - Stage: 45
         Tbox Id: 27
+    APLocationId: 277
 
 - Name: Faron Mist Poe
   Original Item: Poe Soul
@@ -595,6 +647,7 @@
     Poe:
       - Stage: 45
         Flag: 0x5D
+    APLocationId: 278
 
 - Name: Faron Mist Cave Open Chest
   Original Item: North Faron Woods Gate Key
@@ -607,6 +660,7 @@
     Chest:
       - Stage: 45
         Tbox Id: 24
+    APLocationId: 276
 
 - Name: Faron Mist Cave Lantern Chest
   Original Item: Piece of Heart
@@ -618,6 +672,7 @@
     Chest:
       - Stage: 45
         Tbox Id: 26
+    APLocationId: 275
 
 - Name: North Faron Warp Portal
   Original Item: North Faron Portal
@@ -636,6 +691,7 @@
   Metadata:
     Golden Wolf:
       - Flag: 0x3C10
+    APLocationId: 281
 
 - Name: North Faron Woods Deku Baba Chest
   Original Item: Yellow Rupee
@@ -647,6 +703,7 @@
     Chest:
       - Stage: 45
         Tbox Id: 63
+    APLocationId: 287
 
 - Name: Faron Woods Owl Statue Sky Character
   Original Item: Progressive Sky Book
@@ -658,6 +715,7 @@
       - Stage: 45
         Room: 8
     Event Flag: 0x6080
+    APLocationId: 283
 
 - Name: Faron Woods Owl Statue Chest
   Original Item: Piece of Heart
@@ -669,6 +727,7 @@
     Chest:
       - Stage: 45
         Tbox Id: 30
+    APLocationId: 282
 
 - Name: Faron Field Bridge Chest
   Original Item: Orange Rupee
@@ -680,6 +739,7 @@
     Chest:
       - Stage: 56
         Tbox Id: 6
+    APLocationId: 267
 
 # HD Only
 # - Name: Faron Field Corner Grotto Main Chest
@@ -698,6 +758,7 @@
     Chest:
       - Stage: 36
         Tbox Id: 11
+    APLocationId: 268
 
 - Name: Faron Field Corner Grotto Rear Chest
   Original Item: Yellow Rupee
@@ -709,6 +770,7 @@
     Chest:
       - Stage: 36
         Tbox Id: 13
+    APLocationId: 269
 
 - Name: Faron Field Corner Grotto Right Chest
   Original Item: Red Rupee
@@ -720,6 +782,7 @@
     Chest:
       - Stage: 36
         Tbox Id: 12
+    APLocationId: 270
 
 - Name: Faron Field Female Beetle
   Original Item: Female Beetle
@@ -732,6 +795,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x9E
+    APLocationId: 271
 
 - Name: Faron Field Male Beetle
   Original Item: Male Beetle
@@ -744,6 +808,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x9F
+    APLocationId: 272
 
 - Name: Faron Field Poe
   Original Item: Poe Soul
@@ -755,6 +820,7 @@
     Poe:
       - Stage: 56
         Flag: 0x39
+    APLocationId: 273
 
 - Name: Faron Field Tree Heart Piece
   Original Item: Piece of Heart
@@ -766,6 +832,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x81
+    APLocationId: 274
 
 - Name: Lost Woods Boulder Poe
   Original Item: Poe Soul
@@ -777,6 +844,7 @@
     Poe:
       - Stage: 54
         Flag: 0x10
+    APLocationId: 284
 
 - Name: Lost Woods Lantern Chest
   Original Item: Bombs 30
@@ -788,6 +856,7 @@
     Chest:
       - Stage: 54
         Tbox Id: 3
+    APLocationId: 285
 
 - Name: Lost Woods Waterfall Poe
   Original Item: Poe Soul
@@ -799,6 +868,7 @@
     Poe:
       - Stage: 54
         Flag: 0x11
+    APLocationId: 286
 
 - Name: Sacred Grove Baba Serpent Grotto Chest
   Original Item: Piece of Heart
@@ -810,6 +880,7 @@
     Chest:
       - Stage: 36
         Tbox Id: 3
+    APLocationId: 288
 
 - Name: Sacred Grove Spinner Chest
   Original Item: Orange Rupee
@@ -822,6 +893,7 @@
     Chest:
       - Stage: 54
         Tbox Id: 2
+    APLocationId: 295
 
 - Name: Sacred Grove Warp Portal
   Original Item: Sacred Grove Portal
@@ -842,6 +914,7 @@
     Name Lookup:
       - Sacred Grove Pedestal Master Sword
     Event Flag: 0x2120
+    APLocationId: 293
 
 - Name: Sacred Grove Pedestal Shadow Crystal
   Original Item: Shadow Crystal
@@ -853,6 +926,7 @@
     Name Lookup:
       - Sacred Grove Pedestal Shadow Crystal
     Event Flag: 0x2120
+    APLocationId: 294
 
 - Name: Sacred Grove Master Sword Poe
   Original Item: Poe Soul
@@ -864,6 +938,7 @@
     Poe:
       - Stage: 54
         Flag: 0x0F
+    APLocationId: 291
 
 - Name: Sacred Grove Female Snail
   Original Item: Female Snail
@@ -876,6 +951,7 @@
     Freestanding Item:
       - Stage: 54
         Flag: 0x98
+    APLocationId: 289
 
 - Name: Sacred Grove Male Snail
   Original Item: Male Snail
@@ -888,6 +964,7 @@
     Freestanding Item:
       - Stage: 54
         Flag: 0x99
+    APLocationId: 290
 
 - Name: Sacred Grove Past Owl Statue Chest
   Original Item: Piece of Heart
@@ -899,6 +976,7 @@
     Chest:
       - Stage: 54
         Tbox Id: 1
+    APLocationId: 292
 
 - Name: Sacred Grove Temple of Time Owl Statue Poe
   Original Item: Poe Soul
@@ -910,6 +988,7 @@
     Poe:
       - Stage: 54
         Flag: 0x1E
+    APLocationId: 296
 
 # ELDIN PROVINCE
 
@@ -922,6 +1001,7 @@
     Twilit Insect:
       - Stage: 75
         Flag: 0x2
+    APLocationId: -1
 
 - Name: Sanctuary Basement Twilit Insect 2
   Original Item: Eldin Twilight Tear
@@ -932,6 +1012,7 @@
     Twilit Insect:
       - Stage: 75
         Flag: 0x3
+    APLocationId: -1
 
 - Name: Sanctuary Basement Twilit Insect 3
   Original Item: Eldin Twilight Tear
@@ -942,6 +1023,7 @@
     Twilit Insect:
       - Stage: 75
         Flag: 0xC
+    APLocationId: -1
 
 - Name: Kakariko Graveyard Twilit Insect
   Original Item: Eldin Twilight Tear
@@ -952,6 +1034,7 @@
     Twilit Insect:
       - Stage: 48
         Flag: 0x6
+    APLocationId: -1
 
 - Name: Kakariko Malo Mart Twilit Insect
   Original Item: Eldin Twilight Tear
@@ -962,6 +1045,7 @@
     Twilit Insect:
       - Stage: 68
         Flag: 0x9
+    APLocationId: -1
 
 - Name: Kakariko Inn Pipe Twilit Insect
   Original Item: Eldin Twilight Tear
@@ -972,6 +1056,7 @@
     Twilit Insect:
       - Stage: 68
         Flag: 0x8
+    APLocationId: -1
 
 - Name: Kakariko Inn Bedroom Twilit Insect
   Original Item: Eldin Twilight Tear
@@ -982,6 +1067,7 @@
     Twilit Insect:
       - Stage: 68
         Flag: 0x0
+    APLocationId: -1
 
 - Name: Kakariko Bug House Twilit Insect
   Original Item: Eldin Twilight Tear
@@ -992,6 +1078,7 @@
     Twilit Insect:
       - Stage: 68
         Flag: 0x1
+    APLocationId: -1
 
 - Name: Barnes Bomb Shop Twilit Insect
   Original Item: Eldin Twilight Tear
@@ -1002,6 +1089,7 @@
     Twilit Insect:
       - Stage: 68
         Flag: 0x7
+    APLocationId: -1
 
 - Name: Kakariko Destroyed Building Twilit Insect 1
   Original Item: Eldin Twilight Tear
@@ -1012,6 +1100,7 @@
     Twilit Insect:
       - Stage: 46
         Flag: 0x4
+    APLocationId: -1
 
 - Name: Kakariko Destroyed Building Twilit Insect 2
   Original Item: Eldin Twilight Tear
@@ -1022,6 +1111,7 @@
     Twilit Insect:
       - Stage: 46
         Flag: 0x5
+    APLocationId: -1
 
 - Name: Kakariko Destroyed Building Twilit Insect 3
   Original Item: Eldin Twilight Tear
@@ -1032,6 +1122,7 @@
     Twilit Insect:
       - Stage: 46
         Flag: 0xB
+    APLocationId: -1
 
 - Name: Kakariko Watchtower Twilit Insect
   Original Item: Eldin Twilight Tear
@@ -1042,6 +1133,7 @@
     Twilit Insect:
       - Stage: 68
         Flag: 0xA
+    APLocationId: -1
 
 - Name: Death Mountain Trail Twilit Insect Near Howling Stone
   Original Item: Eldin Twilight Tear
@@ -1052,6 +1144,7 @@
     Twilit Insect:
       - Stage: 47
         Flag: 0xF
+    APLocationId: -1
 
 - Name: Death Mountain Trail Twilit Insect on Wall
   Original Item: Eldin Twilight Tear
@@ -1062,6 +1155,7 @@
     Twilit Insect:
       - Stage: 47
         Flag: 0xE
+    APLocationId: -1
 
 - Name: Death Mountain Trail Twilit Insect in Hot Spring
   Original Item: Eldin Twilight Tear
@@ -1072,6 +1166,7 @@
     Twilit Insect:
       - Stage: 47
         Flag: 0x10
+    APLocationId: -1
 
 - Name: Kakariko Gorge Warp Portal
   Original Item: Kakariko Gorge Portal
@@ -1093,6 +1188,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x94
+    APLocationId: 241
 
 - Name: Kakariko Gorge Male Pill Bug
   Original Item: Male Pill Bug
@@ -1105,6 +1201,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x95
+    APLocationId: 242
 
 - Name: Kakariko Gorge Owl Statue Chest
   Original Item: Orange Rupee
@@ -1117,6 +1214,7 @@
     Chest:
       - Stage: 56
         Tbox Id: 4
+    APLocationId: 243
 
 - Name: Kakariko Gorge Owl Statue Sky Character
   Original Item: Progressive Sky Book
@@ -1128,6 +1226,7 @@
       - Stage: 56
         Room: 3
     Event Flag: 0x6020
+    APLocationId: 244
 
 - Name: Kakariko Gorge Owl Statue Boulder Rupee
   Original Item: Yellow Rupee
@@ -1139,6 +1238,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x8D
+    APLocationId: -1
 
 - Name: Kakariko Gorge Poe
   Original Item: Poe Soul
@@ -1150,6 +1250,7 @@
     Poe:
       - Stage: 56
         Flag: 0x3A
+    APLocationId: 245
 
 - Name: Kakariko Gorge Spire Heart Piece
   Original Item: Piece of Heart
@@ -1161,6 +1262,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x82
+    APLocationId: 246
 
 - Name: Kakariko Gorge Double Clawshot Chest
   Original Item: Piece of Heart
@@ -1172,6 +1274,7 @@
     Chest:
       - Stage: 56
         Tbox Id: 5
+    APLocationId: 240
 
 - Name: Kakariko Gorge Spire Boulder Rupee
   Original Item: Yellow Rupee
@@ -1183,6 +1286,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x8E
+    APLocationId: -1
 
 - Name: Eldin Lantern Cave First Chest
   Original Item: Red Rupee
@@ -1195,6 +1299,7 @@
     Chest:
       - Stage: 32
         Tbox Id: 61
+    APLocationId: 229
 
 - Name: Eldin Lantern Cave Second Chest
   Original Item: Purple Rupee
@@ -1206,6 +1311,7 @@
     Chest:
       - Stage: 32
         Tbox Id: 63
+    APLocationId: 232
 
 - Name: Eldin Lantern Cave Lantern Chest
   Original Item: Piece of Heart
@@ -1217,6 +1323,7 @@
     Chest:
       - Stage: 32
         Tbox Id: 62
+    APLocationId: 230
 
 - Name: Eldin Lantern Cave Poe
   Original Item: Poe Soul
@@ -1228,6 +1335,7 @@
     Poe:
       - Stage: 32
         Flag: 0x60
+    APLocationId: 231
 
 - Name: Kakariko Village Warp Portal
   Original Item: Kakariko Village Portal
@@ -1248,6 +1356,7 @@
     Chest:
       - Stage: 46
         Tbox Id: 21
+    APLocationId: 233
 
 - Name: Eldin Spring Underwater Boulder Rupee
   Original Item: Orange Rupee
@@ -1259,6 +1368,7 @@
     Freestanding Item:
       - Stage: 46
         Flag: 0x8D
+    APLocationId: -1
 
 - Name: Kakariko Village Bomb Rock Spire Heart Piece
   Original Item: Piece of Heart
@@ -1270,6 +1380,7 @@
     Freestanding Item:
       - Stage: 46
         Flag: 0x8C
+    APLocationId: 253
 
 - Name: Kakariko Village Bell Rupee
   Original Item: Silver Rupee
@@ -1281,6 +1392,7 @@
     Freestanding Item:
       - Stage: 46
         Flag: 0x8A
+    APLocationId: -1
 
 - Name: Kakariko Village Hot Spring Ledge Box Rupee
   Original Item: Yellow Rupee
@@ -1292,6 +1404,7 @@
     Freestanding Item:
       - Stage: 46
         Flag: 0x87
+    APLocationId: -1
 
 - Name: Kakariko Village Spring Shortcut Box Rupee 1
   Original Item: Blue Rupee
@@ -1303,6 +1416,7 @@
     Freestanding Item:
       - Stage: 46
         Flag: 0x88
+    APLocationId: -1
 
 - Name: Kakariko Village Spring Shortcut Box Rupee 2
   Original Item: Yellow Rupee
@@ -1314,6 +1428,7 @@
     Freestanding Item:
       - Stage: 46
         Flag: 0x89
+    APLocationId: -1
 
 - Name: Kakariko Village Malo Mart Hawkeye
   Original Item: Hawkeye
@@ -1326,8 +1441,9 @@
       - Stage: 68
         Item: 0x3E
     Switch Flag:
-        Stage: 68
-        Flag: 0x33
+      Stage: 68
+      Flag: 0x33
+    APLocationId: 256
 
 - Name: Kakariko Village Malo Mart Hylian Shield
   Original Item: Hylian Shield
@@ -1340,8 +1456,9 @@
       - Stage: 68
         Item: 0x2C
     Switch Flag:
-        Stage: 68
-        Flag: 0x39
+      Stage: 68
+      Flag: 0x39
+    APLocationId: 257
 
 - Name: Kakariko Village Malo Mart Red Potion
   Original Item: Red Potion Shop
@@ -1354,8 +1471,9 @@
       - Stage: 68
         Item: 0x61
     Switch Flag:
-        Stage: 68
-        Flag: 0x4
+      Stage: 68
+      Flag: 0x4
+    APLocationId: 258
 
 - Name: Kakariko Village Malo Mart Wooden Shield
   Original Item: Wooden Shield
@@ -1368,8 +1486,9 @@
       - Stage: 68
         Item: 0x2B
     Switch Flag:
-        Stage: 68
-        Flag: 0x5
+      Stage: 68
+      Flag: 0x5
+    APLocationId: 259
 
 - Name: Kakariko Inn Chest
   Original Item: Red Rupee
@@ -1381,6 +1500,7 @@
     Chest:
       - Stage: 68
         Tbox Id: 23
+    APLocationId: 252
 
 - Name: Kakariko Village Female Ant
   Original Item: Female Ant
@@ -1393,6 +1513,7 @@
     Freestanding Item:
       - Stage: 68
         Flag: 0x90
+    APLocationId: 255
 
 - Name: Kakariko Village Ant House Ledge Box Rupee
   Original Item: Red Rupee
@@ -1404,6 +1525,7 @@
     Freestanding Item:
       - Stage: 46
         Flag: 0x85
+    APLocationId: -1
 
 - Name: Barnes Bomb Bag
   Original Item: Bomb Bag
@@ -1417,6 +1539,7 @@
       - Stage: 68
         Item: 0x50
     Event Flag: 0x0908
+    APLocationId: 212
 
 - Name: Kakariko Village Bomb Shop Poe
   Original Item: Poe Soul
@@ -1428,6 +1551,7 @@
     Poe:
       - Stage: 46
         Flag: 0x5E
+    APLocationId: 254
 
 - Name: Kakariko Village Watchtower Poe
   Original Item: Poe Soul
@@ -1439,6 +1563,7 @@
     Poe:
       - Stage: 46
         Flag: 0x5F
+    APLocationId: 260
 
 - Name: Kakariko Watchtower Alcove Chest
   Original Item: Orange Rupee
@@ -1450,6 +1575,7 @@
     Chest:
       - Stage: 46
         Tbox Id: 20
+    APLocationId: 261
 
 - Name: Kakariko Watchtower Chest
   Original Item: Purple Rupee
@@ -1461,6 +1587,7 @@
     Chest:
       - Stage: 68
         Tbox Id: 17
+    APLocationId: 262
 
 - Name: Talo Sharpshooting
   Original Item: Piece of Heart
@@ -1473,6 +1600,7 @@
     Name Lookup:
       - Talo Sharpshooting
     Event Flag: 0x0920
+    APLocationId: 265
 
 - Name: Renados Letter
   Original Item: Renados Letter
@@ -1485,6 +1613,7 @@
     Name Lookup:
       - Renados Letter
     Event Flag: 0x0F80
+    APLocationId: -1
 
 - Name: Ilia Memory Reward
   Original Item: Horse Call
@@ -1496,6 +1625,7 @@
     Name Lookup:
       - Ilia Memory Reward
     Event Flag: 0x5E04
+    APLocationId: -1
 
 - Name: Rutelas Blessing
   Original Item: Zora Armor
@@ -1508,6 +1638,7 @@
     Name Lookup:
       - Rutelas Blessing
     Event Flag: 0x0804
+    APLocationId: 263
 
 - Name: Gift From Ralis
   Original Item: Progressive Fishing Rod
@@ -1520,6 +1651,7 @@
     Name Lookup:
       - Gift From Ralis
     Event Flag: 0x3B80
+    APLocationId: 237
 
 - Name: Kakariko Graveyard Lantern Chest
   Original Item: Purple Rupee
@@ -1531,6 +1663,7 @@
     Chest:
       - Stage: 48
         Tbox Id: 24
+    APLocationId: 249
 
 - Name: Kakariko Graveyard Male Ant
   Original Item: Male Ant
@@ -1543,6 +1676,7 @@
     Freestanding Item:
       - Stage: 48
         Flag: 0x91
+    APLocationId: 250
 
 - Name: Kakariko Graveyard Underwater Boulder Rupee
   Original Item: Red Rupee
@@ -1554,6 +1688,7 @@
     Freestanding Item:
       - Stage: 48
         Flag: 0x8E
+    APLocationId: -1
 
 - Name: Kakariko Graveyard Golden Wolf
   Original Item: Progressive Hidden Skill
@@ -1563,6 +1698,7 @@
   Metadata:
     Golden Wolf:
       - Flag: 0x3D80
+    APLocationId: 247
 
 - Name: Kakariko Graveyard Open Poe
   Original Item: Poe Soul
@@ -1574,6 +1710,7 @@
     Poe:
       - Stage: 48
         Flag: 0x58
+    APLocationId: 251
 
 - Name: Kakariko Graveyard Grave Poe
   Original Item: Poe Soul
@@ -1585,6 +1722,7 @@
     Poe:
       - Stage: 48
         Flag: 0x57
+    APLocationId: 248
 
 - Name: Death Mountain Warp Portal
   Original Item: Death Mountain Portal
@@ -1605,6 +1743,7 @@
     Chest:
       - Stage: 47
         Tbox Id: 22
+    APLocationId: 218
 
 - Name: Death Mountain Volcano Ledge Rupee 1
   Original Item: Yellow Rupee
@@ -1616,6 +1755,7 @@
     Freestanding Item:
       - Stage: 47
         Flag: 0x81
+    APLocationId: -1
 
 - Name: Death Mountain Volcano Ledge Rupee 2
   Original Item: Yellow Rupee
@@ -1627,6 +1767,7 @@
     Freestanding Item:
       - Stage: 47
         Flag: 0x82
+    APLocationId: -1
 
 - Name: Death Mountain Volcano Ledge Rupee 3
   Original Item: Yellow Rupee
@@ -1638,6 +1779,7 @@
     Freestanding Item:
       - Stage: 47
         Flag: 0x83
+    APLocationId: -1
 
 - Name: Death Mountain Volcano Pipe Ledge Rock Rupee
   Original Item: Yellow Rupee
@@ -1649,6 +1791,7 @@
     Freestanding Item:
       - Stage: 47
         Flag: 0x80
+    APLocationId: -1
 
 - Name: Death Mountain Trail Poe
   Original Item: Poe Soul
@@ -1660,6 +1803,7 @@
     Poe:
       - Stage: 47
         Flag: 0x59
+    APLocationId: 219
 
 - Name: Eldin Field Bomb Rock Chest
   Original Item: Piece of Heart
@@ -1671,6 +1815,7 @@
     Chest:
       - Stage: 56
         Tbox Id: 2
+    APLocationId: 220
 
 - Name: Eldin Field Bomskit Grotto Lantern Chest
   Original Item: Purple Rupee
@@ -1683,6 +1828,7 @@
     Chest:
       - Stage: 35
         Tbox Id: 6
+    APLocationId: 221
 
 - Name: Eldin Field Bomskit Grotto Left Chest
   Original Item: Purple Rupee
@@ -1694,6 +1840,7 @@
     Chest:
       - Stage: 35
         Tbox Id: 10
+    APLocationId: 222
 
 - Name: Eldin Field Female Grasshopper
   Original Item: Female Grasshopper
@@ -1706,6 +1853,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x98
+    APLocationId: 223
 
 - Name: Eldin Field Male Grasshopper
   Original Item: Male Grasshopper
@@ -1718,6 +1866,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x99
+    APLocationId: 224
 
 - Name: Goron Springwater Rush
   Original Item: Piece of Heart
@@ -1730,6 +1879,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x80
+    APLocationId: 238
 
 - Name: Eldin Field Water Bomb Fish Grotto Chest
   Original Item: Purple Rupee
@@ -1742,6 +1892,7 @@
     Chest:
       - Stage: 39
         Tbox Id: 16
+    APLocationId: 228
 
 - Name: Bridge of Eldin Warp Portal
   Original Item: Bridge of Eldin Portal
@@ -1763,6 +1914,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x96
+    APLocationId: 213
 
 - Name: Bridge of Eldin Male Phasmid
   Original Item: Male Phasmid
@@ -1775,6 +1927,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x97
+    APLocationId: 214
 
 - Name: Bridge of Eldin Owl Statue Chest
   Original Item: Piece of Heart
@@ -1786,6 +1939,7 @@
     Chest:
       - Stage: 56
         Tbox Id: 3
+    APLocationId: 215
 
 - Name: Bridge of Eldin Owl Statue Sky Character
   Original Item: Progressive Sky Book
@@ -1797,6 +1951,7 @@
       - Stage: 56
         Room: 0
     Event Flag: 0x6010
+    APLocationId: 216
 
 - Name: Bridge of Eldin Boulder Rupee
   Original Item: Red Rupee
@@ -1808,6 +1963,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x8F
+    APLocationId: -1
 
 - Name: Eldin Stockcave Upper Chest
   Original Item: Red Rupee
@@ -1819,6 +1975,7 @@
     Chest:
       - Stage: 34
         Tbox Id: 63
+    APLocationId: 236
 
 - Name: Eldin Stockcave Lantern Chest
   Original Item: Orange Rupee
@@ -1831,6 +1988,7 @@
     Chest:
       - Stage: 34
         Tbox Id: 61
+    APLocationId: 234
 
 - Name: Eldin Stockcave Lowest Chest
   Original Item: Piece of Heart
@@ -1842,6 +2000,7 @@
     Chest:
       - Stage: 34
         Tbox Id: 62
+    APLocationId: 235
 
 - Name: Eldin Field Stalfos Grotto Left Small Chest
   Original Item: Bombs 5
@@ -1853,6 +2012,7 @@
     Chest:
       - Stage: 36
         Tbox Id: 18
+    APLocationId: 225
 
 - Name: Eldin Field Stalfos Grotto Right Small Chest
   Original Item: Bombs 5
@@ -1864,6 +2024,7 @@
     Chest:
       - Stage: 36
         Tbox Id: 17
+    APLocationId: 226
 
 - Name: Eldin Field Stalfos Grotto Stalfos Chest
   Original Item: Piece of Heart
@@ -1875,6 +2036,7 @@
     Chest:
       - Stage: 36
         Tbox Id: 2
+    APLocationId: 227
 
 - Name: Skybook From Impaz
   Original Item: Progressive Sky Book
@@ -1887,6 +2049,7 @@
     Name Lookup:
       - Skybook From Impaz
     Event Flag: 0x5F80
+    APLocationId: 264
 
 - Name: Cats Hide and Seek Minigame
   Original Item: Piece of Heart
@@ -1898,6 +2061,7 @@
     Freestanding Item:
       - Stage: 63
         Flag: 0x8B
+    APLocationId: 217
 
 - Name: Hidden Village Poe
   Original Item: Poe Soul
@@ -1909,6 +2073,7 @@
     Poe:
       - Stage: 63
         Flag: 0x40
+    APLocationId: 239
 
 - Name: Ilia Charm
   Original Item: Ilias Charm
@@ -1921,6 +2086,7 @@
     Name Lookup:
       - Ilia Charm
     Event Flag: 0x2280
+    APLocationId: -1
 
 # LANAYRU PROVINCE
 
@@ -1933,6 +2099,7 @@
     Twilit Insect:
       - Stage: 53
         Flag: 0x2C
+    APLocationId: -1
 
 - Name: Lake Hylia Twilit Insect Between Bridges
   Original Item: Lanayru Twilight Tear
@@ -1943,6 +2110,7 @@
     Twilit Insect:
       - Stage: 52
         Flag: 0x2F
+    APLocationId: -1
 
 - Name: Lake Hylia Burrowing Twilit Insect
   Original Item: Lanayru Twilight Tear
@@ -1953,6 +2121,7 @@
     Twilit Insect:
       - Stage: 52
         Flag: 0x30
+    APLocationId: -1
 
 - Name: Lake Hylia Twilit Insect Behind Canon
   Original Item: Lanayru Twilight Tear
@@ -1963,6 +2132,7 @@
     Twilit Insect:
       - Stage: 52
         Flag: 0x32
+    APLocationId: -1
 
 - Name: Lake Hylia Twilit Insect on Docks
   Original Item: Lanayru Twilight Tear
@@ -1973,6 +2143,7 @@
     Twilit Insect:
       - Stage: 52
         Flag: 0x31
+    APLocationId: -1
 
 - Name: Lake Hylia Twilit Bloat
   Original Item: Lanayru Twilight Tear
@@ -1983,6 +2154,7 @@
     Twilit Insect:
       - Stage: 52
         Flag: 0x35
+    APLocationId: -1
 
 - Name: Zoras River Twilit Insect 1
   Original Item: Lanayru Twilight Tear
@@ -1993,6 +2165,7 @@
     Twilit Insect:
       - Stage: 49
         Flag: 0x3D
+    APLocationId: -1
 
 - Name: Zoras River Twilit Insect 2
   Original Item: Lanayru Twilight Tear
@@ -2003,6 +2176,7 @@
     Twilit Insect:
       - Stage: 49
         Flag: 0x36
+    APLocationId: -1
 
 - Name: Zoras River Twilit Insect 3
   Original Item: Lanayru Twilight Tear
@@ -2013,6 +2187,7 @@
     Twilit Insect:
       - Stage: 49
         Flag: 0x3A
+    APLocationId: -1
 
 - Name: Zoras River Twilit Insect 4
   Original Item: Lanayru Twilight Tear
@@ -2023,6 +2198,7 @@
     Twilit Insect:
       - Stage: 49
         Flag: 0x39
+    APLocationId: -1
 
 - Name: Upper Zoras River Twilit Insect
   Original Item: Lanayru Twilight Tear
@@ -2033,6 +2209,7 @@
     Twilit Insect:
       - Stage: 61
         Flag: 0x37
+    APLocationId: -1
 
 - Name: Zoras Domain Twilit Insect near Lilypads 1
   Original Item: Lanayru Twilight Tear
@@ -2043,6 +2220,7 @@
     Twilit Insect:
       - Stage: 50
         Flag: 0x3B
+    APLocationId: -1
 
 - Name: Zoras Domain Twilit Insect near Lilypads 2
   Original Item: Lanayru Twilight Tear
@@ -2053,6 +2231,7 @@
     Twilit Insect:
       - Stage: 50
         Flag: 0x2E
+    APLocationId: -1
 
 - Name: Zoras Domain Burrowing Twilit Insect
   Original Item: Lanayru Twilight Tear
@@ -2063,6 +2242,7 @@
     Twilit Insect:
       - Stage: 50
         Flag: 0x2D
+    APLocationId: -1
 
 - Name: Zoras Domain Twilit Insect on West Ledge
   Original Item: Lanayru Twilight Tear
@@ -2073,6 +2253,7 @@
     Twilit Insect:
       - Stage: 50
         Flag: 0x3C
+    APLocationId: -1
 
 - Name: Zoras Domain Throne Room Twilit Insect
   Original Item: Lanayru Twilight Tear
@@ -2084,6 +2265,7 @@
     Twilit Insect:
       - Stage: 50
         Flag: 0x3E
+    APLocationId: -1
 
 - Name: Lanayru Field Behind Gate Underwater Chest
   Original Item: Orange Rupee
@@ -2096,6 +2278,7 @@
     Chest:
       - Stage: 56
         Tbox Id: 7
+    APLocationId: 411
 
 - Name: Lanayru Field North Underwater Boulder Rupee
   Original Item: Yellow Rupee
@@ -2107,6 +2290,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x87
+    APLocationId: -1
 
 - Name: Lanayru Field South Underwater Boulder Rupee
   Original Item: Yellow Rupee
@@ -2118,6 +2302,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x86
+    APLocationId: -1
 
 - Name: Lanayru Field Tree Boulder Rupee
   Original Item: Purple Rupee
@@ -2129,6 +2314,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x88
+    APLocationId: -1
 
 - Name: Lanayru Field Bridge Poe
   Original Item: Poe Soul
@@ -2140,6 +2326,7 @@
     Poe:
       - Stage: 56
         Flag: 0x33
+    APLocationId: 412
 
 - Name: Lanayru Field Female Stag Beetle
   Original Item: Female Stag Beetle
@@ -2152,6 +2339,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x9A
+    APLocationId: 413
 
 - Name: Lanayru Field Male Stag Beetle
   Original Item: Male Stag Beetle
@@ -2164,6 +2352,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x9B
+    APLocationId: 414
 
 # HD Only location
 # - Name: Lanayru Field Chu Grotto Chest
@@ -2185,6 +2374,7 @@
     Poe:
       - Stage: 35
         Flag: 0x0B
+    APLocationId: 415
 
 - Name: Lanayru Field Poe Grotto Right Poe
   Original Item: Poe Soul
@@ -2196,6 +2386,7 @@
     Poe:
       - Stage: 35
         Flag: 0x0A
+    APLocationId: 416
 
 - Name: Lanayru Field Skulltula Grotto Chest
   Original Item: Orange Rupee
@@ -2208,6 +2399,7 @@
     Chest:
       - Stage: 38
         Tbox Id: 19
+    APLocationId: 417
 
 - Name: Lanayru Ice Block Puzzle Cave Chest
   Original Item: Piece of Heart
@@ -2219,6 +2411,7 @@
     Chest:
       - Stage: 30
         Tbox Id: 0
+    APLocationId: 419
 
 - Name: Lanayru Field Spinner Track Chest
   Original Item: Piece of Heart
@@ -2230,6 +2423,7 @@
     Chest:
       - Stage: 56
         Tbox Id: 8
+    APLocationId: 418
 
 - Name: Lanayru Field North Spinner Track Boulder Rupee
   Original Item: Yellow Rupee
@@ -2241,6 +2435,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x89
+    APLocationId: -1
 
 - Name: Lanayru Field South Spinner Track Boulder Rupee
   Original Item: Yellow Rupee
@@ -2252,6 +2447,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x8A
+    APLocationId: -1
 
 - Name: Castle Town Warp Portal
   Original Item: Castle Town Portal
@@ -2273,6 +2469,7 @@
     Freestanding Item:
       - Stage: 57
         Flag: 0x9C
+    APLocationId: 443
 
 - Name: West Hyrule Field Male Butterfly
   Original Item: Male Butterfly
@@ -2285,6 +2482,7 @@
     Freestanding Item:
       - Stage: 57
         Flag: 0x9D
+    APLocationId: 446
 
 - Name: West Hyrule Field Northern Boulder Rupee
   Original Item: Yellow Rupee
@@ -2296,6 +2494,7 @@
     Freestanding Item:
       - Stage: 57
         Flag: 0x84
+    APLocationId: -1
 
 - Name: West Hyrule Field Southern Boulder Rupee
   Original Item: Yellow Rupee
@@ -2307,6 +2506,7 @@
     Freestanding Item:
       - Stage: 57
         Flag: 0x85
+    APLocationId: -1
 
 - Name: West Hyrule Field Helmasaur Grotto Chest
   Original Item: Orange Rupee
@@ -2319,6 +2519,7 @@
     Chest:
       - Stage: 35
         Tbox Id: 0
+    APLocationId: 445
 
 - Name: West Hyrule Field Golden Wolf
   Original Item: Progressive Hidden Skill
@@ -2328,6 +2529,7 @@
   Metadata:
     Golden Wolf:
       - Flag: 0x3C04
+    APLocationId: 444
 
 - Name: Hyrule Field Amphitheater Owl Statue Chest
   Original Item: Orange Rupee
@@ -2339,6 +2541,7 @@
     Chest:
       - Stage: 57
         Tbox Id: 11
+    APLocationId: 370
 
 - Name: Hyrule Field Amphitheater Owl Statue Sky Character
   Original Item: Progressive Sky Book
@@ -2350,8 +2553,9 @@
       - Stage: 57
         Room: 8
     Switch Flag:
-        Stage: 57
-        Flag: 0x57
+      Stage: 57
+      Flag: 0x57
+    APLocationId: 371
 
 - Name: Hyrule Field Amphitheater Poe
   Original Item: Poe Soul
@@ -2363,6 +2567,7 @@
     Poe:
       - Stage: 57
         Flag: 0x49
+    APLocationId: 372
 
 - Name: Charlo Donation Blessing
   Original Item: Piece of Heart
@@ -2376,6 +2581,7 @@
     Name Lookup:
       - Charlo Donation Blessing
     Event Flag: 0x2480
+    APLocationId: 359
 
 - Name: STAR Prize 1
   Original Item: Progressive Bow
@@ -2388,6 +2594,7 @@
     Name Lookup:
       - STAR Prize 1
     Event Flag: 0x2308
+    APLocationId: 439
 
 - Name: STAR Prize 2
   Original Item: Progressive Bow
@@ -2400,6 +2607,7 @@
     Name Lookup:
       - STAR Prize 2
     Event Flag: 0x2301
+    APLocationId: 440
 
 - Name: Castle Town Malo Mart Magic Armor
   Original Item: Magic Armor
@@ -2412,8 +2620,9 @@
       - Stage: 73
         Item: 0x30
     Switch Flag:
-        Stage: 73
-        Flag: 0x2B
+      Stage: 73
+      Flag: 0x2B
+    APLocationId: 358
 
 # HD Only location
 # - Name: Castle Town Malo Mart Stamp
@@ -2434,6 +2643,7 @@
   Metadata:
     Golden Wolf:
       - Flag: 0x3D40
+    APLocationId: 427
 
 - Name: Doctors Office Balcony Chest
   Original Item: Red Rupee
@@ -2445,6 +2655,7 @@
     Chest:
       - Stage: 53
         Tbox Id: 1
+    APLocationId: 360
 
 - Name: East Castle Town Bridge Poe
   Original Item: Poe Soul
@@ -2456,6 +2667,7 @@
     Poe:
       - Stage: 57
         Flag: 0x47
+    APLocationId: 361
 
 - Name: Jovani 20 Poe Soul Reward
   Original Item: Bottle with Great Fairies Tears
@@ -2469,6 +2681,7 @@
     Name Lookup:
       - Jovani 20 Poe Soul Reward
     Event Flag: 0x5510
+    APLocationId: 376
 
 - Name: Jovani 60 Poe Soul Reward
   Original Item: Silver Rupee
@@ -2482,6 +2695,7 @@
     Name Lookup:
       - Jovani 60 Poe Soul Reward
     Event Flag: 0x3820
+    APLocationId: 377
 
 # HD Only Location
 # - Name: Gengle 60 Poe Soul Reward
@@ -2503,6 +2717,7 @@
     Poe:
       - Stage: 73
         Flag: 0x1E
+    APLocationId: 378
 
 - Name: Telma Invoice
   Original Item: Invoice
@@ -2515,6 +2730,7 @@
     Name Lookup:
       - Telma Invoice
     Event Flag: 0x2180
+    APLocationId: -1
 
 - Name: Agitha Male Beetle Reward
   Original Item: Orange Rupee
@@ -2526,6 +2742,7 @@
     Bug Reward:
       - Item Id: 0xC0
     Event Flag: 0x3110
+    APLocationId: 346
 
 - Name: Agitha Female Beetle Reward
   Original Item: Purple Rupee
@@ -2537,6 +2754,7 @@
     Bug Reward:
       - Item Id: 0xC1
     Event Flag: 0x3108
+    APLocationId: 334
 
 - Name: Agitha Male Butterfly Reward
   Original Item: Orange Rupee
@@ -2548,6 +2766,7 @@
     Bug Reward:
       - Item Id: 0xC2
     Event Flag: 0x3104
+    APLocationId: 347
 
 - Name: Agitha Female Butterfly Reward
   Original Item: Purple Rupee
@@ -2559,6 +2778,7 @@
     Bug Reward:
       - Item Id: 0xC3
     Event Flag: 0x3102
+    APLocationId: 335
 
 - Name: Agitha Male Stag Beetle Reward
   Original Item: Purple Rupee
@@ -2570,6 +2790,7 @@
     Bug Reward:
       - Item Id: 0xC4
     Event Flag: 0x3101
+    APLocationId: 356
 
 - Name: Agitha Female Stag Beetle Reward
   Original Item: Orange Rupee
@@ -2581,6 +2802,7 @@
     Bug Reward:
       - Item Id: 0xC5
     Event Flag: 0x3280
+    APLocationId: 344
 
 - Name: Agitha Male Grasshopper Reward
   Original Item: Progressive Wallet
@@ -2592,6 +2814,7 @@
     Bug Reward:
       - Item Id: 0xC6
     Event Flag: 0x3240
+    APLocationId: 350
 
 - Name: Agitha Female Grasshopper Reward
   Original Item: Orange Rupee
@@ -2603,6 +2826,7 @@
     Bug Reward:
       - Item Id: 0xC7
     Event Flag: 0x3220
+    APLocationId: 338
 
 - Name: Agitha Male Phasmid Reward
   Original Item: Progressive Wallet
@@ -2614,6 +2838,7 @@
     Bug Reward:
       - Item Id: 0xC8
     Event Flag: 0x3210
+    APLocationId: 353
 
 - Name: Agitha Female Phasmid Reward
   Original Item: Orange Rupee
@@ -2625,6 +2850,7 @@
     Bug Reward:
       - Item Id: 0xC9
     Event Flag: 0x3208
+    APLocationId: 341
 
 - Name: Agitha Male Pill Bug Reward
   Original Item: Orange Rupee
@@ -2636,6 +2862,7 @@
     Bug Reward:
       - Item Id: 0xCA
     Event Flag: 0x3204
+    APLocationId: 354
 
 - Name: Agitha Female Pill Bug Reward
   Original Item: Purple Rupee
@@ -2647,6 +2874,7 @@
     Bug Reward:
       - Item Id: 0xCB
     Event Flag: 0x3202
+    APLocationId: 342
 
 - Name: Agitha Male Mantis Reward
   Original Item: Purple Rupee
@@ -2658,6 +2886,7 @@
     Bug Reward:
       - Item Id: 0xCC
     Event Flag: 0x3201
+    APLocationId: 352
 
 - Name: Agitha Female Mantis Reward
   Original Item: Orange Rupee
@@ -2669,6 +2898,7 @@
     Bug Reward:
       - Item Id: 0xCD
     Event Flag: 0x3380
+    APLocationId: 340
 
 - Name: Agitha Male Ladybug Reward
   Original Item: Purple Rupee
@@ -2680,6 +2910,7 @@
     Bug Reward:
       - Item Id: 0xCE
     Event Flag: 0x3340
+    APLocationId: 351
 
 - Name: Agitha Female Ladybug Reward
   Original Item: Orange Rupee
@@ -2691,6 +2922,7 @@
     Bug Reward:
       - Item Id: 0xCF
     Event Flag: 0x3320
+    APLocationId: 339
 
 - Name: Agitha Male Snail Reward
   Original Item: Purple Rupee
@@ -2702,6 +2934,7 @@
     Bug Reward:
       - Item Id: 0xD0
     Event Flag: 0x3310
+    APLocationId: 355
 
 - Name: Agitha Female Snail Reward
   Original Item: Purple Rupee
@@ -2713,6 +2946,7 @@
     Bug Reward:
       - Item Id: 0xD1
     Event Flag: 0x3308
+    APLocationId: 343
 
 - Name: Agitha Male Dragonfly Reward
   Original Item: Purple Rupee
@@ -2724,6 +2958,7 @@
     Bug Reward:
       - Item Id: 0xD2
     Event Flag: 0x3304
+    APLocationId: 349
 
 - Name: Agitha Female Dragonfly Reward
   Original Item: Orange Rupee
@@ -2735,6 +2970,7 @@
     Bug Reward:
       - Item Id: 0xD3
     Event Flag: 0x3302
+    APLocationId: 337
 
 - Name: Agitha Male Ant Reward
   Original Item: Orange Rupee
@@ -2746,6 +2982,7 @@
     Bug Reward:
       - Item Id: 0xD4
     Event Flag: 0x3301
+    APLocationId: 345
 
 - Name: Agitha Female Ant Reward
   Original Item: Purple Rupee
@@ -2757,6 +2994,7 @@
     Bug Reward:
       - Item Id: 0xD5
     Event Flag: 0x3480
+    APLocationId: 333
 
 - Name: Agitha Male Dayfly Reward
   Original Item: Purple Rupee
@@ -2768,6 +3006,7 @@
     Bug Reward:
       - Item Id: 0xD6
     Event Flag: 0x3440
+    APLocationId: 348
 
 - Name: Agitha Female Dayfly Reward
   Original Item: Orange Rupee
@@ -2779,6 +3018,7 @@
     Bug Reward:
       - Item Id: 0xD7
     Event Flag: 0x3420
+    APLocationId: 336
 
 # HD Only Location
 # - Name: Agitha 12 Golden Bugs Reward
@@ -2801,6 +3041,7 @@
     Chest:
       - Stage: 57
         Tbox Id: 12
+    APLocationId: 437
 
 - Name: Outside South Castle Town Fountain Chest
   Original Item: Orange Rupee
@@ -2813,6 +3054,7 @@
     Chest:
       - Stage: 57
         Tbox Id: 14
+    APLocationId: 432
 
 - Name: Outside South Castle Town Male Ladybug
   Original Item: Male Ladybug
@@ -2825,6 +3067,7 @@
     Freestanding Item:
       - Stage: 57
         Flag: 0x91
+    APLocationId: 434
 
 - Name: Outside South Castle Town Female Ladybug
   Original Item: Female Ladybug
@@ -2837,6 +3080,7 @@
     Freestanding Item:
       - Stage: 57
         Flag: 0x90
+    APLocationId: 431
 
 - Name: Outside South Castle Town Poe
   Original Item: Poe Soul
@@ -2848,6 +3092,7 @@
     Poe:
       - Stage: 57
         Flag: 0x30
+    APLocationId: 435
 
 - Name: Outside South Castle Town Tektite Grotto Chest
   Original Item: Orange Rupee
@@ -2859,6 +3104,7 @@
     Chest:
       - Stage: 39
         Tbox Id: 1
+    APLocationId: 436
 
 - Name: Outside South Castle Town Golden Wolf
   Original Item: Progressive Hidden Skill
@@ -2868,6 +3114,7 @@
   Metadata:
     Golden Wolf:
       - Flag: 0x3C02
+    APLocationId: 433
 
 - Name: Outside South Castle Town Double Clawshot Chasm Chest
   Original Item: Orange Rupee
@@ -2880,6 +3127,7 @@
     Chest:
       - Stage: 57
         Tbox Id: 13
+    APLocationId: 430
 
 - Name: Outside South Castle Town Boulder Rupee
   Original Item: Yellow Rupee
@@ -2891,6 +3139,7 @@
     Freestanding Item:
       - Stage: 57
         Flag: 0x83
+    APLocationId: -1
 
 - Name: Wooden Statue
   Original Item: Wooden Statue
@@ -2903,6 +3152,7 @@
     Name Lookup:
       - Wooden Statue
     Event Flag: 0x2204
+    APLocationId: -1
 
 - Name: Lake Hylia Bridge Owl Statue Chest
   Original Item: Orange Rupee
@@ -2914,6 +3164,7 @@
     Chest:
       - Stage: 56
         Tbox Id: 15
+    APLocationId: 385
 
 - Name: Lake Hylia Bridge Owl Statue Sky Character
   Original Item: Progressive Sky Book
@@ -2925,6 +3176,7 @@
       - Stage: 56
         Room: 13
     Event Flag: 0x6008
+    APLocationId: 386
 
 - Name: Lake Hylia Bridge Owl Statue Boulder Rupee
   Original Item: Blue Rupee
@@ -2936,6 +3188,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x8B
+    APLocationId: -1
 
 - Name: Lake Hylia Bridge Vines Chest
   Original Item: Orange Rupee
@@ -2947,6 +3200,7 @@
     Chest:
       - Stage: 56
         Tbox Id: 10
+    APLocationId: 387
 
 - Name: Lake Hylia Bridge Female Mantis
   Original Item: Female Mantis
@@ -2959,6 +3213,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x92
+    APLocationId: 383
 
 - Name: Lake Hylia Bridge Male Mantis
   Original Item: Male Mantis
@@ -2971,6 +3226,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x93
+    APLocationId: 384
 
 - Name: Lake Hylia Bridge Cliff Chest
   Original Item: Purple Rupee
@@ -2982,6 +3238,7 @@
     Chest:
       - Stage: 56
         Tbox Id: 9
+    APLocationId: 381
 
 - Name: Lake Hylia Bridge Cliff Poe
   Original Item: Poe Soul
@@ -2993,6 +3250,7 @@
     Poe:
       - Stage: 56
         Flag: 0x3B
+    APLocationId: 382
 
 - Name: Lake Hylia Bridge Bubble Grotto Chest
   Original Item: Orange Rupee
@@ -3005,6 +3263,7 @@
     Chest:
       - Stage: 38
         Tbox Id: 4
+    APLocationId: 380
 
 - Name: Lake Hylia Bridge Faron Boulder Rupee
   Original Item: Yellow Rupee
@@ -3016,6 +3275,7 @@
     Freestanding Item:
       - Stage: 56
         Flag: 0x8C
+    APLocationId: -1
 
 - Name: Lake Hylia Warp Portal
   Original Item: Lake Hylia Portal
@@ -3037,6 +3297,7 @@
     Name Lookup:
       - Auru Gift To Fyer
     Event Flag: 0x2520
+    APLocationId: 357
 
 - Name: Lake Hylia Tower Poe
   Original Item: Poe Soul
@@ -3048,6 +3309,7 @@
     Poe:
       - Stage: 52
         Flag: 0x4C
+    APLocationId: 390
 
 - Name: Lake Hylia Water Toadpoli Grotto Chest
   Original Item: Orange Rupee
@@ -3060,6 +3322,7 @@
     Chest:
       - Stage: 39
         Tbox Id: 5
+    APLocationId: 392
 
 - Name: Lake Lantern Cave First Chest
   Original Item: Bomblings 5
@@ -3071,6 +3334,7 @@
     Chest:
       - Stage: 33
         Tbox Id: 1
+    APLocationId: 398
 
 - Name: Lake Lantern Cave Second Chest
   Original Item: Yellow Rupee
@@ -3082,6 +3346,7 @@
     Chest:
       - Stage: 33
         Tbox Id: 2
+    APLocationId: 403
 
 - Name: Lake Lantern Cave Third Chest
   Original Item: Red Rupee
@@ -3093,6 +3358,7 @@
     Chest:
       - Stage: 33
         Tbox Id: 6
+    APLocationId: 408
 
 - Name: Lake Lantern Cave Fourth Chest
   Original Item: Arrows 10
@@ -3104,6 +3370,7 @@
     Chest:
       - Stage: 33
         Tbox Id: 0
+    APLocationId: 401
 
 - Name: Lake Lantern Cave Fifth Chest
   Original Item: Red Rupee
@@ -3116,6 +3383,7 @@
     Chest:
       - Stage: 33
         Tbox Id: 7
+    APLocationId: 396
 
 - Name: Lake Lantern Cave Sixth Chest
   Original Item: Orange Rupee
@@ -3127,6 +3395,7 @@
     Chest:
       - Stage: 33
         Tbox Id: 8
+    APLocationId: 406
 
 - Name: Lake Lantern Cave Seventh Chest
   Original Item: Bomblings 5
@@ -3138,6 +3407,7 @@
     Chest:
       - Stage: 33
         Tbox Id: 14
+    APLocationId: 405
 
 - Name: Lake Lantern Cave Eighth Chest
   Original Item: Red Rupee
@@ -3149,6 +3419,7 @@
     Chest:
       - Stage: 33
         Tbox Id: 10
+    APLocationId: 393
 
 - Name: Lake Lantern Cave Ninth Chest
   Original Item: Arrows 10
@@ -3160,6 +3431,7 @@
     Chest:
       - Stage: 33
         Tbox Id: 9
+    APLocationId: 402
 
 - Name: Lake Lantern Cave Tenth Chest
   Original Item: Purple Rupee
@@ -3171,6 +3443,7 @@
     Chest:
       - Stage: 33
         Tbox Id: 5
+    APLocationId: 407
 
 - Name: Lake Lantern Cave Eleventh Chest
   Original Item: Bomblings 10
@@ -3182,6 +3455,7 @@
     Chest:
       - Stage: 33
         Tbox Id: 4
+    APLocationId: 394
 
 - Name: Lake Lantern Cave Twelfth Chest
   Original Item: Purple Rupee
@@ -3193,6 +3467,7 @@
     Chest:
       - Stage: 33
         Tbox Id: 11
+    APLocationId: 410
 
 - Name: Lake Lantern Cave Thirteenth Chest
   Original Item: Seeds 50
@@ -3204,6 +3479,7 @@
     Chest:
       - Stage: 33
         Tbox Id: 12
+    APLocationId: 409
 
 - Name: Lake Lantern Cave Fourteenth Chest
   Original Item: Orange Rupee
@@ -3216,6 +3492,7 @@
     Chest:
       - Stage: 33
         Tbox Id: 13
+    APLocationId: 400
 
 - Name: Lake Lantern Cave End Lantern Chest
   Original Item: Piece of Heart
@@ -3227,6 +3504,7 @@
     Chest:
       - Stage: 33
         Tbox Id: 3
+    APLocationId: 395
 
 - Name: Lake Lantern Cave First Poe
   Original Item: Poe Soul
@@ -3238,6 +3516,7 @@
     Poe:
       - Stage: 33
         Flag: 0x5E
+    APLocationId: 399
 
 - Name: Lake Lantern Cave Second Poe
   Original Item: Poe Soul
@@ -3249,6 +3528,7 @@
     Poe:
       - Stage: 33
         Flag: 0x5D
+    APLocationId: 404
 
 - Name: Lake Lantern Cave Final Poe
   Original Item: Poe Soul
@@ -3260,6 +3540,7 @@
     Poe:
       - Stage: 33
         Flag: 0x5F
+    APLocationId: 397
 
 - Name: Lake Hylia Underwater Chest
   Original Item: Orange Rupee
@@ -3272,6 +3553,7 @@
     Chest:
       - Stage: 52
         Tbox Id: 5
+    APLocationId: 391
 
 - Name: Lake Hylia Left Underwater Boulder Rupee
   Original Item: Green Rupee
@@ -3283,6 +3565,7 @@
     Freestanding Item:
       - Stage: 52
         Flag: 0x9A
+    APLocationId: -1
 
 - Name: Lake Hylia Left Underwater Pillar Rupee
   Original Item: Yellow Rupee
@@ -3294,6 +3577,7 @@
     Freestanding Item:
       - Stage: 52
         Flag: 0x81
+    APLocationId: -1
 
 - Name: Lake Hylia Right Underwater Boulder Rupee
   Original Item: Green Rupee
@@ -3305,6 +3589,7 @@
     Freestanding Item:
       - Stage: 52
         Flag: 0x9B
+    APLocationId: -1
 
 - Name: Lake Hylia Right Underwater Pillar Rupee
   Original Item: Yellow Rupee
@@ -3316,6 +3601,7 @@
     Freestanding Item:
       - Stage: 52
         Flag: 0x80
+    APLocationId: -1
 
 - Name: Lake Hylia Alcove Poe
   Original Item: Poe Soul
@@ -3327,6 +3613,7 @@
     Poe:
       - Stage: 52
         Flag: 0x46
+    APLocationId: 379
 
 - Name: Flight By Fowl Top Platform Reward
   Original Item: Orange Rupee
@@ -3338,6 +3625,7 @@
     Chest:
       - Stage: 52
         Tbox Id: 25
+    APLocationId: 369
 
 - Name: Flight By Fowl Second Platform Chest
   Original Item: Piece of Heart
@@ -3349,6 +3637,7 @@
     Chest:
       - Stage: 52
         Tbox Id: 0
+    APLocationId: 367
 
 - Name: Flight By Fowl Third Platform Chest
   Original Item: Purple Rupee
@@ -3361,6 +3650,7 @@
     Chest:
       - Stage: 52
         Tbox Id: 2
+    APLocationId: 368
 
 - Name: Flight By Fowl Fourth Platform Chest
   Original Item: Red Rupee
@@ -3372,6 +3662,7 @@
     Chest:
       - Stage: 52
         Tbox Id: 8
+    APLocationId: 365
 
 - Name: Flight By Fowl Fifth Platform Chest
   Original Item: Yellow Rupee
@@ -3383,6 +3674,7 @@
     Chest:
       - Stage: 52
         Tbox Id: 7
+    APLocationId: 364
 
 - Name: Isle of Riches Poe
   Original Item: Poe Soul
@@ -3394,6 +3686,7 @@
     Poe:
       - Stage: 52
         Flag: 0x47
+    APLocationId: 373
 
 - Name: Flight By Fowl Ledge Poe
   Original Item: Poe Soul
@@ -3405,6 +3698,7 @@
     Poe:
       - Stage: 52
         Flag: 0x4D
+    APLocationId: 366
 
 - Name: Lake Hylia Shell Blade Grotto Chest
   Original Item: Orange Rupee
@@ -3416,6 +3710,7 @@
     Chest:
       - Stage: 39
         Tbox Id: 21
+    APLocationId: 389
 
 - Name: Lake Hylia Dock Poe
   Original Item: Poe Soul
@@ -3427,6 +3722,7 @@
     Poe:
       - Stage: 52
         Flag: 0x4B
+    APLocationId: 388
 
 - Name: Outside Lanayru Spring Left Statue Chest
   Original Item: Purple Rupee
@@ -3438,6 +3734,7 @@
     Chest:
       - Stage: 52
         Tbox Id: 1
+    APLocationId: 428
 
 - Name: Outside Lanayru Spring Right Statue Chest
   Original Item: Orange Rupee
@@ -3449,6 +3746,7 @@
     Chest:
       - Stage: 52
         Tbox Id: 6
+    APLocationId: 429
 
 - Name: Lanayru Spring Back Room Lantern Chest
   Original Item: Piece of Heart
@@ -3460,6 +3758,7 @@
     Chest:
       - Stage: 52
         Tbox Id: 29
+    APLocationId: 420
 
 - Name: Lanayru Spring Back Room Left Chest
   Original Item: Bombs 5
@@ -3471,6 +3770,7 @@
     Chest:
       - Stage: 52
         Tbox Id: 28
+    APLocationId: 421
 
 - Name: Lanayru Spring Back Room Right Chest
   Original Item: Blue Rupee
@@ -3482,6 +3782,7 @@
     Chest:
       - Stage: 52
         Tbox Id: 27
+    APLocationId: 422
 
 - Name: Lanayru Spring East Double Clawshot Chest
   Original Item: Orange Rupee
@@ -3493,6 +3794,7 @@
     Chest:
       - Stage: 52
         Tbox Id: 4
+    APLocationId: 423
 
 - Name: Lanayru Spring West Double Clawshot Chest
   Original Item: Orange Rupee
@@ -3504,6 +3806,7 @@
     Chest:
       - Stage: 52
         Tbox Id: 3
+    APLocationId: 426
 
 - Name: Lanayru Spring Underwater Left Chest
   Original Item: Blue Rupee
@@ -3515,6 +3818,7 @@
     Chest:
       - Tbox Id: 12
         Stage: 52
+    APLocationId: 424
 
 - Name: Lanayru Spring Underwater Right Chest
   Original Item: Yellow Rupee
@@ -3526,6 +3830,7 @@
     Chest:
       - Stage: 52
         Tbox Id: 10
+    APLocationId: 425
 
 - Name: Lanayru Spring Lower Underwater Boulder Rupee
   Original Item: Red Rupee
@@ -3537,6 +3842,7 @@
     Freestanding Item:
       - Stage: 52
         Flag: 0x8F
+    APLocationId: -1
 
 - Name: Lanayru Spring Upper Underwater Boulder Rupee
   Original Item: Red Rupee
@@ -3548,6 +3854,7 @@
     Freestanding Item:
       - Stage: 52
         Flag: 0x90
+    APLocationId: -1
 
 - Name: Plumm Fruit Balloon Minigame
   Original Item: Piece of Heart
@@ -3560,6 +3867,7 @@
     Name Lookup:
       - Plumm Fruit Balloon Minigame
     Event Flag: 0x2380
+    APLocationId: 438
 
 - Name: Upper Zoras River Warp Portal
   Original Item: Upper Zoras River Portal
@@ -3581,6 +3889,7 @@
     Freestanding Item:
       - Stage: 61
         Flag: 0x9E
+    APLocationId: 441
 
 - Name: Upper Zoras River Central Underwater Boulder Rupee
   Original Item: Blue Rupee
@@ -3592,6 +3901,7 @@
     Freestanding Item:
       - Stage: 61
         Flag: 0x91
+    APLocationId: -1
 
 - Name: Upper Zoras River East Underwater Boulder Rupee
   Original Item: Yellow Rupee
@@ -3603,6 +3913,7 @@
     Freestanding Item:
       - Stage: 61
         Flag: 0x93
+    APLocationId: -1
 
 - Name: Upper Zoras River Ledge Boulder Rupee
   Original Item: Blue Rupee
@@ -3614,6 +3925,7 @@
     Freestanding Item:
       - Stage: 61
         Flag: 0x94
+    APLocationId: -1
 
 - Name: Upper Zoras River West Underwater Boulder Rupee
   Original Item: Blue Rupee
@@ -3625,6 +3937,7 @@
     Freestanding Item:
       - Stage: 61
         Flag: 0x92
+    APLocationId: -1
 
 - Name: Upper Zoras River Poe
   Original Item: Poe Soul
@@ -3636,6 +3949,7 @@
     Poe:
       - Stage: 61
         Flag: 0x48
+    APLocationId: 442
 
 - Name: Iza Helping Hand
   Original Item: Bomb Bag
@@ -3648,6 +3962,7 @@
     Name Lookup:
       - Iza Helping Hand
     Event Flag: 0x0B01
+    APLocationId: 374
 
 - Name: Iza Raging Rapids Minigame
   Original Item: Giant Bomb Bag
@@ -3660,6 +3975,7 @@
     Name Lookup:
       - Iza Raging Rapids Minigame
     Event Flag: 0x5908
+    APLocationId: 375
 
 - Name: Fishing Hole Bottle
   Original Item: Empty Bottle
@@ -3673,6 +3989,7 @@
       - Group: 0
         Message Id: 1822
     Event Flag: 0x3908
+    APLocationId: 362
 
 - Name: Fishing Hole Heart Piece
   Original Item: Piece of Heart
@@ -3692,7 +4009,7 @@
         Message Id: 7564
       - Group: 7
         Message Id: 7578
-
+    APLocationId: 363
 
 - Name: Zoras Domain Warp Portal
   Original Item: Zoras Domain Portal
@@ -3714,6 +4031,7 @@
     Freestanding Item:
       - Stage: 50
         Flag: 0x9F
+    APLocationId: 451
 
 - Name: Zoras Domain Mother and Child Isle Poe
   Original Item: Poe Soul
@@ -3725,6 +4043,7 @@
     Poe:
       - Stage: 50
         Flag: 0x4A
+    APLocationId: 452
 
 - Name: Zoras Domain Chest Behind Waterfall
   Original Item: Red Rupee
@@ -3736,6 +4055,7 @@
     Chest:
       - Stage: 50
         Tbox Id: 26
+    APLocationId: 447
 
 - Name: Zoras Domain Chest By Mother and Child Isles
   Original Item: Yellow Rupee
@@ -3747,6 +4067,7 @@
     Chest:
       - Stage: 50
         Tbox Id: 30
+    APLocationId: 448
 
 - Name: Zoras Domain Waterfall Poe
   Original Item: Poe Soul
@@ -3758,6 +4079,7 @@
     Poe:
       - Stage: 50
         Flag: 0x49
+    APLocationId: 454
 
 - Name: Zoras Domain Behind Waterfall Rupee
   Original Item: Blue Rupee
@@ -3769,6 +4091,7 @@
     Freestanding Item:
       - Stage: 50
         Flag: 0x96
+    APLocationId: -1
 
 - Name: Zoras Domain Central Underwater Boulder Rupee
   Original Item: Red Rupee
@@ -3780,6 +4103,7 @@
     Freestanding Item:
       - Stage: 50
         Flag: 0x8E
+    APLocationId: -1
 
 - Name: Zoras Domain North Underwater Boulder Rupee
   Original Item: Red Rupee
@@ -3791,6 +4115,7 @@
     Freestanding Item:
       - Stage: 50
         Flag: 0x8D
+    APLocationId: -1
 
 - Name: Zoras Domain Shortcut Ledge Rupee
   Original Item: Yellow Rupee
@@ -3802,6 +4127,7 @@
     Freestanding Item:
       - Stage: 50
         Flag: 0x84
+    APLocationId: -1
 
 - Name: Zoras Domain Shortcut Lower Boulder Rupee
   Original Item: Blue Rupee
@@ -3813,6 +4139,7 @@
     Freestanding Item:
       - Stage: 50
         Flag: 0x8C
+    APLocationId: -1
 
 - Name: Zoras Domain Shortcut Upper Boulder Rupee
   Original Item: Green Rupee
@@ -3824,7 +4151,7 @@
     Freestanding Item:
       - Stage: 50
         Flag: 0x8B
-
+    APLocationId: -1
 
 - Name: Zoras Domain Top Ledge Rupee
   Original Item: Yellow Rupee
@@ -3836,6 +4163,7 @@
     Freestanding Item:
       - Stage: 50
         Flag: 0x83
+    APLocationId: -1
 
 - Name: Zoras Domain Vine Ledge Rupee
   Original Item: Blue Rupee
@@ -3847,6 +4175,7 @@
     Freestanding Item:
       - Stage: 50
         Flag: 0x97
+    APLocationId: -1
 
 - Name: Zoras Domain Waterfall Ledge Rupee
   Original Item: Blue Rupee
@@ -3858,6 +4187,7 @@
     Freestanding Item:
       - Stage: 50
         Flag: 0x95
+    APLocationId: -1
 
 - Name: Zoras Domain Extinguish All Torches Chest
   Original Item: Purple Rupee
@@ -3869,6 +4199,7 @@
     Chest:
       - Stage: 50
         Tbox Id: 20
+    APLocationId: 449
 
 - Name: Zoras Domain Light All Torches Chest
   Original Item: Purple Rupee
@@ -3880,6 +4211,7 @@
     Chest:
       - Stage: 50
         Tbox Id: 19
+    APLocationId: 450
 
 - Name: Zoras Domain Underwater Goron
   Original Item: Bomb Bag
@@ -3892,6 +4224,7 @@
     Name Lookup:
       - Zoras Domain Underwater Goron
     Event Flag: 0x3D10
+    APLocationId: 453
 
 - Name: Zoras Domain Throne East Gate Underwater Rupee
   Original Item: Yellow Rupee
@@ -3903,6 +4236,7 @@
     Freestanding Item:
       - Stage: 50
         Flag: 0x8A
+    APLocationId: -1
 
 - Name: Zoras Domain Throne East Underwater Rupee
   Original Item: Yellow Rupee
@@ -3914,6 +4248,7 @@
     Freestanding Item:
       - Stage: 50
         Flag: 0x86
+    APLocationId: -1
 
 - Name: Zoras Domain Throne Northwest Underwater Rupee
   Original Item: Yellow Rupee
@@ -3925,6 +4260,7 @@
     Freestanding Item:
       - Stage: 50
         Flag: 0x87
+    APLocationId: -1
 
 - Name: Zoras Domain Throne South Underwater Rupee
   Original Item: Yellow Rupee
@@ -3936,6 +4272,7 @@
     Freestanding Item:
       - Stage: 50
         Flag: 0x88
+    APLocationId: -1
 
 - Name: Zoras Domain Throne West Gate Underwater Rupee
   Original Item: Blue Rupee
@@ -3947,6 +4284,7 @@
     Freestanding Item:
       - Stage: 50
         Flag: 0x89
+    APLocationId: -1
 
 - Name: Zoras Domain Throne West Underwater Rupee
   Original Item: Yellow Rupee
@@ -3958,6 +4296,7 @@
     Freestanding Item:
       - Stage: 50
         Flag: 0x85
+    APLocationId: -1
 
 # SNOWPEAK PROVINCE
 
@@ -3981,6 +4320,7 @@
     Name Lookup:
       - Ashei Sketch
     Event Flag: 0x2940
+    APLocationId: 466
 
 - Name: Snowpeak Blizzard Poe
   Original Item: Poe Soul
@@ -3992,6 +4332,7 @@
     Poe:
       - Stage: 51
         Flag: 0x7D
+    APLocationId: 469
 
 - Name: Snowpeak Above Freezard Grotto Poe
   Original Item: Poe Soul
@@ -4003,6 +4344,7 @@
     Poe:
       - Stage: 51
         Flag: 0x7C
+    APLocationId: 468
 
 - Name: Snowpeak Poe Among Trees
   Original Item: Poe Soul
@@ -4014,6 +4356,7 @@
     Poe:
       - Stage: 51
         Flag: 0x7B
+    APLocationId: 474
 
 - Name: Snowpeak Freezard Grotto Chest
   Original Item: Orange Rupee
@@ -4025,6 +4368,7 @@
     Chest:
       - Stage: 38
         Tbox Id: 15
+    APLocationId: 472
 
 - Name: Snowpeak Cave Ice Lantern Chest
   Original Item: Orange Rupee
@@ -4036,6 +4380,7 @@
     Chest:
       - Stage: 51
         Tbox Id: 0
+    APLocationId: 470
 
 - Name: Snowpeak Cave Ice Poe
   Original Item: Poe Soul
@@ -4047,6 +4392,7 @@
     Poe:
       - Stage: 51
         Flag: 0x7F
+    APLocationId: 471
 
 - Name: Snowpeak Icy Summit Poe
   Original Item: Poe Soul
@@ -4058,6 +4404,7 @@
     Poe:
       - Stage: 51
         Flag: 0x7E
+    APLocationId: 473
 
 - Name: Snowboard Racing Prize
   Original Item: Piece of Heart
@@ -4070,6 +4417,7 @@
     Name Lookup:
       - Snowboard Racing Prize
     Event Flag: 0x3B10
+    APLocationId: 467
 
 - Name: Snowboarding Bridge Ledge Bottom Rupee
   Original Item: Green Rupee
@@ -4081,6 +4429,7 @@
     Freestanding Item:
       - Stage: 51
         Flag: 0x84
+    APLocationId: -1
 
 - Name: Snowboarding Bridge Ledge Middle Rupee
   Original Item: Green Rupee
@@ -4092,6 +4441,7 @@
     Freestanding Item:
       - Stage: 51
         Flag: 0x83
+    APLocationId: -1
 
 - Name: Snowboarding Bridge Ledge Upper Rupee
   Original Item: Green Rupee
@@ -4103,6 +4453,7 @@
     Freestanding Item:
       - Stage: 51
         Flag: 0x82
+    APLocationId: -1
 
 - Name: Snowboarding Shortcut Rupee 1
   Original Item: Green Rupee
@@ -4114,6 +4465,7 @@
     Freestanding Item:
       - Stage: 51
         Flag: 0x88
+    APLocationId: -1
 
 - Name: Snowboarding Shortcut Rupee 2
   Original Item: Green Rupee
@@ -4125,6 +4477,7 @@
     Freestanding Item:
       - Stage: 51
         Flag: 0x89
+    APLocationId: -1
 
 - Name: Snowboarding Shortcut Rupee 3
   Original Item: Green Rupee
@@ -4136,6 +4489,7 @@
     Freestanding Item:
       - Stage: 51
         Flag: 0x8A
+    APLocationId: -1
 
 - Name: Snowboarding Shortcut Rupee 4
   Original Item: Red Rupee
@@ -4147,6 +4501,7 @@
     Freestanding Item:
       - Stage: 51
         Flag: 0x8B
+    APLocationId: -1
 
 - Name: Snowboarding Shortcut Rupee 5
   Original Item: Green Rupee
@@ -4158,6 +4513,7 @@
     Freestanding Item:
       - Stage: 51
         Flag: 0x8C
+    APLocationId: -1
 
 - Name: Snowboarding Shortcut Rupee 6
   Original Item: Green Rupee
@@ -4169,6 +4525,7 @@
     Freestanding Item:
       - Stage: 51
         Flag: 0x8D
+    APLocationId: -1
 
 - Name: Snowboarding Shortcut Rupee 7
   Original Item: Green Rupee
@@ -4180,6 +4537,7 @@
     Freestanding Item:
       - Stage: 51
         Flag: 0x8E
+    APLocationId: -1
 
 - Name: Snowboarding Shortcut Rupee 8
   Original Item: Green Rupee
@@ -4191,6 +4549,7 @@
     Freestanding Item:
       - Stage: 51
         Flag: 0x8F
+    APLocationId: -1
 
 - Name: Snowboarding Shortcut Rupee 9
   Original Item: Green Rupee
@@ -4202,6 +4561,7 @@
     Freestanding Item:
       - Stage: 51
         Flag: 0x90
+    APLocationId: -1
 
 - Name: Snowboarding Shortcut Rupee 10
   Original Item: Green Rupee
@@ -4213,6 +4573,7 @@
     Freestanding Item:
       - Stage: 51
         Flag: 0x91
+    APLocationId: -1
 
 - Name: Snowboarding Shortcut Rupee 11
   Original Item: Green Rupee
@@ -4224,6 +4585,7 @@
     Freestanding Item:
       - Stage: 51
         Flag: 0x92
+    APLocationId: -1
 
 - Name: Snowboarding Snowy Tree Top Rupee 1
   Original Item: Blue Rupee
@@ -4235,6 +4597,7 @@
     Freestanding Item:
       - Stage: 51
         Flag: 0x85
+    APLocationId: -1
 
 - Name: Snowboarding Snowy Tree Top Rupee 2
   Original Item: Red Rupee
@@ -4246,6 +4609,7 @@
     Freestanding Item:
       - Stage: 51
         Flag: 0x86
+    APLocationId: -1
 
 - Name: Snowboarding Snowy Tree Top Rupee 3
   Original Item: Purple Rupee
@@ -4257,6 +4621,7 @@
     Freestanding Item:
       - Stage: 51
         Flag: 0x87
+    APLocationId: -1
 
 - Name: Snowboarding Top Left Rupee
   Original Item: Green Rupee
@@ -4268,6 +4633,7 @@
     Freestanding Item:
       - Stage: 51
         Flag: 0x80
+    APLocationId: -1
 
 - Name: Snowboarding Top Right Rupee
   Original Item: Green Rupee
@@ -4279,6 +4645,7 @@
     Freestanding Item:
       - Stage: 51
         Flag: 0x81
+    APLocationId: -1
 
 # DESERT PROVINCE
 
@@ -4301,6 +4668,7 @@
     Poe:
       - Stage: 59
         Flag: 0x5C
+    APLocationId: 311
 
 - Name: Gerudo Desert Skulltula Grotto Chest
   Original Item: Orange Rupee
@@ -4312,6 +4680,7 @@
     Chest:
       - Stage: 38
         Tbox Id: 8
+    APLocationId: 327
 
 - Name: Gerudo Desert Peahat Ledge Chest
   Original Item: Red Rupee
@@ -4323,6 +4692,7 @@
     Chest:
       - Stage: 59
         Tbox Id: 11
+    APLocationId: 322
 
 - Name: Gerudo Desert East Canyon Chest
   Original Item: Red Rupee
@@ -4334,6 +4704,7 @@
     Chest:
       - Stage: 59
         Tbox Id: 6
+    APLocationId: 310
 
 - Name: Gerudo Desert South Chest Behind Wooden Gates
   Original Item: Orange Rupee
@@ -4345,6 +4716,7 @@
     Chest:
       - Stage: 59
         Tbox Id: 0
+    APLocationId: 328
 
 - Name: Gerudo Desert Lone Small Chest
   Original Item: Arrows 10
@@ -4356,6 +4728,7 @@
     Chest:
       - Stage: 59
         Tbox Id: 5
+    APLocationId: 314
 
 - Name: Gerudo Desert Male Dayfly
   Original Item: Male Dayfly
@@ -4368,6 +4741,7 @@
     Freestanding Item:
       - Stage: 59
         Flag: 0x99
+    APLocationId: 315
 
 - Name: Gerudo Desert Female Dayfly
   Original Item: Female Dayfly
@@ -4380,6 +4754,7 @@
     Freestanding Item:
       - Stage: 59
         Flag: 0x98
+    APLocationId: 312
 
 - Name: Gerudo Desert Owl Statue Chest
   Original Item: Orange Rupee
@@ -4391,6 +4766,7 @@
     Chest:
       - Stage: 59
         Tbox Id: 1
+    APLocationId: 320
 
 - Name: Gerudo Desert Owl Statue Sky Character
   Original Item: Progressive Sky Book
@@ -4402,6 +4778,7 @@
       - Stage: 59
         Room: 0
     Event Flag: 0x6040
+    APLocationId: 321
 
 - Name: Gerudo Desert Poe Above Cave of Ordeals
   Original Item: Poe Soul
@@ -4413,6 +4790,7 @@
     Poe:
       - Stage: 59
         Flag: 0x5D
+    APLocationId: 323
 
 - Name: Gerudo Desert West Canyon Chest
   Original Item: Purple Rupee
@@ -4425,6 +4803,7 @@
     Chest:
       - Stage: 59
         Tbox Id: 7
+    APLocationId: 329
 
 - Name: Gerudo Desert North Peahat Poe
   Original Item: Poe Soul
@@ -4436,6 +4815,7 @@
     Poe:
       - Stage: 59
         Flag: 0x5B
+    APLocationId: 316
 
 - Name: Gerudo Desert Rock Grotto First Poe
   Original Item: Poe Soul
@@ -4447,6 +4827,7 @@
     Poe:
       - Stage: 37
         Flag: 0x0F
+    APLocationId: 324
 
 - Name: Gerudo Desert Rock Grotto Second Poe
   Original Item: Poe Soul
@@ -4458,6 +4839,7 @@
     Poe:
       - Stage: 37
         Flag: 0x10
+    APLocationId: 326
 
 - Name: Gerudo Desert Rock Grotto Lantern Chest
   Original Item: Orange Rupee
@@ -4470,6 +4852,7 @@
     Chest:
       - Stage: 37
         Tbox Id: 14
+    APLocationId: 325
 
 - Name: Gerudo Desert Campfire East Chest
   Original Item: Purple Rupee
@@ -4481,6 +4864,7 @@
     Chest:
       - Stage: 59
         Tbox Id: 9
+    APLocationId: 307
 
 - Name: Gerudo Desert Campfire North Chest
   Original Item: Red Rupee
@@ -4492,6 +4876,7 @@
     Chest:
       - Stage: 59
         Tbox Id: 8
+    APLocationId: 308
 
 - Name: Gerudo Desert Campfire West Chest
   Original Item: Arrows 10
@@ -4503,6 +4888,7 @@
     Chest:
       - Stage: 59
         Tbox Id: 10
+    APLocationId: 309
 
 - Name: Gerudo Desert Northeast Chest Behind Gates
   Original Item: Red Rupee
@@ -4514,6 +4900,7 @@
     Chest:
       - Stage: 59
         Tbox Id: 2
+    APLocationId: 318
 
 - Name: Gerudo Desert Northwest Chest Behind Gates
   Original Item: Red Rupee
@@ -4525,6 +4912,7 @@
     Chest:
       - Stage: 59
         Tbox Id: 3
+    APLocationId: 319
 
 - Name: Gerudo Desert North Small Chest Before Bulblin Camp
   Original Item: Arrows 10
@@ -4536,6 +4924,7 @@
     Chest:
       - Stage: 59
         Tbox Id: 13
+    APLocationId: 317
 
 - Name: Gerudo Desert Golden Wolf
   Original Item: Progressive Hidden Skill
@@ -4545,6 +4934,7 @@
   Metadata:
     Golden Wolf:
       - Flag: 0x3C01
+    APLocationId: 313
 
 - Name: Outside Bulblin Camp Poe
   Original Item: Poe Soul
@@ -4556,6 +4946,7 @@
     Poe:
       - Stage: 59
         Flag: 0x33
+    APLocationId: 332
 
 - Name: Bulblin Camp First Chest Under Tower At Entrance
   Original Item: Arrows 20
@@ -4567,6 +4958,7 @@
     Chest:
       - Stage: 55
         Tbox Id: 31
+    APLocationId: 298
 
 # In vanilla this chest shares a flag with the other small chest
 # in the area. So we change this one to use a different flag
@@ -4580,6 +4972,7 @@
     Chest:
       - Stage: 55
         Tbox Id: 30
+    APLocationId: 301
 
 - Name: Bulblin Camp Roasted Boar
   Original Item: Piece of Heart
@@ -4591,6 +4984,7 @@
     Freestanding Item:
       - Stage: 55
         Flag: 0x9F
+    APLocationId: 300
 
 - Name: Bulblin Guard Key
   Original Item: Gerudo Desert Bulblin Camp Key
@@ -4603,6 +4997,7 @@
     Freestanding Item:
       - Stage: 55
         Flag: 0x9A
+    APLocationId: 302
 
 - Name: Bulblin Camp Poe
   Original Item: Poe Soul
@@ -4614,6 +5009,7 @@
     Poe:
       - Stage: 55
         Flag: 0x78
+    APLocationId: 299
 
 - Name: Outside Arbiters Grounds Lantern Chest
   Original Item: Purple Rupee
@@ -4625,6 +5021,7 @@
     Chest:
       - Stage: 55
         Tbox Id: 15
+    APLocationId: 330
 
 - Name: Outside Arbiters Grounds Poe
   Original Item: Poe Soul
@@ -4636,6 +5033,7 @@
     Poe:
       - Stage: 55
         Flag: 0x5A
+    APLocationId: 331
 
 # HD Only Location
 # - Name: Cave of Ordeals Floor 10 Chest
@@ -4682,6 +5080,7 @@
     Poe:
       - Stage: 31
         Flag: 0x45
+    APLocationId: 303
 
 - Name: Cave of Ordeals Floor 33 Poe
   Original Item: Poe Soul
@@ -4693,6 +5092,7 @@
     Poe:
       - Stage: 31
         Flag: 0x46
+    APLocationId: 304
 
 - Name: Cave of Ordeals Floor 44 Poe
   Original Item: Poe Soul
@@ -4704,6 +5104,7 @@
     Poe:
       - Stage: 31
         Flag: 0x47
+    APLocationId: 305
 
 - Name: Cave of Ordeals Great Fairy Reward
   Original Item: Fairy Tears
@@ -4715,7 +5116,8 @@
   Metadata:
     Name Lookup:
       - Cave of Ordeals Great Fairy Reward
-    Event Flag: 0x3E40      
+    Event Flag: 0x3E40
+    APLocationId: 306
 
 - Name: Mirror Chamber Warp Portal
   Original Item: Mirror Chamber Portal
@@ -4738,6 +5140,7 @@
     Chest:
       - Stage: 6
         Tbox Id: 7
+    APLocationId: 62
 
 - Name: Forest Temple Central Chest Hanging From Web
   Original Item: Forest Temple Compass
@@ -4751,6 +5154,7 @@
     Chest:
       - Stage: 6
         Tbox Id: 20
+    APLocationId: 56
 
 - Name: Forest Temple Central Chest Behind Stairs
   Original Item: Red Rupee
@@ -4762,6 +5166,7 @@
     Chest:
       - Stage: 6
         Tbox Id: 37
+    APLocationId: 55
 
 - Name: Forest Temple Central North Chest
   Original Item: Forest Temple Dungeon Map
@@ -4775,6 +5180,7 @@
     Chest:
       - Stage: 6
         Tbox Id: 39
+    APLocationId: 57
 
 - Name: Forest Temple West Deku Like Chest
   Original Item: Piece of Heart
@@ -4786,6 +5192,7 @@
     Chest:
       - Stage: 6
         Tbox Id: 31
+    APLocationId: 67
 
 - Name: Forest Temple Big Baba Key
   Original Item: Forest Temple Small Key
@@ -4798,6 +5205,7 @@
     Freestanding Item:
       - Stage: 6
         Flag: 0x6 # Technically a tbox id
+    APLocationId: 53
 
 - Name: Forest Temple Totem Pole Chest
   Original Item: Forest Temple Small Key
@@ -4810,6 +5218,7 @@
     Chest:
       - Stage: 6
         Tbox Id: 25
+    APLocationId: 66
 
 - Name: Forest Temple West Tile Worm Chest Behind Stairs
   Original Item: Piece of Heart
@@ -4821,6 +5230,7 @@
     Chest:
       - Stage: 6
         Tbox Id: 19
+    APLocationId: 68
 
 - Name: Forest Temple West Tile Worm Room Vines Chest
   Original Item: Red Rupee
@@ -4832,6 +5242,7 @@
     Chest:
       - Stage: 6
         Tbox Id: 24
+    APLocationId: 69
 
 - Name: Forest Temple Gale Boomerang
   Original Item: Gale Boomerang
@@ -4845,6 +5256,7 @@
     Item Flag:
       Stage: 8
       Flag: 0x9D
+    APLocationId: 63
 
 - Name: Forest Temple Big Key Chest
   Original Item: Forest Temple Big Key
@@ -4857,6 +5269,7 @@
     Chest:
       - Stage: 6
         Tbox Id: 38
+    APLocationId: 54
 
 - Name: Forest Temple East Water Cave Chest
   Original Item: Yellow Rupee
@@ -4869,6 +5282,7 @@
     Chest:
       - Stage: 6
         Tbox Id: 26
+    APLocationId: 61
 
 - Name: Forest Temple Second Monkey Under Bridge Chest
   Original Item: Yellow Rupee
@@ -4880,6 +5294,7 @@
     Chest:
       - Stage: 6
         Tbox Id: 9
+    APLocationId: 65
 
 - Name: Forest Temple Windless Bridge Chest
   Original Item: Forest Temple Small Key
@@ -4892,6 +5307,7 @@
     Chest:
       - Stage: 6
         Tbox Id: 4
+    APLocationId: 70
 
 - Name: Forest Temple East Tile Worm Chest
   Original Item: Red Rupee
@@ -4904,6 +5320,7 @@
     Chest:
       - Stage: 6
         Tbox Id: 1
+    APLocationId: 60
 
 - Name: Forest Temple North Deku Like Chest
   Original Item: Forest Temple Small Key
@@ -4916,6 +5333,7 @@
     Chest:
       - Stage: 6
         Tbox Id: 2
+    APLocationId: 64
 
 - Name: Forest Temple Diababa Heart Container
   Original Item: Heart Container
@@ -4928,6 +5346,7 @@
     Freestanding Item:
       - Stage: 7
         Flag: 0x9F
+    APLocationId: 58
 
 - Name: Forest Temple Dungeon Reward
   Original Item: Progressive Fused Shadow
@@ -4945,6 +5364,7 @@
     Item Flag:
       Stage: 7
       Flag: 0x9E
+    APLocationId: 59
 
 # GORON MINES
 
@@ -4958,6 +5378,7 @@
     Chest:
       - Stage: 3
         Tbox Id: 27
+    APLocationId: 78
 
 - Name: Goron Mines Main Magnet Room Bottom Chest
   Original Item: Goron Mines Small Key
@@ -4970,6 +5391,7 @@
     Chest:
       - Stage: 3
         Tbox Id: 11
+    APLocationId: 88
 
 - Name: Goron Mines Gor Amato Key Shard
   Original Item: Goron Mines Key Shard
@@ -4984,6 +5406,7 @@
     Name Lookup:
       - Goron Mines Gor Amato Key Shard
     Event Flag: 0x3008 # late
+    APLocationId: 81
 
 - Name: Goron Mines Gor Amato Chest
   Original Item: Goron Mines Dungeon Map
@@ -4997,6 +5420,7 @@
     Chest:
       - Stage: 3
         Tbox Id: 17
+    APLocationId: 80
 
 - Name: Goron Mines Gor Amato Small Chest
   Original Item: Red Rupee
@@ -5008,6 +5432,7 @@
     Chest:
       - Stage: 3
         Tbox Id: 24
+    APLocationId: 82
 
 - Name: Goron Mines Magnet Maze Chest
   Original Item: Piece of Heart
@@ -5019,6 +5444,7 @@
     Chest:
       - Stage: 3
         Tbox Id: 20
+    APLocationId: 87
 
 - Name: Goron Mines Crystal Switch Room Underwater Chest
   Original Item: Goron Mines Small Key
@@ -5031,6 +5457,7 @@
     Chest:
       - Stage: 3
         Tbox Id: 16
+    APLocationId: 75
 
 - Name: Goron Mines Crystal Switch Room Small Chest
   Original Item: Red Rupee
@@ -5042,6 +5469,7 @@
     Chest:
       - Stage: 3
         Tbox Id: 28
+    APLocationId: 74
 
 - Name: Goron Mines After Crystal Switch Room Magnet Wall Chest
   Original Item: Piece of Heart
@@ -5053,6 +5481,7 @@
     Chest:
       - Stage: 3
         Tbox Id: 9
+    APLocationId: 71
 
 - Name: Goron Mines Outside Beamos Chest
   Original Item: Goron Mines Small Key
@@ -5065,6 +5494,7 @@
     Chest:
       - Stage: 3
         Tbox Id: 15
+    APLocationId: 90
 
 - Name: Goron Mines Outside Underwater Chest
   Original Item: Purple Rupee
@@ -5077,6 +5507,7 @@
     Chest:
       - Stage: 3
         Tbox Id: 21
+    APLocationId: 92
 
 - Name: Goron Mines Outside Clawshot Chest
   Original Item: Purple Rupee
@@ -5089,6 +5520,7 @@
     Chest:
       - Stage: 3
         Tbox Id: 14
+    APLocationId: 91
 
 - Name: Goron Mines Gor Ebizo Key Shard
   Original Item: Goron Mines Key Shard
@@ -5103,6 +5535,7 @@
     Name Lookup:
       - Goron Mines Gor Ebizo Key Shard
     Event Flag: 0x3702 # late
+    APLocationId: 84
 
 - Name: Goron Mines Gor Ebizo Chest
   Original Item: Yellow Rupee
@@ -5114,6 +5547,7 @@
     Chest:
       - Stage: 3
         Tbox Id: 25
+    APLocationId: 83
 
 - Name: Goron Mines Chest Before Dangoro
   Original Item: Yellow Rupee
@@ -5125,6 +5559,7 @@
     Chest:
       - Stage: 3
         Tbox Id: 13
+    APLocationId: 73
 
 - Name: Goron Mines Dangoro Chest
   Original Item: Progressive Bow
@@ -5136,6 +5571,7 @@
     Chest:
       - Stage: 3
         Tbox Id: 6
+    APLocationId: 76
 
 - Name: Goron Mines Beamos Room Chest
   Original Item: Goron Mines Compass
@@ -5149,6 +5585,7 @@
     Chest:
       - Stage: 3
         Tbox Id: 12
+    APLocationId: 72
 
 - Name: Goron Mines Gor Liggs Key Shard
   Original Item: Goron Mines Key Shard
@@ -5163,6 +5600,7 @@
     Name Lookup:
       - Goron Mines Gor Liggs Key Shard
     Event Flag: 0x3701 # late
+    APLocationId: 86
 
 - Name: Goron Mines Gor Liggs Chest
   Original Item: Purple Rupee
@@ -5174,6 +5612,7 @@
     Chest:
       - Stage: 3
         Tbox Id: 26
+    APLocationId: 85
 
 - Name: Goron Mines Main Magnet Room Top Chest
   Original Item: Purple Rupee
@@ -5185,6 +5624,7 @@
     Chest:
       - Stage: 3
         Tbox Id: 30
+    APLocationId: 89
 
 - Name: Goron Mines Fyrus Heart Container
   Original Item: Heart Container
@@ -5197,6 +5637,7 @@
     Freestanding Item:
       - Stage: 4
         Flag: 0x9F
+    APLocationId: 79
 
 - Name: Goron Mines Dungeon Reward
   Original Item: Progressive Fused Shadow
@@ -5212,6 +5653,7 @@
       - Group: 5
         Message Id: 6011
     Event Flag: 0x0701
+    APLocationId: 77
 
 # LAKEBED TEMPLE
 
@@ -5225,6 +5667,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 28
+    APLocationId: 137
 
 - Name: Lakebed Temple Lobby Rear Chest
   Original Item: Water Bombs 10
@@ -5236,6 +5679,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 29
+    APLocationId: 138
 
 - Name: Lakebed Temple Stalactite Room Chest
   Original Item: Water Bombs 10
@@ -5247,6 +5691,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 3
+    APLocationId: 140
 
 - Name: Lakebed Temple Chandelier Chest
   Original Item: Piece of Heart
@@ -5258,6 +5703,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 5
+    APLocationId: 128
 
 - Name: Lakebed Temple Central Room Spire Chest
   Original Item: Red Rupee
@@ -5270,6 +5716,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 16
+    APLocationId: 127
 
 - Name: Lakebed Temple Central Room Chest
   Original Item: Lakebed Temple Dungeon Map
@@ -5283,6 +5730,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 17
+    APLocationId: 125
 
 - Name: Lakebed Temple Central Room Small Chest
   Original Item: Arrows 20
@@ -5294,6 +5742,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 1
+    APLocationId: 126
 
 - Name: Lakebed Temple East Lower Waterwheel Stalactite Chest
   Original Item: Lakebed Temple Small Key
@@ -5306,6 +5755,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 6
+    APLocationId: 132
 
 - Name: Lakebed Temple East Lower Waterwheel Bridge Chest
   Original Item: Piece of Heart
@@ -5317,6 +5767,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 8
+    APLocationId: 131
 
 - Name: Lakebed Temple East Second Floor Southeast Chest
   Original Item: Lakebed Temple Small Key
@@ -5329,6 +5780,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 10
+    APLocationId: 133
 
 - Name: Lakebed Temple East Second Floor Southwest Chest
   Original Item: Water Bombs 5
@@ -5340,6 +5792,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 24
+    APLocationId: 134
 
 - Name: Lakebed Temple East Water Supply Small Chest
   Original Item: Water Bombs 10
@@ -5351,6 +5804,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 27
+    APLocationId: 136
 
 - Name: Lakebed Temple East Water Supply Clawshot Chest
   Original Item: Purple Rupee
@@ -5363,6 +5817,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 11
+    APLocationId: 135
 
 - Name: Lakebed Temple Before Deku Toad Alcove Chest
   Original Item: Lakebed Temple Small Key
@@ -5375,6 +5830,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 2
+    APLocationId: 121
 
 - Name: Lakebed Temple Before Deku Toad Underwater Left Chest
   Original Item: Red Rupee
@@ -5386,6 +5842,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 15
+    APLocationId: 122
 
 - Name: Lakebed Temple Before Deku Toad Underwater Right Chest
   Original Item: Water Bombs 5
@@ -5397,6 +5854,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 14
+    APLocationId: 123
 
 - Name: Lakebed Temple Deku Toad Chest
   Original Item: Progressive Clawshot
@@ -5408,6 +5866,7 @@
     Chest:
       - Stage: 2
         Tbox Id: 0
+    APLocationId: 129
 
 - Name: Lakebed Temple West Lower Small Chest
   Original Item: Water Bombs 10
@@ -5419,6 +5878,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 30
+    APLocationId: 142
 
 - Name: Lakebed Temple West Second Floor Central Small Chest
   Original Item: Red Rupee
@@ -5430,6 +5890,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 19
+    APLocationId: 143
 
 - Name: Lakebed Temple West Second Floor Northeast Chest
   Original Item: Water Bombs 15
@@ -5441,6 +5902,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 13
+    APLocationId: 144
 
 - Name: Lakebed Temple West Second Floor Southeast Chest
   Original Item: Red Rupee
@@ -5452,6 +5914,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 7
+    APLocationId: 145
 
 - Name: Lakebed Temple West Second Floor Southwest Underwater Chest
   Original Item: Red Rupee
@@ -5463,6 +5926,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 25
+    APLocationId: 146
 
 - Name: Lakebed Temple West Water Supply Small Chest
   Original Item: Water Bombs 10
@@ -5474,6 +5938,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 21
+    APLocationId: 148
 
 - Name: Lakebed Temple West Water Supply Chest
   Original Item: Lakebed Temple Compass
@@ -5487,6 +5952,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 20
+    APLocationId: 147
 
 - Name: Lakebed Temple Underwater Maze Small Chest
   Original Item: Water Bombs 5
@@ -5498,6 +5964,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 18
+    APLocationId: 141
 
 - Name: Lakebed Temple Big Key Chest
   Original Item: Lakebed Temple Big Key
@@ -5510,6 +5977,7 @@
     Chest:
       - Stage: 0
         Tbox Id: 12
+    APLocationId: 124
 
 - Name: Lakebed Temple Morpheel Heart Container
   Original Item: Heart Container
@@ -5522,6 +5990,7 @@
     Freestanding Item:
       - Stage: 1
         Flag: 0x9F
+    APLocationId: 139
 
 - Name: Lakebed Temple Dungeon Reward
   Original Item: Progressive Fused Shadow
@@ -5537,6 +6006,7 @@
       - Group: 5
         Message Id: 7001
     Event Flag: 0x0904 # late
+    APLocationId: 130
 
 # ARBITERS GROUNDS
 
@@ -5550,6 +6020,7 @@
     Chest:
       - Stage: 24
         Tbox Id: 23
+    APLocationId: 7
 
 - Name: Arbiters Grounds Torch Room Poe
   Original Item: Poe Soul
@@ -5561,6 +6032,7 @@
     Poe:
       - Stage: 24
         Flag: 0x1E
+    APLocationId: 18
 
 - Name: Arbiters Grounds Torch Room East Chest
   Original Item: Piece of Heart
@@ -5571,6 +6043,7 @@
     Chest:
       - Stage: 24
         Tbox Id: 19
+    APLocationId: 17
 
 - Name: Arbiters Grounds Torch Room West Chest
   Original Item: Arbiters Grounds Dungeon Map
@@ -5583,6 +6056,7 @@
     Chest:
       - Stage: 24
         Tbox Id: 18
+    APLocationId: 19
 
 - Name: Arbiters Grounds West Small Chest Behind Block
   Original Item: Red Rupee
@@ -5593,6 +6067,7 @@
     Chest:
       - Stage: 24
         Tbox Id: 25
+    APLocationId: 22
 
 - Name: Arbiters Grounds East Lower Turnable Redead Chest
   Original Item: Arbiters Grounds Small Key
@@ -5604,6 +6079,7 @@
     Chest:
       - Stage: 24
         Tbox Id: 6
+    APLocationId: 3
 
 - Name: Arbiters Grounds East Turning Room Poe
   Original Item: Poe Soul
@@ -5615,6 +6091,7 @@
     Poe:
       - Stage: 24
         Flag: 0x1F
+    APLocationId: 4
 
 - Name: Arbiters Grounds East Upper Turnable Chest
   Original Item: Arbiters Grounds Compass
@@ -5627,6 +6104,7 @@
     Chest:
       - Stage: 24
         Tbox Id: 4
+    APLocationId: 5
 
 - Name: Arbiters Grounds East Upper Turnable Redead Chest
   Original Item: Arbiters Grounds Small Key
@@ -5638,6 +6116,7 @@
     Chest:
       - Stage: 24
         Tbox Id: 5
+    APLocationId: 6
 
 - Name: Arbiters Grounds Hidden Wall Poe
   Original Item: Poe Soul
@@ -5649,6 +6128,7 @@
     Poe:
       - Stage: 24
         Flag: 0x20
+    APLocationId: 9
 
 - Name: Arbiters Grounds Ghoul Rat Room Chest
   Original Item: Arbiters Grounds Small Key
@@ -5660,6 +6140,7 @@
     Chest:
       - Stage: 24
         Tbox Id: 21
+    APLocationId: 8
 
 - Name: Arbiters Grounds West Chandelier Chest
   Original Item: Red Rupee
@@ -5671,6 +6152,7 @@
     Chest:
       - Stage: 24
         Tbox Id: 3
+    APLocationId: 20
 
 - Name: Arbiters Grounds West Stalfos Northeast Chest
   Original Item: Bombs 5
@@ -5681,6 +6163,7 @@
     Chest:
       - Stage: 24
         Tbox Id: 16
+    APLocationId: 23
 
 - Name: Arbiters Grounds West Stalfos West Chest
   Original Item: Bombs 5
@@ -5691,6 +6174,7 @@
     Chest:
       - Stage: 24
         Tbox Id: 17
+    APLocationId: 24
 
 - Name: Arbiters Grounds West Poe
   Original Item: Poe Soul
@@ -5702,6 +6186,7 @@
     Poe:
       - Stage: 24
         Flag: 0x21
+    APLocationId: 21
 
 - Name: Arbiters Grounds North Turning Room Chest
   Original Item: Arbiters Grounds Small Key
@@ -5713,6 +6198,7 @@
     Chest:
       - Stage: 24
         Tbox Id: 24
+    APLocationId: 10
 
 - Name: Arbiters Grounds Death Sword Chest
   Original Item: Spinner
@@ -5723,6 +6209,7 @@
     Chest:
       - Stage: 26
         Tbox Id: 11
+    APLocationId: 1
 
 - Name: Arbiters Grounds Spinner Room First Small Chest
   Original Item: Bombs 10
@@ -5733,6 +6220,7 @@
     Chest:
       - Stage: 24
         Tbox Id: 28
+    APLocationId: 11
 
 - Name: Arbiters Grounds Spinner Room Second Small Chest
   Original Item: Red Rupee
@@ -5743,6 +6231,7 @@
     Chest:
       - Stage: 24
         Tbox Id: 27
+    APLocationId: 14
 
 - Name: Arbiters Grounds Spinner Room Lower Central Small Chest
   Original Item: Yellow Rupee
@@ -5753,6 +6242,7 @@
     Chest:
       - Stage: 24
         Tbox Id: 29
+    APLocationId: 12
 
 - Name: Arbiters Grounds Spinner Room Stalfos Alcove Chest
   Original Item: Piece of Heart
@@ -5763,6 +6253,7 @@
     Chest:
       - Stage: 24
         Tbox Id: 26
+    APLocationId: 15
 
 - Name: Arbiters Grounds Spinner Room Lower North Chest
   Original Item: Yellow Rupee
@@ -5774,6 +6265,7 @@
     Chest:
       - Stage: 24
         Tbox Id: 30
+    APLocationId: 13
 
 - Name: Arbiters Grounds Big Key Chest
   Original Item: Arbiters Grounds Big Key
@@ -5785,6 +6277,7 @@
     Chest:
       - Stage: 24
         Tbox Id: 20
+    APLocationId: 0
 
 - Name: Arbiters Grounds Stallord Heart Container
   Original Item: Heart Container
@@ -5797,6 +6290,7 @@
     Freestanding Item:
       - Stage: 25
         Flag: 0x9F
+    APLocationId: 16
 
 - Name: Arbiters Grounds Dungeon Reward
   Original Item: Progressive Mirror Shard
@@ -5811,6 +6305,7 @@
     Item Flag:
       Stage: 25
       Flag: 0x9E
+    APLocationId: 2
 
 # SNOWPEAK RUINS
 
@@ -5825,6 +6320,7 @@
     Chest:
       - Stage: 27
         Tbox Id: 23
+    APLocationId: 182
 
 - Name: Snowpeak Ruins Lobby East Armor Chest
   Original Item: Yellow Rupee
@@ -5836,6 +6332,7 @@
     Chest:
       - Stage: 27
         Tbox Id: 22
+    APLocationId: 180
 
 - Name: Snowpeak Ruins Lobby Armor Poe
   Original Item: Poe Soul
@@ -5847,6 +6344,7 @@
     Poe:
       - Stage: 27
         Flag: 0x15
+    APLocationId: 178
 
 - Name: Snowpeak Ruins Lobby Poe
   Original Item: Poe Soul
@@ -5858,6 +6356,7 @@
     Poe:
       - Stage: 27
         Flag: 0x72
+    APLocationId: 181
 
 - Name: Snowpeak Ruins Lobby Chandelier Chest
   Original Item: Piece of Heart
@@ -5869,6 +6368,7 @@
     Chest:
       - Stage: 27
         Tbox Id: 21
+    APLocationId: 179
 
 - Name: Snowpeak Ruins Mansion Map
   Original Item: Snowpeak Ruins Dungeon Map
@@ -5883,6 +6383,7 @@
     Name Lookup:
       - Snowpeak Ruins Mansion Map
     Event Flag: 0x0B10 # late
+    APLocationId: 183
 
 - Name: Snowpeak Ruins East Courtyard Chest
   Original Item: Snowpeak Ruins Small Key
@@ -5895,6 +6396,7 @@
     Chest:
       - Stage: 27
         Tbox Id: 15
+    APLocationId: 176
 
 - Name: Snowpeak Ruins East Courtyard Buried Chest
   Original Item: Red Rupee
@@ -5906,6 +6408,7 @@
     Chest:
       - Stage: 27
         Tbox Id: 14
+    APLocationId: 175
 
 - Name: Snowpeak Ruins Ordon Pumpkin Chest
   Original Item: Ordon Pumpkin
@@ -5920,6 +6423,7 @@
     Chest:
       - Stage: 27
         Tbox Id: 10
+    APLocationId: 185
 
 - Name: Snowpeak Ruins Courtyard Central Chest
   Original Item: Bombs 5
@@ -5931,6 +6435,7 @@
     Chest:
       - Stage: 27
         Tbox Id: 3
+    APLocationId: 173
 
 - Name: Snowpeak Ruins West Courtyard Buried Chest
   Original Item: Snowpeak Ruins Small Key
@@ -5943,6 +6448,7 @@
     Chest:
       - Stage: 27
         Tbox Id: 13
+    APLocationId: 188
 
 - Name: Snowpeak Ruins West Cannon Room Central Chest
   Original Item: Red Rupee
@@ -5954,6 +6460,7 @@
     Chest:
       - Stage: 27
         Tbox Id: 20
+    APLocationId: 186
 
 - Name: Snowpeak Ruins West Cannon Room Corner Chest
   Original Item: Bombs 5
@@ -5965,6 +6472,7 @@
     Chest:
       - Stage: 27
         Tbox Id: 19
+    APLocationId: 187
 
 - Name: Snowpeak Ruins Wooden Beam Central Chest
   Original Item: Red Rupee
@@ -5977,6 +6485,7 @@
     Chest:
       - Stage: 27
         Tbox Id: 1
+    APLocationId: 189
 
 - Name: Snowpeak Ruins Wooden Beam Chandelier Chest
   Original Item: Snowpeak Ruins Small Key
@@ -5989,6 +6498,7 @@
     Chest:
       - Stage: 27
         Tbox Id: 7
+    APLocationId: 190
 
 - Name: Snowpeak Ruins Wooden Beam Northwest Chest
   Original Item: Snowpeak Ruins Compass
@@ -6002,6 +6512,7 @@
     Chest:
       - Stage: 27
         Tbox Id: 2
+    APLocationId: 191
 
 - Name: Snowpeak Ruins Ball and Chain
   Original Item: Ball and Chain
@@ -6015,6 +6526,7 @@
     Switch Flag:
       Stage: 29
       Flag: 0x5F
+    APLocationId: 168
 
 - Name: Snowpeak Ruins Chest After Darkhammer
   Original Item: Ordon Cheese
@@ -6027,6 +6539,7 @@
     Chest:
       - Stage: 29
         Tbox Id: 6
+    APLocationId: 172
 
 - Name: Snowpeak Ruins Broken Floor Chest
   Original Item: Piece of Heart
@@ -6038,6 +6551,7 @@
     Chest:
       - Stage: 27
         Tbox Id: 25
+    APLocationId: 170
 
 - Name: Snowpeak Ruins Ice Room Poe
   Original Item: Poe Soul
@@ -6049,6 +6563,7 @@
     Poe:
       - Stage: 27
         Flag: 0x7F
+    APLocationId: 177
 
 - Name: Snowpeak Ruins Northeast Chandelier Chest
   Original Item: Snowpeak Ruins Small Key
@@ -6061,6 +6576,7 @@
     Chest:
       - Stage: 27
         Tbox Id: 18
+    APLocationId: 184
 
 - Name: Snowpeak Ruins Chapel Chest
   Original Item: Snowpeak Ruins Bedroom Key
@@ -6073,6 +6589,7 @@
     Chest:
       - Stage: 27
         Tbox Id: 11
+    APLocationId: 171
 
 - Name: Snowpeak Ruins Blizzeta Heart Container
   Original Item: Heart Container
@@ -6085,6 +6602,7 @@
     Freestanding Item:
       - Stage: 28
         Flag: 0x9F
+    APLocationId: 169
 
 - Name: Snowpeak Ruins Dungeon Reward
   Original Item: Progressive Mirror Shard
@@ -6100,6 +6618,7 @@
       - Group: 5
         Message Id: 9301
     Event Flag: 0x2008
+    APLocationId: 174
 
 - Name: Temple of Time Lobby Lantern Chest
   Original Item: Temple of Time Small Key
@@ -6112,6 +6631,7 @@
     Chest:
       - Stage: 9
         Tbox Id: 41
+    APLocationId: 205
 
 - Name: Temple of Time First Staircase Gohma Gate Chest
   Original Item: Arrows 30
@@ -6123,6 +6643,7 @@
     Chest:
       - Stage: 9
         Tbox Id: 2
+    APLocationId: 201
 
 - Name: Temple of Time First Staircase Window Chest
   Original Item: Red Rupee
@@ -6134,6 +6655,7 @@
     Chest:
       - Stage: 9
         Tbox Id: 45
+    APLocationId: 202
 
 - Name: Temple of Time First Staircase Armos Chest
   Original Item: Temple of Time Dungeon Map
@@ -6147,6 +6669,7 @@
     Chest:
       - Stage: 9
         Tbox Id: 1
+    APLocationId: 200
 
 - Name: Temple of Time Poe Behind Gate
   Original Item: Poe Soul
@@ -6158,6 +6681,7 @@
     Poe:
       - Stage: 9
         Flag: 0x19
+    APLocationId: 209
 
 - Name: Temple of Time Armos Antechamber East Chest
   Original Item: Temple of Time Small Key
@@ -6170,6 +6694,7 @@
     Chest:
       - Stage: 9
         Tbox Id: 4
+    APLocationId: 193
 
 - Name: Temple of Time Armos Antechamber North Chest
   Original Item: Red Rupee
@@ -6182,6 +6707,7 @@
     Chest:
       - Stage: 9
         Tbox Id: 46
+    APLocationId: 194
 
 - Name: Temple of Time Armos Antechamber Statue Chest
   Original Item: Piece of Heart
@@ -6193,6 +6719,7 @@
     Chest:
       - Stage: 9
         Tbox Id: 5
+    APLocationId: 195
 
 - Name: Temple of Time Moving Wall Beamos Room Chest
   Original Item: Temple of Time Compass
@@ -6206,6 +6733,7 @@
     Chest:
       - Stage: 9
         Tbox Id: 6
+    APLocationId: 206
 
 - Name: Temple of Time Moving Wall Dinalfos Room Chest
   Original Item: Piece of Heart
@@ -6217,6 +6745,7 @@
     Chest:
       - Stage: 9
         Tbox Id: 12
+    APLocationId: 207
 
 - Name: Temple of Time Scales Gohma Chest
   Original Item: Purple Rupee
@@ -6228,6 +6757,7 @@
     Chest:
       - Stage: 9
         Tbox Id: 44
+    APLocationId: 210
 
 - Name: Temple of Time Scales Upper Chest
   Original Item: Red Rupee
@@ -6240,6 +6770,7 @@
     Chest:
       - Stage: 9
         Tbox Id: 47
+    APLocationId: 211
 
 - Name: Temple of Time Poe Above Scales
   Original Item: Poe Soul
@@ -6251,6 +6782,7 @@
     Poe:
       - Stage: 9
         Flag: 0x18
+    APLocationId: 208
 
 - Name: Temple of Time Floor Switch Puzzle Room Upper Chest
   Original Item: Red Rupee
@@ -6262,6 +6794,7 @@
     Chest:
       - Stage: 9
         Tbox Id: 48
+    APLocationId: 203
 
 - Name: Temple of Time Big Key Chest
   Original Item: Temple of Time Big Key
@@ -6274,6 +6807,7 @@
     Chest:
       - Stage: 9
         Tbox Id: 8
+    APLocationId: 196
 
 - Name: Temple of Time Gilloutine Chest
   Original Item: Temple of Time Small Key
@@ -6286,6 +6820,7 @@
     Chest:
       - Stage: 9
         Tbox Id: 9
+    APLocationId: 204
 
 - Name: Temple of Time Chest Before Darknut
   Original Item: Purple Rupee
@@ -6297,6 +6832,7 @@
     Chest:
       - Stage: 9
         Tbox Id: 43
+    APLocationId: 197
 
 - Name: Temple of Time Darknut Chest
   Original Item: Progressive Dominion Rod
@@ -6308,6 +6844,7 @@
     Chest:
       - Stage: 11
         Tbox Id: 0
+    APLocationId: 198
 
 - Name: Temple of Time Armogohma Heart Container
   Original Item: Heart Container
@@ -6320,6 +6857,7 @@
     Freestanding Item:
       - Stage: 10
         Flag: 0x9F
+    APLocationId: 192
 
 - Name: Temple of Time Dungeon Reward
   Original Item: Progressive Mirror Shard
@@ -6337,6 +6875,7 @@
     Item Flag:
       Stage: 10
       Flag: 0x9E
+    APLocationId: 199
 
 # CITY IN THE SKY
 
@@ -6350,6 +6889,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 27
+    APLocationId: 43
 
 - Name: City in the Sky Underwater West Chest
   Original Item: Water Bombs 15
@@ -6361,6 +6901,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 3
+    APLocationId: 44
 
 - Name: City in the Sky West Wing First Chest
   Original Item: City in the Sky Small Key
@@ -6373,6 +6914,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 5
+    APLocationId: 50
 
 - Name: City in the Sky West Wing Baba Balcony Chest
   Original Item: Arrows 20
@@ -6384,6 +6926,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 21
+    APLocationId: 49
 
 - Name: City in the Sky West Wing Narrow Ledge Chest
   Original Item: Red Rupee
@@ -6396,6 +6939,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 22
+    APLocationId: 51
 
 - Name: City in the Sky West Wing Tile Worm Chest
   Original Item: Bombs 10
@@ -6407,6 +6951,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 20
+    APLocationId: 52
 
 - Name: City in the Sky Baba Tower Top Small Chest
   Original Item: Yellow Rupee
@@ -6418,6 +6963,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 7
+    APLocationId: 29
 
 - Name: City in the Sky Baba Tower Narrow Ledge Chest
   Original Item: Arrows 20
@@ -6429,6 +6975,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 23
+    APLocationId: 28
 
 - Name: City in the Sky Baba Tower Alcove Chest
   Original Item: Piece of Heart
@@ -6440,6 +6987,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 6
+    APLocationId: 27
 
 - Name: City in the Sky West Garden Corner Chest
   Original Item: Red Rupee
@@ -6451,6 +6999,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 15
+    APLocationId: 45
 
 - Name: City in the Sky West Garden Lone Island Chest
   Original Item: Purple Rupee
@@ -6463,6 +7012,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 25
+    APLocationId: 47
 
 - Name: City in the Sky Garden Island Poe
   Original Item: Poe Soul
@@ -6474,6 +7024,7 @@
     Poe:
       - Stage: 12
         Flag: 0x54
+    APLocationId: 41
 
 - Name: City in the Sky West Garden Lower Chest
   Original Item: Bombs 5
@@ -6485,6 +7036,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 11
+    APLocationId: 48
 
 - Name: City in the Sky West Garden Ledge Chest
   Original Item: Piece of Heart
@@ -6496,6 +7048,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 9
+    APLocationId: 46
 
 - Name: City in the Sky Central Outside Ledge Chest
   Original Item: Red Rupee
@@ -6507,6 +7060,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 24
+    APLocationId: 31
 
 - Name: City in the Sky Central Outside Poe Island Chest
   Original Item: Purple Rupee
@@ -6519,6 +7073,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 12
+    APLocationId: 32
 
 - Name: City in the Sky Poe Above Central Fan
   Original Item: Poe Soul
@@ -6530,6 +7085,7 @@
     Poe:
       - Stage: 12
         Flag: 0x55
+    APLocationId: 42
 
 - Name: City in the Sky Big Key Chest
   Original Item: City in the Sky Big Key
@@ -6542,6 +7098,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 13
+    APLocationId: 30
 
 - Name: City in the Sky Chest Below Big Key Chest
   Original Item: Red Rupee
@@ -6553,6 +7110,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 14
+    APLocationId: 34
 
 - Name: City in the Sky East First Wing Chest After Fans
   Original Item: City in the Sky Dungeon Map
@@ -6566,6 +7124,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 2
+    APLocationId: 36
 
 - Name: City in the Sky East Tile Worm Small Chest
   Original Item: Yellow Rupee
@@ -6577,6 +7136,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 19
+    APLocationId: 37
 
 - Name: City in the Sky East Wing After Dinalfos Alcove Chest
   Original Item: Red Rupee
@@ -6588,6 +7148,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 18
+    APLocationId: 38
 
 - Name: City in the Sky East Wing After Dinalfos Ledge Chest
   Original Item: Purple Rupee
@@ -6599,6 +7160,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 26
+    APLocationId: 39
 
 - Name: City in the Sky East Wing Lower Level Chest
   Original Item: City in the Sky Compass
@@ -6612,6 +7174,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 4
+    APLocationId: 40
 
 - Name: City in the Sky Aeralfos Chest
   Original Item: Progressive Clawshot
@@ -6623,6 +7186,7 @@
     Chest:
       - Stage: 14
         Tbox Id: 0
+    APLocationId: 25
 
 - Name: City in the Sky Chest Behind North Fan
   Original Item: Purple Rupee
@@ -6634,6 +7198,7 @@
     Chest:
       - Stage: 12
         Tbox Id: 17
+    APLocationId: 33
 
 - Name: City in the Sky Argorok Heart Container
   Original Item: Heart Container
@@ -6646,6 +7211,7 @@
     Freestanding Item:
       - Stage: 13
         Flag: 0x9F
+    APLocationId: 26
 
 - Name: City in the Sky Dungeon Reward
   Original Item: Progressive Mirror Shard
@@ -6661,6 +7227,7 @@
       - Group: 5
         Message Id: 11001
     Event Flag: 0x2002
+    APLocationId: 35
 
 # PALACE OF TWILIGHT
 
@@ -6674,6 +7241,7 @@
     Chest:
       - Stage: 15
         Tbox Id: 4
+    APLocationId: 163
 
 - Name: Palace of Twilight West Wing Chest Behind Wall of Darkness
   Original Item: Piece of Heart
@@ -6684,6 +7252,7 @@
     Chest:
       - Stage: 15
         Tbox Id: 30
+    APLocationId: 162
 
 - Name: Palace of Twilight West Wing Second Room Central Chest
   Original Item: Palace of Twilight Small Key
@@ -6695,6 +7264,7 @@
     Chest:
       - Stage: 15
         Tbox Id: 5
+    APLocationId: 164
 
 - Name: Palace of Twilight West Wing Second Room Lower South Chest
   Original Item: Palace of Twilight Compass
@@ -6707,6 +7277,7 @@
     Chest:
       - Stage: 15
         Tbox Id: 3
+    APLocationId: 165
 
 - Name: Palace of Twilight West Wing Second Room Southeast Chest
   Original Item: Orange Rupee
@@ -6718,6 +7289,7 @@
     Chest:
       - Stage: 15
         Tbox Id: 25
+    APLocationId: 166
 
 - Name: Palace of Twilight East Wing First Room Zant Head Chest
   Original Item: Palace of Twilight Small Key
@@ -6729,6 +7301,7 @@
     Chest:
       - Stage: 15
         Tbox Id: 6
+    APLocationId: 157
 
 - Name: Palace of Twilight East Wing First Room East Alcove Chest
   Original Item: Piece of Heart
@@ -6739,6 +7312,7 @@
     Chest:
       - Stage: 15
         Tbox Id: 0
+    APLocationId: 154
 
 - Name: Palace of Twilight East Wing First Room North Small Chest
   Original Item: Purple Rupee
@@ -6749,6 +7323,7 @@
     Chest:
       - Stage: 15
         Tbox Id: 36
+    APLocationId: 155
 
 - Name: Palace of Twilight East Wing First Room West Alcove Chest
   Original Item: Purple Rupee
@@ -6759,6 +7334,7 @@
     Chest:
       - Stage: 15
         Tbox Id: 27
+    APLocationId: 156
 
 - Name: Palace of Twilight East Wing Second Room Northeast Chest
   Original Item: Purple Rupee
@@ -6769,6 +7345,7 @@
     Chest:
       - Stage: 15
         Tbox Id: 28
+    APLocationId: 158
 
 - Name: Palace of Twilight East Wing Second Room Northwest Chest
   Original Item: Purple Rupee
@@ -6780,6 +7357,7 @@
     Chest:
       - Stage: 15
         Tbox Id: 29
+    APLocationId: 159
 
 - Name: Palace of Twilight East Wing Second Room Southeast Chest
   Original Item: Palace of Twilight Small Key
@@ -6791,6 +7369,7 @@
     Chest:
       - Stage: 15
         Tbox Id: 7
+    APLocationId: 160
 
 - Name: Palace of Twilight East Wing Second Room Southwest Chest
   Original Item: Palace of Twilight Dungeon Map
@@ -6803,6 +7382,7 @@
     Chest:
       - Stage: 15
         Tbox Id: 33
+    APLocationId: 161
 
 - Name: Palace of Twilight Collect Both Sols
   Original Item: Progressive Sword
@@ -6814,6 +7394,7 @@
     Freestanding Item:
       - Stage: 15
         Flag: 0x81
+    APLocationId: 153
 
 - Name: Palace of Twilight Central First Room Chest
   Original Item: Palace of Twilight Small Key
@@ -6825,6 +7406,7 @@
     Chest:
       - Stage: 15
         Tbox Id: 22
+    APLocationId: 150
 
 - Name: Palace of Twilight Central Outdoor Chest
   Original Item: Palace of Twilight Small Key
@@ -6836,6 +7418,7 @@
     Chest:
       - Stage: 15
         Tbox Id: 24
+    APLocationId: 151
 
 - Name: Palace of Twilight Big Key Chest
   Original Item: Palace of Twilight Big Key
@@ -6847,6 +7430,7 @@
     Chest:
       - Stage: 15
         Tbox Id: 23
+    APLocationId: 149
 
 - Name: Palace of Twilight Central Tower Chest
   Original Item: Palace of Twilight Small Key
@@ -6858,6 +7442,7 @@
     Chest:
       - Stage: 15
         Tbox Id: 26
+    APLocationId: 152
 
 - Name: Palace of Twilight Zant Heart Container
   Original Item: Heart Container
@@ -6871,6 +7456,7 @@
     Freestanding Item:
       - Stage: 16
         Flag: 0x80
+    APLocationId: 167
 
 # HYRULE CASTLE
 
@@ -6884,6 +7470,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 5
+    APLocationId: 119
 
 - Name: Hyrule Castle West Courtyard North Small Chest
   Original Item: Red Rupee
@@ -6895,6 +7482,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 9
+    APLocationId: 120
 
 - Name: Hyrule Castle King Bulblin Key
   Original Item: Hyrule Castle Small Key
@@ -6911,6 +7499,7 @@
     Chest: 
       - Stage: 20
         Tbox Id: 0x3
+    APLocationId: 100
 
 - Name: Hyrule Castle East Wing Boomerang Puzzle Chest
   Original Item: Hyrule Castle Dungeon Map
@@ -6924,6 +7513,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 4
+    APLocationId: 95
 
 - Name: Hyrule Castle East Wing Balcony Chest
   Original Item: Yellow Rupee
@@ -6936,6 +7526,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 11
+    APLocationId: 94
 
 - Name: Hyrule Castle Graveyard Grave Switch Room Back Left Chest
   Original Item: Red Rupee
@@ -6947,6 +7538,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 34
+    APLocationId: 96
 
 - Name: Hyrule Castle Graveyard Grave Switch Room Front Left Chest
   Original Item: Green Rupee
@@ -6958,6 +7550,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 33
+    APLocationId: 97
 
 - Name: Hyrule Castle Graveyard Grave Switch Room Right Chest
   Original Item: Orange Rupee
@@ -6969,6 +7562,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 30
+    APLocationId: 98
 
 - Name: Hyrule Castle Graveyard Owl Statue Chest
   Original Item: Hyrule Castle Small Key
@@ -6981,6 +7575,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 7
+    APLocationId: 99
 
 - Name: Hyrule Castle Main Hall Northeast Chest
   Original Item: Hyrule Castle Compass
@@ -6994,6 +7589,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 8
+    APLocationId: 102
 
 - Name: Hyrule Castle Main Hall Northwest Chest
   Original Item: Silver Rupee
@@ -7005,6 +7601,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 13
+    APLocationId: 103
 
 - Name: Hyrule Castle Main Hall Southwest Chest
   Original Item: Purple Rupee
@@ -7016,6 +7613,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 2
+    APLocationId: 104
 
 - Name: Hyrule Castle Lantern Staircase Chest
   Original Item: Purple Rupee
@@ -7027,6 +7625,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 25
+    APLocationId: 101
 
 - Name: Hyrule Castle Southeast Balcony Tower Chest
   Original Item: Hyrule Castle Small Key
@@ -7039,6 +7638,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 1
+    APLocationId: 105
 
 - Name: Hyrule Castle Big Key Chest
   Original Item: Hyrule Castle Big Key
@@ -7051,6 +7651,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 0
+    APLocationId: 93
 
 - Name: Hyrule Castle Treasure Room First Chest
   Original Item: Orange Rupee
@@ -7062,6 +7663,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 15
+    APLocationId: 109
 
 - Name: Hyrule Castle Treasure Room Second Chest
   Original Item: Seeds 50
@@ -7074,6 +7676,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 16
+    APLocationId: 113
 
 - Name: Hyrule Castle Treasure Room Third Chest
   Original Item: Silver Rupee
@@ -7085,6 +7688,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 17
+    APLocationId: 117
 
 - Name: Hyrule Castle Treasure Room Fourth Chest
   Original Item: Bomblings 10
@@ -7096,6 +7700,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 18
+    APLocationId: 111
 
 - Name: Hyrule Castle Treasure Room Fifth Chest
   Original Item: Purple Rupee
@@ -7107,6 +7712,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 19
+    APLocationId: 107
 
 - Name: Hyrule Castle Treasure Room First Small Chest
   Original Item: Arrows 30
@@ -7118,6 +7724,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 35
+    APLocationId: 110
 
 - Name: Hyrule Castle Treasure Room Second Small Chest
   Original Item: Green Rupee
@@ -7129,6 +7736,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 29
+    APLocationId: 114
 
 - Name: Hyrule Castle Treasure Room Third Small Chest
   Original Item: Bombs 20
@@ -7140,6 +7748,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 21
+    APLocationId: 118
 
 - Name: Hyrule Castle Treasure Room Fourth Small Chest
   Original Item: Arrows 20
@@ -7151,6 +7760,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 23
+    APLocationId: 112
 
 - Name: Hyrule Castle Treasure Room Fifth Small Chest
   Original Item: Water Bombs 15
@@ -7162,6 +7772,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 22
+    APLocationId: 108
 
 - Name: Hyrule Castle Treasure Room Sixth Small Chest
   Original Item: Red Rupee
@@ -7173,6 +7784,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 26
+    APLocationId: 116
 
 - Name: Hyrule Castle Treasure Room Seventh Small Chest
   Original Item: Yellow Rupee
@@ -7184,6 +7796,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 27
+    APLocationId: 115
 
 - Name: Hyrule Castle Treasure Room Eighth Small Chest
   Original Item: Blue Rupee
@@ -7195,6 +7808,7 @@
     Chest:
       - Stage: 20
         Tbox Id: 28
+    APLocationId: 106
 
 - Name: Defeat Ganondorf
   Original Item: Game Beatable
diff --git a/src/dusk/settings.cpp b/src/dusk/settings.cpp
index beb8e2d690..db58a22360 100644
--- a/src/dusk/settings.cpp
+++ b/src/dusk/settings.cpp
@@ -191,13 +191,13 @@ UserSettings g_userSettings = {
         ConfigVar<std::string>{"randomizer.file1SeedHash", ""},
          ConfigVar<std::string>{"randomizer.file2SeedHash", ""},
         ConfigVar<std::string>{"randomizer.file3SeedHash", ""},
-    }
+    },
     
     .archipelago = {
         .serverIP {"archipelago.serverIP", "archipelago.gg"},
         .serverPass {"archipelago.serverPass", ""},
         .slotName {"archipelago.slotName", ""},
-    },
+    }
 };
 
 UserSettings& getSettings() {